From e3cef828fa426d9aca0449cbe2e3f2c771e0b11d Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Tue, 12 Nov 2013 12:23:44 -0500
Subject: [PATCH 1/2] VIVO-518 and some other cleanup

---
 ...Config-informationResourceInAuthorship.xml |  46 ++---
 ...listViewConfig-organizationForTraining.xml |  38 ++--
 .../individual--foaf-person-2column.ftl       |   2 +-
 .../individual--foaf-person-quickview.ftl     |   2 +-
 .../individual-contactInfo-2column.ftl        |   4 +-
 .../individual/individual-contactInfo.ftl     |   4 +-
 ...tement-informationResourceInAuthorship.ftl |   4 +-
 .../propStatement-organizationForTraining.ftl |   6 +-
 .../edit/forms/organizationForTraining.ftl    |   3 +
 rdf/display/everytime/PropertyConfig.n3       | 189 ++++++++++++++++++
 ...or.java => FirstAndLastNameValidator.java} |  11 +-
 .../n3editing/PersonHasAdviseesValidator.java |  95 ---------
 .../n3editing/PersonHasAdvisorsValidator.java |  95 ---------
 .../PublicationHasEditorValidator.java        | 100 ---------
 ...AuthorsToInformationResourceGenerator.java |   2 +-
 ...EditorsToInformationResourceGenerator.java |   4 +-
 .../OrganizationForTrainingGenerator.java     |   2 +
 ...ganizationHasPositionHistoryGenerator.java |   6 +-
 ...PersonHasAdviseeRelationshipGenerator.java |   4 +-
 ...PersonHasAdvisorRelationshipGenerator.java |   4 +-
 .../PersonHasEducationalTraining.java         |   4 +-
 .../templates/individual--foaf-person.ftl     |   2 +-
 22 files changed, 268 insertions(+), 359 deletions(-)
 rename src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/{OrganizationHasPositionValidator.java => FirstAndLastNameValidator.java} (89%)
 delete mode 100644 src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasAdviseesValidator.java
 delete mode 100644 src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasAdvisorsValidator.java
 delete mode 100644 src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasEditorValidator.java

diff --git a/productMods/config/listViewConfig-informationResourceInAuthorship.xml b/productMods/config/listViewConfig-informationResourceInAuthorship.xml
index d02b328a..9934aa97 100644
--- a/productMods/config/listViewConfig-informationResourceInAuthorship.xml
+++ b/productMods/config/listViewConfig-informationResourceInAuthorship.xml
@@ -13,25 +13,25 @@
                 
         SELECT DISTINCT <collated> ?subclass </collated>
                         ?authorship
-                        ?person ?personName 
+                        ?author ?authorName 
         WHERE {
                 ?subject ?property ?authorship .
                 OPTIONAL { ?authorship core:rank ?rank } 
-                OPTIONAL { ?authorship core:relates ?person .
-                           ?person a foaf:Person .                      
-                           ?person rdfs:label ?personName 
+                OPTIONAL { ?authorship core:relates ?author .
+                           ?author a foaf:Agent .                      
+                           ?author rdfs:label ?authorName 
                 <collated> 
-                OPTIONAL { ?authorship core:relates ?person .
-                           ?person a foaf:Person .  
-                           ?person vitro:mostSpecificType ?subclass .
-                           ?subclass rdfs:subClassOf foaf:Person 
+                OPTIONAL { ?authorship core:relates ?author .
+                           ?author a foaf:Agent .  
+                           ?author vitro:mostSpecificType ?subclass .
+                           ?subclass rdfs:subClassOf foaf:Agent 
                 } 
                 </collated>
             }
             <critical-data-required>
-            FILTER ( bound(?person) )
+            FILTER ( bound(?author) )
             </critical-data-required>
-        } ORDER BY <collated> ?subclass </collated> ?rank ?personName   
+        } ORDER BY <collated> ?subclass </collated> ?rank ?authorName   
     </query-select>
    
     <query-construct>
@@ -43,11 +43,11 @@
             ?subject ?property ?authorship .
             ?authorship a core:Authorship .
             ?authorship ?authorshipProperty ?authorshipValue .
-            ?authorship core:relates ?person .
-            ?person a foaf:Person .
-            ?person rdfs:label ?personName .
-            ?person vitro:mostSpecificType ?subclass .
-            ?subclass rdfs:subClassOf foaf:Person          
+            ?authorship core:relates ?author .
+            ?author a foaf:Agent .
+            ?author rdfs:label ?authorName .
+            ?author vitro:mostSpecificType ?subclass .
+            ?subclass rdfs:subClassOf foaf:Agent          
         } WHERE {
             {
                 ?subject ?property ?authorship .
@@ -59,17 +59,17 @@
             } UNION {
                 ?subject ?property ?authorship .
                 ?authorship a core:Authorship .
-                ?authorship core:relates ?person .
-                ?person a foaf:Person .                      
-                ?person rdfs:label ?personName  
+                ?authorship core:relates ?author .
+                ?author a foaf:Agent .                      
+                ?author rdfs:label ?authorName  
             } UNION {
                 ?subject ?property ?authorship .
                 ?authorship a core:Authorship .
-                ?authorship core:relates ?person .
-                ?person a foaf:Person .
-                ?person rdfs:label ?personName . 
-                ?person vitro:mostSpecificType ?subclass .
-                ?subclass rdfs:subClassOf foaf:Person
+                ?authorship core:relates ?author .
+                ?author a foaf:Agent .
+                ?author rdfs:label ?authorName . 
+                ?author vitro:mostSpecificType ?subclass .
+                ?subclass rdfs:subClassOf foaf:Agent
             }
         } 
     </query-construct>
diff --git a/productMods/config/listViewConfig-organizationForTraining.xml b/productMods/config/listViewConfig-organizationForTraining.xml
index 9530b30c..f3ac27b8 100644
--- a/productMods/config/listViewConfig-organizationForTraining.xml
+++ b/productMods/config/listViewConfig-organizationForTraining.xml
@@ -164,34 +164,34 @@
     </query-construct>
 
     <query-construct>
-        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;   
-        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
-
-        CONSTRUCT {
-            ?dateTimeInterval core:start ?dateTimeStartValue .                    
-            ?dateTimeStartValue core:dateTime ?dateTimeStart .
+        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;   
+        CONSTRUCT { 
+            ?subject ?property ?edTraining .
+            ?leaderRole core:dateTimeInterval ?dateTimeInterval .
+            ?dateTimeInterval core:start ?dateTimeStartValue .
+            ?dateTimeStartValue core:dateTime ?dateTimeStart 
         } WHERE {
             ?subject ?property ?edTraining .
             ?edTraining a core:EducationalProcess .
-            ?edTraining core:dateTimeInterval ?dateTimeInterval .
-            ?dateTimeInterval core:start ?dateTimeStartValue .                    
-            ?dateTimeStartValue core:dateTime ?dateTimeStart .
-        }
+            ?leaderRole core:dateTimeInterval ?dateTimeInterval .
+            ?dateTimeInterval core:start ?dateTimeStartValue .
+            ?dateTimeStartValue core:dateTime ?dateTimeStart 
+        } 
     </query-construct>
 
     <query-construct>
-        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;   
-        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
-
-        CONSTRUCT {
-            ?dateTimeInterval core:end ?dateTimeEndValue . 
-            ?dateTimeEndValue core:dateTime ?dateTimeEnd  
+        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;   
+        CONSTRUCT { 
+            ?subject ?property ?edTraining .
+            ?leaderRole core:dateTimeInterval ?dateTimeInterval .
+            ?dateTimeInterval core:end ?dateTimeEndValue .
+            ?dateTimeStartValue core:dateTime ?dateTimeEnd 
         } WHERE {
             ?subject ?property ?edTraining .
             ?edTraining a core:EducationalProcess .
-            ?edTraining core:dateTimeInterval ?dateTimeInterval .
-            ?dateTimeInterval core:end ?dateTimeEndValue . 
-            ?dateTimeEndValue core:dateTime ?dateTimeEnd  
+            ?leaderRole core:dateTimeInterval ?dateTimeInterval .
+            ?dateTimeInterval core:end ?dateTimeEndValue .
+            ?dateTimeStartValue core:dateTime ?dateTimeEnd
         } 
     </query-construct>
     
diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
index f756c881..783105ff 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
@@ -62,7 +62,7 @@
                     </#if>
                     <#list title.statements as statement>
                         <span class="display-title<#if editable>-editable</#if>">${statement.preferredTitle}</span>
-                        <@p.editingLinks "${title.localName}" "${title.name}" statement editable />
+                        <@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri />
                     </#list>
                 </#if>
                 <#-- If preferredTitle is unpopulated, display mostSpecificTypes -->
diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
index 010c2e75..4ac95fce 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
@@ -78,7 +78,7 @@
                             <div id="titleContainer"><span class="display-title-not-editable">${statement.preferredTitle}</span></div>
                         <#else>
                             <span class="display-title-editable">${statement.preferredTitle}</span>
-                            <@p.editingLinks "${title.localName}" "${title.name}" statement editable />
+                            <@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri />
                         </#if>
                     </#list>
                 </#if>
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl b/productMods/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl
index 5a02ac66..19540597 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl
@@ -40,7 +40,7 @@
             <#list phone.statements as statement>
                 <li role="listitem" <#if editable>style="padding-left:10px;"</#if>>                           
                     ${statement.number!}
-                    <@p.editingLinks "${phone.localName}" "${phone.name}" statement editable />
+                    <@p.editingLinks "${phone.localName}" "${phone.name}" statement editable phone.rangeUri />
                 </li>
             </#list>
         </ul>
@@ -66,7 +66,7 @@
                     <li role="listitem" <#if editable>style="padding-left:10px;"</#if>>
                         
                         <a class="email" href="mailto:${statement.emailAddress!}" title="${i18n().email}">${statement.emailAddress!}</a>
-                        <@p.editingLinks "${email.localName}" "${email.name}" statement editable />
+                        <@p.editingLinks "${email.localName}" "${email.name}" statement editable email.rangeUri />
                     </li>
                 </#list>
             </ul>
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl b/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl
index 065a9aa6..0f990bb2 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl
@@ -25,7 +25,7 @@
             <#list phone.statements as statement>
                 <li role="listitem">
                     ${statement.number!}
-                    <@p.editingLinks "${phone.localName}" "${phone.name}" statement editable />
+                    <@p.editingLinks "${phone.localName}" "${phone.name}" statement editable phone.rangeUri />
                 </li>
             </#list>
         </ul>
@@ -47,7 +47,7 @@
                 <#list email.statements as statement>
                     <li role="listitem">
                         <a class="email" href="mailto:${statement.emailAddress!}" title="${i18n().email}">${statement.emailAddress!}</a>
-                        <@p.editingLinks "${email.localName}" "${email.name}" statement editable />
+                        <@p.editingLinks "${email.localName}" "${email.name}" statement editable email.rangeUri />
                     </li>
                 </#list>
             </ul>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
index df612dfe..78581373 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
@@ -12,8 +12,8 @@
 <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showAuthorship statement>
-    <#if statement.person??>
-        <a href="${profileUrl(statement.uri("person"))}" title="${i18n().author_name}">${statement.personName}</a>
+    <#if statement.author??>
+        <a href="${profileUrl(statement.uri("author"))}" title="${i18n().author_name}">${statement.authorName}</a>
     <#else>
         <#-- This shouldn't happen, but we must provide for it -->
         <a href="${profileUrl(statement.uri("authorship"))}" title="${i18n().missing_author}">${i18n().missing_author}</a>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
index 711d2ee7..eb5f50c2 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
@@ -26,12 +26,12 @@
         <#if statement.degree??>
             ${statement.degreeAbbr!} <#if statement.majorField??> ${i18n().in} ${statement.majorField!} </#if>
         <#elseif statement.majorField??>
-            ${statement.majorField!}, ${statement.info!}
-        <#else>
+            ${statement.majorField!}
+        <#elseif statement.info??>
             ${statement.info!}
         </#if>
     </#local>
-    <@s.join [ linkedIndividual, detailedInfo ] /> 
+    <@s.join [ linkedIndividual, detailedInfo ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" false/>
 
 </#macro>
 
diff --git a/productMods/templates/freemarker/edit/forms/organizationForTraining.ftl b/productMods/templates/freemarker/edit/forms/organizationForTraining.ftl
index b3d6561b..d474e1ac 100644
--- a/productMods/templates/freemarker/edit/forms/organizationForTraining.ftl
+++ b/productMods/templates/freemarker/edit/forms/organizationForTraining.ftl
@@ -83,6 +83,9 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     	        <#else>
     	            ${submissionErrors[errorFieldName]}
     	        </#if>
+            	<#else>
+                    ${submissionErrors[errorFieldName]}
+    	        </#if>
 	        </#if>
         </#list>
         <#--Checking if Person Type field is empty-->
diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3
index 416802f9..1dc86915 100644
--- a/rdf/display/everytime/PropertyConfig.n3
+++ b/rdf/display/everytime/PropertyConfig.n3
@@ -65,6 +65,23 @@ local:authorInAuthorshipConfig a :ObjectPropertyDisplayConfig ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPublicationToPersonGenerator"^^xsd:string ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbibliographic> . 
 
+local:orgInAuthorshipContext a :ConfigContext ;
+    :hasConfiguration local:orgInAuthorshipConfig ;
+    :configContextFor vivo:relatedBy ;
+    :qualifiedByDomain <http://xmlns.com/foaf/0.1/Organization> ;
+    :qualifiedBy vivo:Authorship .
+
+local:orgInAuthorshipConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-authorInAuthorship.xml"^^xsd:string ;
+    :displayName "selected publications" ;
+    vitro:collateBySubclassAnnot
+              "true"^^xsd:boolean;
+    vitro:displayRankAnnot 1;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPublicationToPersonGenerator"^^xsd:string ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbibliographic> . 
+
 local:hasServiceProviderRoleContext a :ConfigContext ;
     :hasConfiguration local:hasServiceProviderRoleConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
@@ -97,6 +114,22 @@ local:hasClinicalRoleConfig a :ObjectPropertyDisplayConfig ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddClinicalRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> .
 
+local:orgHasClinicalRoleContext a :ConfigContext ;
+    :hasConfiguration local:orgHasClinicalRoleConfig ;
+    :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
+    :qualifiedByDomain  <http://xmlns.com/foaf/0.1/Organization>  ;
+    :qualifiedBy      <http://vivoweb.org/ontology/core#ClinicalRole> .
+
+local:orgHasClinicalRoleConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-hasClinicalActivity.xml"^^xsd:string ;
+    :displayName "clinical activities" ;
+    vitro:displayRankAnnot 70;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
+    vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddClinicalRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> .
+
 local:hasLeaderRoleContext a :ConfigContext ;
     :hasConfiguration local:hasLeaderRoleConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
@@ -113,6 +146,22 @@ local:hasLeaderRoleConfig a :ObjectPropertyDisplayConfig ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddHeadOfRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> .
 
+local:orgHasLeaderRoleContext a :ConfigContext ;
+    :hasConfiguration local:orgHasLeaderRoleConfig ;
+    :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
+    :qualifiedByDomain  <http://xmlns.com/foaf/0.1/Organization>  ;
+    :qualifiedBy      <http://vivoweb.org/ontology/core#LeaderRole> .
+
+local:orgHasLeaderRoleConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-roleContributesTo.xml"^^xsd:string ;
+    :displayName "head of" ;
+    vitro:displayRankAnnot 30;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
+    vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddHeadOfRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> .
+
 local:hasMemberRoleContext a :ConfigContext ;
     :hasConfiguration local:hasMemberRoleConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
@@ -129,6 +178,22 @@ local:hasMemberRoleConfig a :ObjectPropertyDisplayConfig ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddMemberRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> .
 
+local:orgHasMemberRoleContext a :ConfigContext ;
+    :hasConfiguration local:orgHasMemberRoleConfig ;
+    :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
+    :qualifiedByDomain  <http://xmlns.com/foaf/0.1/Organization>  ;
+    :qualifiedBy      <http://vivoweb.org/ontology/core#MemberRole> .
+
+local:orgHasMemberRoleConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-roleContributesTo.xml"^^xsd:string ;
+    :displayName "member of" ;
+    vitro:displayRankAnnot 50;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
+    vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddMemberRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> .
+
 local:hasTeacherRoleContext a :ConfigContext ;
     :hasConfiguration local:hasTeacherRoleConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
@@ -193,6 +258,22 @@ local:hasOrganizerRoleConfig a :ObjectPropertyDisplayConfig ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOrganizerRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoutreach> .
 
+local:orgHasOrganizerRoleContext a :ConfigContext ;
+    :hasConfiguration local:orgHasOrganizerRoleConfig ;
+    :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
+    :qualifiedByDomain  <http://xmlns.com/foaf/0.1/Organization>  ;
+    :qualifiedBy      <http://vivoweb.org/ontology/core#OrganizerRole> .
+
+local:orgHasOrganizerRoleConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-roleRealizedIn.xml"^^xsd:string ;
+    :displayName "organizer of" ;
+    vitro:displayRankAnnot 4;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
+    vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOrganizerRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoutreach> .
+
 local:hasOutreachProviderRoleContext a :ConfigContext ;
     :hasConfiguration local:hasOutreachProviderRoleConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
@@ -209,6 +290,22 @@ local:hasOutreachProviderRoleConfig a :ObjectPropertyDisplayConfig ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOutreachProviderRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoutreach> .
 
+local:orgHasOutreachProviderRoleContext a :ConfigContext ;
+    :hasConfiguration local:orgHasOutreachProviderRoleConfig ;
+    :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
+    :qualifiedByDomain  <http://xmlns.com/foaf/0.1/Organization>  ;
+    :qualifiedBy      <http://vivoweb.org/ontology/core#OutreachProviderRole> .
+
+local:orgHasOutreachProviderRoleConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-roleContributesTo.xml"^^xsd:string ;
+    :displayName "outreach and community service" ;
+    vitro:displayRankAnnot 50;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
+    vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOutreachProviderRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoutreach> .
+
 local:hasAttendeeRoleContext a :ConfigContext ;
     :hasConfiguration local:hasAttendeeRoleConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
@@ -225,6 +322,22 @@ local:hasAttendeeRoleConfig a :ObjectPropertyDisplayConfig ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddAttendeeRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupother> .
 
+local:orgHasAttendeeRoleContext a :ConfigContext ;
+    :hasConfiguration local:orgHasAttendeeRoleConfig ;
+    :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
+    :qualifiedByDomain   <http://xmlns.com/foaf/0.1/Organization> ;
+    :qualifiedBy      <http://vivoweb.org/ontology/core#AttendeeRole> .
+
+local:orgHasAttendeeRoleConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-hasAttendeeRole.xml"^^xsd:string ;
+    :displayName "attended" ;
+    vitro:displayRankAnnot 1;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
+    vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddAttendeeRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupother> .
+
 local:hasResearcherRoleContext a :ConfigContext ;
     :hasConfiguration local:hasResearcherRoleConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
@@ -303,6 +416,23 @@ local:hasPresenterRoleConfig a :ObjectPropertyDisplayConfig ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPresenterRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbibliographic> .
 
+local:orgHasPresenterRoleContext a :ConfigContext ;
+    :hasConfiguration local:orgHasPresenterRoleConfig ;
+    :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
+    :qualifiedByDomain  <http://xmlns.com/foaf/0.1/Organization>  ;
+    :qualifiedBy      <http://vivoweb.org/ontology/core#PresenterRole> .
+
+local:orgHasPresenterRoleConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-hasPresenterRole.xml"^^xsd:string ;
+    :displayName "presentations" ;
+    vitro:collateBySubclassAnnot
+              "true"^^xsd:boolean;
+    vitro:displayRankAnnot 30;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPresenterRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbibliographic> .
+
 local:awardOrHonorContext a :ConfigContext ;
     :hasConfiguration local:awardOrHonorConfig ;
     :configContextFor <http://vivoweb.org/ontology/core#relatedBy> ;
@@ -318,6 +448,21 @@ local:awardOrHonorConfig a :ObjectPropertyDisplayConfig ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasAwardOrHonorGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbiography> .
 
+local:orgHasAwardOrHonorContext a :ConfigContext ;
+    :hasConfiguration local:orgHasAwardOrHonorConfig ;
+    :configContextFor <http://vivoweb.org/ontology/core#relatedBy> ;
+    :qualifiedByDomain  <http://xmlns.com/foaf/0.1/Organization>  ;
+    :qualifiedBy      <http://vivoweb.org/ontology/core#AwardReceipt> .
+
+local:orgHasAwardOrHonorConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-awardOrHonor.xml"^^xsd:string ;
+    :displayName "awards and honors" ;
+    vitro:displayRankAnnot 20;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasAwardOrHonorGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbiography> .
+
 local:educationalTrainingContext a :ConfigContext ;
     :hasConfiguration local:educationalTrainingConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/RO_0000056> ;
@@ -570,6 +715,22 @@ local:additionalEmailConfig a :ObjectPropertyDisplayConfig ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasEmailGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaddress> .
 
+local:organizationEmailContext a :ConfigContext ;
+    :hasConfiguration local:organizationEmailConfig ;
+    :configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
+    :qualifiedByDomain      <http://xmlns.com/foaf/0.1/Organization> ;
+    :qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> ;
+    :qualifiedBy      <http://www.w3.org/2006/vcard/ns#Email> .
+
+local:organizationEmailConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-additionalEmail.xml"^^xsd:string ;
+    :displayName "email address" ;
+    vitro:displayRankAnnot 30;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasEmailGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaddress> .
+
 local:primaryEmailContext a :ConfigContext ;
     :hasConfiguration local:primaryEmailConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
@@ -768,6 +929,20 @@ local:eventLocationConfig a :ObjectPropertyDisplayConfig ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGrouplocation> .
 
+local:organizationLocationContext a :ConfigContext ;
+    :hasConfiguration local:organizationLocationConfig ;
+    :configContextFor <http://purl.obolibrary.org/obo/RO_0001025> ;
+    :qualifiedByDomain      <http://xmlns.com/foaf/0.1/Organization> ;
+    :qualifiedBy      vivo:GeographicLocation .
+
+local:organizationLocationConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
+    :displayName "has geographic location" ;
+    vitro:displayRankAnnot 2;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGrouplocation> .
+
 local:hasRoomContext a :ConfigContext ;
     :hasConfiguration local:hasRoomConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ;
@@ -937,6 +1112,20 @@ local:awardOrHonorGivenConfig a :ObjectPropertyDisplayConfig ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
 
+local:orgAwardsGrantContext a :ConfigContext ;
+    :hasConfiguration local:orgAwardsGrantConfig ;
+    :configContextFor <http://vivoweb.org/ontology/core#relatedBy> ;
+    :qualifiedByDomain      <http://xmlns.com/foaf/0.1/Organization> ;
+    :qualifiedBy      <http://vivoweb.org/ontology/core#Grant> .
+
+local:orgAwardsGrantConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
+    :displayName "awards grant" ;
+    vitro:displayRankAnnot 61;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
+
 local:addressLocationContext a :ConfigContext ;
     :hasConfiguration local:addressLocationConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/RO_0001025> ;
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/OrganizationHasPositionValidator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/FirstAndLastNameValidator.java
similarity index 89%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/OrganizationHasPositionValidator.java
rename to src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/FirstAndLastNameValidator.java
index 60c52f7d..93edd51c 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/OrganizationHasPositionValidator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/FirstAndLastNameValidator.java
@@ -12,11 +12,16 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3ValidatorVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
 
-public class OrganizationHasPositionValidator implements N3ValidatorVTwo {
+public class FirstAndLastNameValidator implements N3ValidatorVTwo {
 
     private static String MISSING_FIRST_NAME_ERROR = "You must enter a value in the First Name field.";
     private static String MISSING_LAST_NAME_ERROR = "You must enter a value in the Last Name field.";
     private static String MALFORMED_LAST_NAME_ERROR = "The last name field may not contain a comma. Please enter first name in First Name field.";
+    private String uriReceiver;
+    
+    public FirstAndLastNameValidator(String uriReceiver) {
+        this.uriReceiver = uriReceiver;
+    }
     
     @Override
     public Map<String, String> validate(EditConfigurationVTwo editConfig,
@@ -26,11 +31,11 @@ public class OrganizationHasPositionValidator implements N3ValidatorVTwo {
 
         Map<String,String> errors = new HashMap<String,String>();   
         
-        List<String> personUri = urisFromForm.get("existingPerson");
+        List<String> personUri = urisFromForm.get(uriReceiver);
         if (allListElementsEmpty(personUri) || personUri.contains(">SUBMITTED VALUE WAS BLANK<")) {
             personUri = null;
         }
-        // If there's an adviseeUri, then we're done. The firstName and lastName fields are
+        // If there's an personUri, then we're done. The firstName and lastName fields are
         // disabled and so don't get submitted.
         if (personUri != null) {
             return null;
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasAdviseesValidator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasAdviseesValidator.java
deleted file mode 100644
index cecd3dda..00000000
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasAdviseesValidator.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.hp.hpl.jena.rdf.model.Literal;
-
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3ValidatorVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
-
-public class PersonHasAdviseesValidator implements N3ValidatorVTwo {
-
-    private static String MISSING_FIRST_NAME_ERROR = "You must enter a value in the First Name field.";
-    private static String MISSING_LAST_NAME_ERROR = "You must enter a value in the Last Name field.";
-    private static String MALFORMED_LAST_NAME_ERROR = "The last name field may not contain a comma. Please enter first name in First Name field.";
-    
-    @Override
-    public Map<String, String> validate(EditConfigurationVTwo editConfig,
-            MultiValueEditSubmission editSub) {
-        Map<String,List<String>> urisFromForm = editSub.getUrisFromForm();
-        Map<String,List<Literal>> literalsFromForm = editSub.getLiteralsFromForm();
-
-        Map<String,String> errors = new HashMap<String,String>();   
-        
-        List<String> adviseeUri = urisFromForm.get("existingAdvisee");
-        if (allListElementsEmpty(adviseeUri) || adviseeUri.contains(">SUBMITTED VALUE WAS BLANK<")) {
-            adviseeUri = null;
-        }
-        // If there's an adviseeUri, then we're done. The firstName and lastName fields are
-        // disabled and so don't get submitted.
-        if (adviseeUri != null) {
-            return null;
-        }
-        
-        //Expecting only one first name in this case
-        //To Do: update logic if multiple first names considered
-        Literal firstName = null;
-        List<Literal> firstNameList = literalsFromForm.get("firstName");
-        if(firstNameList != null && firstNameList.size() > 0) {
-        	firstName = firstNameList.get(0);
-        }
-        if( firstName != null && 
-        		firstName.getLexicalForm() != null && 
-        		"".equals(firstName.getLexicalForm()) )
-            firstName = null;
-
-
-        List<Literal> lastNameList = literalsFromForm.get("lastName");
-        Literal lastName = null;
-        if(lastNameList != null && lastNameList.size() > 0) {
-        	lastName = lastNameList.get(0);
-        }
-        String lastNameValue = "";
-        if (lastName != null) {
-            lastNameValue = lastName.getLexicalForm();
-            if( "".equals(lastNameValue) ) {
-                lastName = null;
-            }
-        }
-
-        if (lastName == null) {
-            errors.put("lastName", MISSING_LAST_NAME_ERROR);
-        // Don't reject space in the last name: de Vries, etc.
-        } else if (lastNameValue.contains(",")) {            
-            errors.put("lastName", MALFORMED_LAST_NAME_ERROR);
-        }
-        
-        if (firstName == null) {
-            errors.put("firstName", MISSING_FIRST_NAME_ERROR);
-        }       
-        
-        return errors.size() != 0 ? errors : null;
-    }
-    
-    private boolean allListElementsEmpty(List<String> checkList) {
-    	if(checkList == null)
-    		return true;
-    	if(checkList.isEmpty()) {
-    		return true;
-    	}
-    	boolean allEmpty = true;
-    	for(String s: checkList) {
-    		if(s.length() != 0){
-    			allEmpty = false;
-    			break;
-    		}
-    	}
-    	return allEmpty;
-    }
-
-}
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasAdvisorsValidator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasAdvisorsValidator.java
deleted file mode 100644
index b13aa7c0..00000000
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasAdvisorsValidator.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.hp.hpl.jena.rdf.model.Literal;
-
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3ValidatorVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
-
-public class PersonHasAdvisorsValidator implements N3ValidatorVTwo {
-
-    private static String MISSING_FIRST_NAME_ERROR = "You must enter a value in the First Name field.";
-    private static String MISSING_LAST_NAME_ERROR = "You must enter a value in the Last Name field.";
-    private static String MALFORMED_LAST_NAME_ERROR = "The last name field may not contain a comma. Please enter first name in First Name field.";
-    
-    @Override
-    public Map<String, String> validate(EditConfigurationVTwo editConfig,
-            MultiValueEditSubmission editSub) {
-        Map<String,List<String>> urisFromForm = editSub.getUrisFromForm();
-        Map<String,List<Literal>> literalsFromForm = editSub.getLiteralsFromForm();
-
-        Map<String,String> errors = new HashMap<String,String>();   
-        
-        List<String> adviseeUri = urisFromForm.get("existingAdvisor");
-        if (allListElementsEmpty(adviseeUri) || adviseeUri.contains(">SUBMITTED VALUE WAS BLANK<")) {
-            adviseeUri = null;
-        }
-        // If there's an adviseeUri, then we're done. The firstName and lastName fields are
-        // disabled and so don't get submitted.
-        if (adviseeUri != null) {
-            return null;
-        }
-        
-        //Expecting only one first name in this case
-        //To Do: update logic if multiple first names considered
-        Literal firstName = null;
-        List<Literal> firstNameList = literalsFromForm.get("firstName");
-        if(firstNameList != null && firstNameList.size() > 0) {
-        	firstName = firstNameList.get(0);
-        }
-        if( firstName != null && 
-        		firstName.getLexicalForm() != null && 
-        		"".equals(firstName.getLexicalForm()) )
-            firstName = null;
-
-
-        List<Literal> lastNameList = literalsFromForm.get("lastName");
-        Literal lastName = null;
-        if(lastNameList != null && lastNameList.size() > 0) {
-        	lastName = lastNameList.get(0);
-        }
-        String lastNameValue = "";
-        if (lastName != null) {
-            lastNameValue = lastName.getLexicalForm();
-            if( "".equals(lastNameValue) ) {
-                lastName = null;
-            }
-        }
-
-        if (lastName == null) {
-            errors.put("lastName", MISSING_LAST_NAME_ERROR);
-        // Don't reject space in the last name: de Vries, etc.
-        } else if (lastNameValue.contains(",")) {            
-            errors.put("lastName", MALFORMED_LAST_NAME_ERROR);
-        }
-        
-        if (firstName == null) {
-            errors.put("firstName", MISSING_FIRST_NAME_ERROR);
-        }       
-        
-        return errors.size() != 0 ? errors : null;
-    }
-    
-    private boolean allListElementsEmpty(List<String> checkList) {
-    	if(checkList == null)
-    		return true;
-    	if(checkList.isEmpty()) {
-    		return true;
-    	}
-    	boolean allEmpty = true;
-    	for(String s: checkList) {
-    		if(s.length() != 0){
-    			allEmpty = false;
-    			break;
-    		}
-    	}
-    	return allEmpty;
-    }
-
-}
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasEditorValidator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasEditorValidator.java
deleted file mode 100644
index fafc1def..00000000
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasEditorValidator.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing;
-
-import java.lang.String;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang.StringUtils;
-
-import com.hp.hpl.jena.rdf.model.Literal;
-
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3ValidatorVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
-
-public class PublicationHasEditorValidator implements N3ValidatorVTwo {
-
-    private static String MISSING_FIRST_NAME_ERROR = "Must specify the editor's first name.";
-    private static String MISSING_LAST_NAME_ERROR = "Must specify the editor's last name.";
-    private static String MALFORMED_LAST_NAME_ERROR = "Last name may not contain a comma. Please enter first name in first name field.";
-;    
-    @Override
-    public Map<String, String> validate(EditConfigurationVTwo editConfig,
-            MultiValueEditSubmission editSub) {
-        Map<String,List<String>> urisFromForm = editSub.getUrisFromForm();
-        Map<String,List<Literal>> literalsFromForm = editSub.getLiteralsFromForm();
-
-        Map<String,String> errors = new HashMap<String,String>();   
-        
-        List<String> personUri = urisFromForm.get("personUri");
-        
-        if (allListElementsEmpty(personUri)) {
-            personUri = null;
-        }
-        // If there's a personUri, then we're done. The firstName and lastName fields are
-        // disabled and so don't get submitted.
-        if (personUri != null ) {
-            return null;
-        }
-        
-        //Expecting only one first name in this case
-        //To Do: update logic if multiple first names considered
-        Literal firstName = null;
-        List<Literal> firstNameList = literalsFromForm.get("firstName");
-        if(firstNameList != null && firstNameList.size() > 0) {
-        	firstName = firstNameList.get(0);
-        }
-        if( firstName != null && 
-        		firstName.getLexicalForm() != null && 
-        		"".equals(firstName.getLexicalForm()) )
-            firstName = null;
-
-
-        List<Literal> lastNameList = literalsFromForm.get("lastName");
-        Literal lastName = null;
-        if(lastNameList != null && lastNameList.size() > 0) {
-        	lastName = lastNameList.get(0);
-        }
-        String lastNameValue = "";
-        if (lastName != null) {
-            lastNameValue = lastName.getLexicalForm();
-            if( "".equals(lastNameValue) ) {
-                lastName = null;
-            }
-        }
-
-        if (lastName == null) {
-            errors.put("lastName", MISSING_LAST_NAME_ERROR);
-        // Don't reject space in the last name: de Vries, etc.
-        } else if (lastNameValue.contains(",")) {            
-            errors.put("lastName", MALFORMED_LAST_NAME_ERROR);
-        }
-        
-        if (firstName == null) {
-            errors.put("firstName", MISSING_FIRST_NAME_ERROR);
-        }       
-        
-        return errors.size() != 0 ? errors : null;
-    }
-    
-    private boolean allListElementsEmpty(List<String> checkList) {
-    	if(checkList == null)
-    		return true;
-    	if(checkList.isEmpty()) {
-    		return true;
-    	}
-    	boolean allEmpty = true;
-    	for(String s: checkList) {
-    		if(s.length() != 0){
-    			allEmpty = false;
-    			break;
-    		}
-    	}
-    	return allEmpty;
-    }
-
-}
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
index 4429a079..681ad650 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
@@ -355,7 +355,7 @@ public class AddAuthorsToInformationResourceGenerator extends VivoBaseGenerator
         + "?subject core:relatedBy ?authorshipURI . \n"
         + "?authorshipURI a core:Authorship . \n"
         + "?authorshipURI core:relates ?authorURI . \n" 
-        + "?authorURI a foaf:Person . \n"
+        + "?authorURI a foaf:Agent . \n"
         + "OPTIONAL { ?authorURI rdfs:label ?authorName } \n"
         + "OPTIONAL { ?authorshipURI core:rank ?rank } \n" 
         + "} ORDER BY ?rank";
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java
index 56ebd820..bb14fa36 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java
@@ -27,7 +27,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.PublicationHasEditorValidator;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.FirstAndLastNameValidator;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
@@ -84,7 +84,7 @@ public class AddEditorsToInformationResourceGenerator extends VivoBaseGenerator
         //template file
         editConfiguration.setTemplate("addEditorsToInformationResource.ftl");
         //add validators
-        editConfiguration.addValidator(new PublicationHasEditorValidator());
+        editConfiguration.addValidator(new FirstAndLastNameValidator("personUri"));
 
         //Adding additional data, specifically edit mode
         addFormSpecificData(editConfiguration, vreq);
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java
index c7070d8b..2030ea94 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java
@@ -12,6 +12,7 @@ import com.hp.hpl.jena.vocabulary.XSD;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.FirstAndLastNameValidator;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
@@ -166,6 +167,7 @@ public class OrganizationForTrainingGenerator  extends VivoBaseGenerator impleme
         //Add validator
         conf.addValidator(new DateTimeIntervalValidationVTwo("startField","endField"));
         conf.addValidator(new AntiXssValidation());
+        conf.addValidator(new FirstAndLastNameValidator("existingPerson"));
         
         //Adding additional data, specifically edit mode
         addFormSpecificData(conf, vreq);
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
index aad3d6b5..e8fd3abd 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
@@ -10,14 +10,14 @@ import com.hp.hpl.jena.vocabulary.XSD;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary.Precision;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.FirstAndLastNameValidator;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.OrganizationHasPositionValidator;
 
 public class OrganizationHasPositionHistoryGenerator extends VivoBaseGenerator
 		implements EditConfigurationGenerator {
@@ -257,7 +257,7 @@ public class OrganizationHasPositionHistoryGenerator extends VivoBaseGenerator
 		conf.addField(endField.setEditElement(new DateTimeWithPrecisionVTwo(
 				endField, URI_PRECISION_YEAR, URI_PRECISION_NONE)));
 
-        conf.addValidator(new OrganizationHasPositionValidator());
+        conf.addValidator(new FirstAndLastNameValidator("existingPerson"));
 		conf.addValidator(new AntiXssValidation());
 		conf.addValidator(new DateTimeIntervalValidationVTwo("startField",
 				"endField"));
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java
index 22fa72fa..13bf656f 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java
@@ -11,7 +11,7 @@ import com.hp.hpl.jena.vocabulary.XSD;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.PersonHasAdvisorsValidator;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.FirstAndLastNameValidator;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
@@ -184,7 +184,7 @@ public class PersonHasAdviseeRelationshipGenerator extends VivoBaseGenerator imp
 
         conf.addValidator(new DateTimeIntervalValidationVTwo("startField","endField"));
         conf.addValidator(new AntiXssValidation());
-        conf.addValidator(new PersonHasAdvisorsValidator());
+        conf.addValidator(new FirstAndLastNameValidator("existingAdvisor"));
         addFormSpecificData(conf, vreq);
         
         prepare(vreq, conf);
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java
index 8ab694a7..987e42fa 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java
@@ -11,7 +11,7 @@ import com.hp.hpl.jena.vocabulary.XSD;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.PersonHasAdviseesValidator;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.FirstAndLastNameValidator;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
@@ -184,7 +184,7 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp
 
         conf.addValidator(new DateTimeIntervalValidationVTwo("startField","endField"));
         conf.addValidator(new AntiXssValidation());
-        conf.addValidator(new PersonHasAdviseesValidator());
+        conf.addValidator(new FirstAndLastNameValidator("existingAdvisee"));
         addFormSpecificData(conf, vreq);
         
         prepare(vreq, conf);
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
index 6ff53e79..d832a2c2 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
@@ -296,8 +296,8 @@ public class PersonHasEducationalTraining  extends VivoBaseGenerator implements
     final static String orgTypeQuery  =      
         "PREFIX rdfs: <"+ rdfs +">   \n"+
         "SELECT ?existingOrgType WHERE {\n"+
-        "?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?existingAwardedDegree . \n" +
-        "?existingAwardedDegree <http://vivoweb.org/ontology/core#assignedBy> ?existingOrg .\n"+
+        "?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?existingOrg . \n" +
+        "?existingOrg <http://purl.obolibrary.org/obo/RO_0000056> ?edTraining .\n"+
         "?existingOrg a ?existingOrgType .\n"+
         "?existingOrgType rdfs:subClassOf <"+ orgClass +"> .\n"+
         "}";
diff --git a/themes/wilma/templates/individual--foaf-person.ftl b/themes/wilma/templates/individual--foaf-person.ftl
index 9055574f..e5ba0442 100644
--- a/themes/wilma/templates/individual--foaf-person.ftl
+++ b/themes/wilma/templates/individual--foaf-person.ftl
@@ -77,7 +77,7 @@
                         </#if>
                         <#list title.statements as statement>
                             <span class="display-title<#if editable>-editable</#if>">${statement.preferredTitle}</span>
-                            <@p.editingLinks "${title.localName}" "${title.name}" statement editable />
+                            <@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri />
                         </#list>
                     </#if>
                     <#-- If preferredTitle is unpopulated, display mostSpecificTypes -->

From 74fabb0552ab9f60a6cc3ae5d14604eff1a29dbd Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Tue, 12 Nov 2013 12:50:53 -0500
Subject: [PATCH 2/2] fix jenkins build

---
 .../configuration/generators/AddEditorshipToPersonGenerator.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java
index 486d6fba..afd47f35 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java
@@ -24,7 +24,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.PersonHasAdviseesValidator;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;