From 15880ea3b774321277bbd3a8f72099f32483a1b7 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Thu, 24 Oct 2013 11:57:18 -0400
Subject: [PATCH 1/4] VIVO-381 Adjust installation doc. Ant all comes before
 runtime.properties.

---
 doc/install.html | 112 +++++++++++++++++++++++------------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/doc/install.html b/doc/install.html
index c36762fa..00c033cd 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -60,7 +60,7 @@
             <h4>VIVO inside Tomcat</h4>
             <p>
                 When you run the build script to compile and deploy VIVO 
-                (see <a href="#deploy">Step 6</a>, below), the files will be deployed to a
+                (see <a href="#deploy">Step 5</a>, below), the files will be deployed to a
                 directory inside Tomcat. This is the actual executing code for VIVO, 
                 but you won’t need to look at it or change it. If you need to change 
                 VIVO, make the changes in the distribution directory, and run the build  
@@ -78,7 +78,7 @@
                 in the build.properties file (see <a href="#build_properties">Step 4</a>, 
                 below). You must create this directory before starting VIVO, 
                 you must create the <code>runtime.properties</code> file in this directory
-                (see <a href="#runtime_properties">Step 5</a>, below), and you 
+                (see <a href="#runtime_properties">Step 6</a>, below), and you 
                 must ensure that Tomcat has permission to read and write to this  
                 directory when it runs. 
             </p>
@@ -113,10 +113,10 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com
                         <a href="#build_properties">Specify build properties</a>
                     </li>
                     <li>
-                        <a href="#runtime_properties">Specify runtime properties</a>
+                        <a href="#deploy">Compile and deploy</a>
                     </li>
                     <li>
-                        <a href="#deploy">Compile and deploy</a>
+                        <a href="#runtime_properties">Specify runtime properties</a>
                     </li>
                     <li>
                         <a href="#tomcat_settings">Configure Tomcat</a>
@@ -156,10 +156,9 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com
             </p>
             <ul>
                 <li>
-                    Java (SE) 1.6.x <a href="http://java.sun.com">http://java.sun.com</a>
+                    Java (SE) 1.7.x <a href="http://java.sun.com">http://java.sun.com</a>
                     <ul>
-                    	<li>VIVO does not work with OpenJDK</li>
-                    	<li>VIVO does not work with Java 1.7</li>
+                    	<li>VIVO has not been tested with OpenJDK</li>
                     </ul>
                 </li>
                 <li>
@@ -245,8 +244,8 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com
             <p>
             	These properties are used in compilation and deployment. 
             	They will be incorporated into VIVO when it is compiled in
-            	<a href="#deploy">Step 6</a>. If you want to change these properties at
-            	a later date, you will need to stop Tomcat, repeat <a href="#deploy">Step 6</a>, 
+            	<a href="#deploy">Step 5</a>. If you want to change these properties at
+            	a later date, you will need to stop Tomcat, repeat <a href="#deploy">Step 5</a>, 
             	and restart Tomcat.
             </p>
             <p>
@@ -343,22 +342,62 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com
                 </tbody>
             </table>
 
-            <h3 id="runtime_properties">5. Specify runtime properties </h3>
+            <h3 id="deploy">5. Compile and deploy</h3>
             <p>
                 In <a href="#build_properties">Step 4</a>, you defined the location of the VIVO home directory, 
                 by specifying <code>vitro.home</code> in the <code>build.properties</code> file.
                 Create that directory now.
             </p>
             <p>
-            	At the top level of the VIVO distribution directory, you will find a file called 
-            	<code>example.runtime.properties</code>. Copy this to the VIVO home directory you have created, 
-            	renaming the copy to <code>runtime.properties</code>. 
-                Edit the file to suit your installation, as described in the following table. 
+                At the command line, from the top level of the VIVO distribution 
+                directory, type: 
+            <pre>                ant all            </pre>
+                to build VIVO and deploy to Tomcat's webapps directory. 
+            </p>
+            <p>
+                The build script may run for as much as five minutes, 
+                and creates more than 100 lines of output. 
+                The process comprises several steps:
+                <ul>
+                   <li>collecting the source files from the distribution directory,</li>
+                   <li>compiling the Java source code,</li>
+                   <li>compiling and running unit tests,</li>
+                   <li>preparing the Solr search engine,</li>
+                   <li>deploying VIVO and Solr to Tomcat.</li>
+                </ul> 
+            </p>
+            <p>
+                The output of the build may include a variety of warning messages.
+                The Java compiler may warn of code that is outdated.
+                Unit tests may produce warning messages, 
+                and some tests may be ignored if they do not produce consistent results.  
+            </p>
+            <table align="center"><tr><td>
+                BUILD SUCCESSFUL<br>Total time: 1 minute 49 seconds
+            </td></tr></table>
+            <p>
+                If the output ends with a success message, the build was successful. 
+                Proceed to the next step.
+            </p>
+            <table align="center"><tr><td>
+                BUILD FAILED<br>Total time: 35 seconds
+            </td></tr></table>
+            <p>
+                If the output ends with a failure message, the build has failed. 
+                Find the cause of the failure, fix the problem, and run the script again.
+            </p>
+
+            <h3 id="runtime_properties">6. Specify runtime properties </h3>
+            <p>
+                The build process in <a href="deploy">Step 5</a> created a file called <code>example.runtime.properties</code>
+                in your VIVO home directory (<code>vitro.home</code> in the <code>build.properties</code> file).
+                Rename this file to  <code>runtime.properties</code>, and  
+                edit the file to suit your installation, as described in the following table. 
             </p>
             <p>
                 These properties are loaded when VIVO starts up. If you want to change these 
                 properties at a later date, you will need to restart Tomcat for them to take 
-                effect. You will not need to repeat <a href="#deploy">Step 6</a>.
+                effect. You will not need to repeat <a href="#deploy">Step 5</a>.
             </p>
             <p>
                 <em>Windows:</em>
@@ -921,45 +960,6 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com
 
                 </tbody>
             </table>
-            <h3 id="deploy">6. Compile and deploy</h3>
-            <p>
-                At the command line, from the top level of the VIVO distribution 
-                directory, type: 
-            <pre>                ant all            </pre>
-                to build VIVO and deploy to Tomcat's webapps directory. 
-            </p>
-            <p>
-                The build script may run for as much as five minutes, 
-                and creates more than 100 lines of output. 
-                The process comprises several steps:
-                <ul>
-                   <li>collecting the source files from the distribution directory,</li>
-                   <li>compiling the Java source code,</li>
-                   <li>compiling and running unit tests,</li>
-                   <li>preparing the Solr search engine,</li>
-                   <li>deploying VIVO and Solr to Tomcat.</li>
-                </ul> 
-            </p>
-            <p>
-                The output of the build may include a variety of warning messages.
-                The Java compiler may warn of code that is outdated.
-                Unit tests may produce warning messages, 
-                and some tests may be ignored if they do not produce consistent results.  
-            </p>
-            <table align="center"><tr><td>
-                BUILD SUCCESSFUL<br>Total time: 1 minute 49 seconds
-            </td></tr></table>
-            <p>
-                If the output ends with a success message, the build was successful. 
-                Proceed to the next step.
-            </p>
-            <table align="center"><tr><td>
-                BUILD FAILED<br>Total time: 35 seconds
-            </td></tr></table>
-            <p>
-                If the output ends with a failure message, the build has failed. 
-                Find the cause of the failure, fix the problem, and run the script again.
-            </p>
 
             <h3 id="tomcat_settings">7. Configure Tomcat</h3>
             <h4>Set JVM parameters</h4>
@@ -1049,8 +1049,8 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com
                problem is detected the normal VIVO pages will redirect
                to a startup status page describing the problem. You
                can stop tomcat, attempt to fix the problem and
-               proceeded from <a href="#deploy">Step 6</a>. The
-               startup status page may offer a continue link which
+               proceed from <a href="#deploy">Step 5</a>. If the problem is not serious, the
+               startup status page may offer a <code>continue</code> link which
                will allow you to use VIVO in spite of the problems.
 
             <p>

From ae80d6c63d4ed3ae68faa665fc4212f61bafa77a Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Thu, 24 Oct 2013 13:16:26 -0400
Subject: [PATCH 2/4] miscellaneous cleanup but includes a fix for VIVO-404

---
 .../config/listViewConfig-adviseeIn.xml       |  35 +++--
 .../config/listViewConfig-advisorIn.xml       |  16 +-
 .../config/listViewConfig-researchAreaOf.xml  |  82 +++++-----
 .../propStatement-researchAreaOf.ftl          |  13 +-
 .../edit/forms/js/adviseeRelationshipUtils.js |  10 +-
 .../forms/personHasAdviseeRelationship.ftl    |   1 +
 rdf/display/everytime/PropertyConfig.n3       |   2 +
 ...PersonHasAdviseeRelationshipGenerator.java | 142 +++++++++++-------
 ...PersonHasAdvisorRelationshipGenerator.java |   4 +-
 9 files changed, 175 insertions(+), 130 deletions(-)

diff --git a/productMods/config/listViewConfig-adviseeIn.xml b/productMods/config/listViewConfig-adviseeIn.xml
index b7d6e261..72b07c2c 100644
--- a/productMods/config/listViewConfig-adviseeIn.xml
+++ b/productMods/config/listViewConfig-adviseeIn.xml
@@ -28,7 +28,6 @@
          WHERE {
                      ?subject ?property ?adviseeRole .
                      ?adviseeRole core:relatedBy ?advisingRel .
-                     ?subject core:relatedBy ?advisingRel .
                      LET ( ?localName := afn:localname(?advisingRel) )
                      OPTIONAL { ?advisingRel rdfs:label ?advisingRelLabel  }
                      OPTIONAL { ?advisingRel core:relates ?advisor .
@@ -37,7 +36,7 @@
                      }
                      OPTIONAL { ?advisingRel core:degreeCandidacy ?degree .
                                 ?degree rdfs:label ?degreeLabel .
-                                ?degree core:abbreviation ?degreeAbbr
+                                OPTIONAL { ?degree core:abbreviation ?degreeAbbr }
                      }
                      <collated>
                          OPTIONAL { ?advisingRel vitro:mostSpecificType ?subclass .
@@ -60,11 +59,17 @@
        
     <query-construct>
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
-        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;    
+        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;  
+        PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;  
         CONSTRUCT {
-            ?subclass rdfs:subClassOf core:AdvisingRelationship 
+            ?advisingRel vitro:mostSpecificType ?subclass .
+            ?subclass rdfs:subClassOf core:AdvisingRelationship
         } WHERE {
-            ?subclass rdfs:subClassOf core:AdvisingRelationship 
+            ?subject ?property ?adviseeRole .
+            ?adviseeRole core:relatedBy ?advisingRel .
+            ?advisingRel a core:AdvisingRelationship .
+            ?advisingRel vitro:mostSpecificType ?subclass .
+            ?subclass rdfs:subClassOf core:AdvisingRelationship
         }
     </query-construct>
     
@@ -74,6 +79,7 @@
         CONSTRUCT { 
             ?subject ?property ?adviseeRole .
             ?adviseeRole core:relatedBy ?advisingRel .
+            ?advisingRel a core:AdvisingRelationship .
             ?advisingRel rdfs:label ?advisingRelLabel .
         } WHERE {
             {
@@ -86,7 +92,6 @@
                ?adviseeRole a core:AdviseeRole .
                ?adviseeRole core:relatedBy ?advisingRel .
                ?advisingRel a core:AdvisingRelationship .
-               ?advisingRel ?advisingRelProperty ?advisingRelValue . 
                ?advisingRel rdfs:label ?advisingRelLabel
             } 
         }
@@ -105,8 +110,8 @@
                 ?advisingRel a core:AdvisingRelationship .
                 ?advisingRel core:relates ?advisor .
                 ?advisor a foaf:Person .
-                ?advisor &lt;http://purl.obolibrary.org/obo/RO_0000053&gt; ?advisorRole .
                 ?advisor rdfs:label ?advisorLabel .
+                ?advisor &lt;http://purl.obolibrary.org/obo/RO_0000053&gt; ?advisorRole .
                 ?advisorRole a core:AdvisorRole .
                 ?advisingRel core:degreeCandidacy ?degree .
                 ?degree rdfs:label ?degreeLabel .
@@ -134,7 +139,13 @@
                     ?advisingRel a core:AdvisingRelationship .
                     ?advisingRel core:degreeCandidacy ?degree .
                     ?degree rdfs:label ?degreeLabel .
-                    ?degree core:abbreviation ?degreeAbbr
+                } UNION {
+                     ?subject ?property ?adviseeRole .
+                     ?adviseeRole a core:AdviseeRole .
+                     ?adviseeRole core:relatedBy ?advisingRel .
+                     ?advisingRel a core:AdvisingRelationship .
+                     ?advisingRel core:degreeCandidacy ?degree .
+                     ?degree core:abbreviation ?degreeAbbr
                 }
             }        
     </query-construct>
@@ -143,18 +154,16 @@
             PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;   
             CONSTRUCT { 
                 ?subject ?property ?adviseeRole .
+                ?adviseeRole a core:AdviseeRole .
                 ?adviseeRole core:relatedBy ?advisingRel .
-                ?subject core:relatedBy ?advisingRel .
                 ?advisingRel a core:AdvisingRelationship .
                 ?advisingRel core:dateTimeInterval ?dateTimeInterval .
-                ?advisingRel core:dateTimeInterval ?dateTimeInterval .
                 ?dateTimeInterval core:start ?dateTimeStartValue .
                 ?dateTimeStartValue core:dateTime ?dateTimeStart 
             } WHERE {
                 ?subject ?property ?adviseeRole .
                 ?adviseeRole a core:AdviseeRole .
                 ?adviseeRole core:relatedBy ?advisingRel .
-                ?subject core:relatedBy ?advisingRel .
                 ?advisingRel a core:AdvisingRelationship .
                 ?advisingRel core:dateTimeInterval ?dateTimeInterval .
                 ?dateTimeInterval core:start ?dateTimeStartValue .
@@ -166,8 +175,8 @@
             PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;   
             CONSTRUCT { 
                 ?subject ?property ?adviseeRole .
+                ?adviseeRole a core:AdviseeRole .
                 ?adviseeRole core:relatedBy ?advisingRel .
-                ?subject core:relatedBy ?advisingRel .
                 ?advisingRel a core:AdvisingRelationship .
                 ?advisingRel core:dateTimeInterval ?dateTimeInterval .
                 ?dateTimeInterval core:end ?dateTimeEndValue .
@@ -175,8 +184,8 @@
             } WHERE {
                 ?subject ?property ?adviseeRole .
                 ?adviseeRole a core:AdviseeRole .
+                ?adviseeRole a core:AdviseeRole .
                 ?adviseeRole core:relatedBy ?advisingRel .
-                ?subject core:relatedBy ?advisingRel .
                 ?advisingRel a core:AdvisingRelationship .
                 ?advisingRel core:dateTimeInterval ?dateTimeInterval .
                 ?dateTimeInterval core:end ?dateTimeEndValue .
diff --git a/productMods/config/listViewConfig-advisorIn.xml b/productMods/config/listViewConfig-advisorIn.xml
index 71f60a20..0182d6ea 100644
--- a/productMods/config/listViewConfig-advisorIn.xml
+++ b/productMods/config/listViewConfig-advisorIn.xml
@@ -32,12 +32,10 @@
                      OPTIONAL { ?advisingRel rdfs:label ?advisingRelLabel }
                      OPTIONAL { ?advisingRel core:relates ?advisee .
                                 ?advisee a foaf:Person .
-                                ?advisee &lt;http://purl.obolibrary.org/obo/RO_0000053&gt; ?adviseeRole .
-                                ?adviseeRole a core:AdviseeRole .
                                 OPTIONAL { ?advisee rdfs:label ?adviseeLabel }
                      }
                      OPTIONAL { ?advisingRel core:degreeCandidacy ?degree .
-                                OPTIONAL { ?degree rdfs:label ?degreeLabel }
+                                ?degree rdfs:label ?degreeLabel .
                                 OPTIONAL { ?degree core:abbreviation ?degreeAbbr }
                      }
                      <collated>
@@ -123,7 +121,6 @@
                 ?advisee &lt;http://purl.obolibrary.org/obo/RO_0000053&gt; ?adviseeRole .
                 ?adviseeRole a core:AdviseeRole .
                 ?advisingRel core:degreeCandidacy ?degree .
-                ?degree a core:AcademicDegree .
                 ?degree rdfs:label ?degreeLabel .
                 ?degree core:abbreviation ?degreeAbbr
             } WHERE {
@@ -132,15 +129,6 @@
                     ?advisorRole a core:AdvisorRole .
                     ?advisorRole core:relatedBy ?advisingRel .
                     ?advisingRel a core:AdvisingRelationship .
-                } UNION {
-                    ?subject ?property ?advisorRole .
-                    ?advisorRole a core:AdvisorRole .
-                    ?advisorRole core:relatedBy ?advisingRel .
-                    ?advisingRel a core:AdvisingRelationship .
-                    ?advisingRel core:relates ?advisee .
-                    ?advisee a foaf:Person .
-                    ?advisee &lt;http://purl.obolibrary.org/obo/RO_0000053&gt; ?adviseeRole .
-                    ?adviseeRole a core:AdviseeRole
                 } UNION {
                     ?subject ?property ?advisorRole .
                     ?advisorRole a core:AdvisorRole .
@@ -157,7 +145,6 @@
                     ?advisorRole core:relatedBy ?advisingRel .
                     ?advisingRel a core:AdvisingRelationship .
                     ?advisingRel core:degreeCandidacy ?degree .
-                    ?degree a core:AcademicDegree .
                     ?degree rdfs:label ?degreeLabel .
                 } UNION {
                     ?subject ?property ?advisorRole .
@@ -165,7 +152,6 @@
                     ?advisorRole core:relatedBy ?advisingRel .
                     ?advisingRel a core:AdvisingRelationship .
                     ?advisingRel core:degreeCandidacy ?degree .
-                    ?degree a core:AcademicDegree .
                     ?degree core:abbreviation ?degreeAbbr
                 }
             }
diff --git a/productMods/config/listViewConfig-researchAreaOf.xml b/productMods/config/listViewConfig-researchAreaOf.xml
index b7eaec9a..3a161ec8 100644
--- a/productMods/config/listViewConfig-researchAreaOf.xml
+++ b/productMods/config/listViewConfig-researchAreaOf.xml
@@ -12,67 +12,73 @@
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt; 
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt; 
         PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
+        PREFIX obo: &lt;http://purl.obolibrary.org/obo/&gt;
+        PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
           
         SELECT DISTINCT
                        ?person 
                        ?personName
                        ?posnLabel
+                       ?org
                        ?orgLabel
-                       ?type
-                       ?personType
                        ?title 
         WHERE { 
                  ?subject ?property ?person .
-                 ?person core:personInPosition ?position .
-                 OPTIONAL { ?person rdfs:label ?personName } 
-                 OPTIONAL { ?person core:preferredTitle ?title }
-                 OPTIONAL { ?person vitro:mostSpecificType ?personType .
-                            ?personType rdfs:subClassOf foaf:Person
+                 OPTIONAL { ?person core:relatedBy ?position .
+                           ?position a core:Position 
+                           OPTIONAL { ?position rdfs:label ?posnLabel }
                  }
-                 OPTIONAL { ?position rdfs:label ?posnLabel }
-                 OPTIONAL { ?position core:positionInOrganization ?org .
+                 OPTIONAL { ?person rdfs:label ?personName } 
+                 OPTIONAL { ?person obo:ARG_2000028 ?vcard .
+                            ?vcard vcard:hasTitle ?titleObj .
+                            ?titleObj vcard:title ?title 
+                 } 
+                 OPTIONAL { ?position core:relates ?org .
+                            ?org a foaf:Organization .
                             ?org rdfs:label ?orgLabel 
                  }
-                 OPTIONAL { ?position core:hrJobTitle ?hrJobTitle }
-                 OPTIONAL { ?position core:rank ?rank }
         } 
-        ORDER BY ?personName ?type
+        ORDER BY ?personName
     </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;
+        PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
         
         CONSTRUCT {
             ?subject ?property ?person .
-            ?person core:personInPosition ?position .
-            ?position rdfs:label ?positionLabel .
-            ?position core:positionInOrganization ?org .
+            ?person core:relatedBy ?position .
+            ?position a core:Position .
+            ?position rdfs:label ?posnLabel .
+            ?position core:relates ?org .
+            ?org a foaf:Organization .
             ?org rdfs:label ?orgName .
-            ?position core:hrJobTitle ?hrJobTitle
         } WHERE {
             { 
                 ?subject ?property ?person 
             } UNION {                
                 ?subject ?property ?person .
-                ?person core:personInPosition ?position   
+                ?person core:relatedBy ?position .
+                ?position a core:Position .
             } UNION {      
                 ?subject ?property ?person .
-                ?person core:personInPosition ?position .
-                ?position rdfs:label ?positionLabel 
+                ?person core:relatedBy ?position .
+                ?position a core:Position .
+                ?position rdfs:label ?posnLabel 
             } UNION {      
                 ?subject ?property ?person .
-                ?person core:personInPosition ?position .
-                ?position core:positionInOrganization ?org
+                ?person core:relatedBy ?position .
+                ?position a core:Position .
+                ?position core:relates ?org .
+                ?org a foaf:Organization .
             } UNION {      
                 ?subject ?property ?person .
-                ?person core:personInPosition ?position .
-                ?position core:positionInOrganization ?org .
+                ?person core:relatedBy ?position .
+                ?position a core:Position .
+                ?position core:relates ?org .
+                ?org a foaf:Organization .
                 ?org rdfs:label ?orgName
-            } UNION {      
-                ?subject ?property ?person .
-                ?person core:personInPosition ?position .
-                ?position core:hrJobTitle ?hrJobTitle
             }
         }
     </query-construct>
@@ -82,26 +88,26 @@
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
+        PREFIX obo: &lt;http://purl.obolibrary.org/obo/&gt;
+        PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
         
         CONSTRUCT {
             ?subject ?property ?person .
-            ?person rdfs:label ?label .
-            ?person core:preferredTitle ?title .
-            ?person vitro:mostSpecificType ?personType .
-            ?personType rdfs:subClassOf foaf:Person 
+            ?person rdfs:label ?personName .
+            ?person obo:ARG_2000028 ?vcard . 
+            ?vcard vcard:hasTitle ?titleObj .
+            ?titleObj vcard:title ?title
         } WHERE {
             { 
                 ?subject ?property ?person 
             } UNION {                
                 ?subject ?property ?person .
-                ?person rdfs:label ?label  
-            } UNION {      
+                ?person rdfs:label ?personName  
+             } UNION {      
                 ?subject ?property ?person .
-                ?person core:preferredTitle ?title 
-            }  UNION {
-                ?subject ?property ?person .
-                ?person vitro:mostSpecificType ?personType .
-                ?personType rdfs:subClassOf foaf:Person
+                ?person obo:ARG_2000028 ?vcard . 
+                ?vcard vcard:hasTitle ?titleObj .
+                ?titleObj vcard:title ?title
             } 
         }
     </query-construct>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl
index 2dbf53ed..9e589c10 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl
@@ -13,13 +13,18 @@
      next statement -->
 <#macro showResearchers statement>
     <#local linkedIndividual>
-        <a href="${profileUrl(statement.uri("person"))}" title="${i18n().person_name}">${statement.personName}</a>
+        <a href="${profileUrl(statement.uri("person"))}" title="${i18n().person_name}">${statement.personName!}</a>
     </#local>
     <#if statement.title?has_content >
         <#local posnTitle = statement.title>
-    <#else>
-        <#local posnTitle = statement.posnLabel!statement.personType>
+    <#elseif statement.posnLabel?has_content>
+        <#local posnTitle = statement.posnLabel>
+    </#if>
+    <#if statement.org??>
+        <#local orgString>
+            <a href="${profileUrl(statement.uri("org"))}" title="${i18n().organization_name}">${statement.orgLabel!""}</a>
+        </#local>
     </#if>
 
-    <@s.join [ linkedIndividual, posnTitle, statement.orgLabel!"" ] /> ${statement.type!}
+    <@s.join [ linkedIndividual, posnTitle!, orgString! ] />
 </#macro>
diff --git a/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js b/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js
index 1ec2ab53..acf69156 100644
--- a/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js
+++ b/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js
@@ -25,6 +25,7 @@ var adviseeRelUtils = {
     this.form = $('#personHasAdvisingRelationship');
     this.adRelshiplabel = $('#advisingRelLabel');
     this.advisor = $('#advisor');
+    this.fauxLabel = $('#maskLabelBuilding');
     this.subjArea = $('#SubjectArea');
     this.firstName = $('#firstName');
     this.lastName = $('#lastName');
@@ -56,8 +57,6 @@ var adviseeRelUtils = {
         this.form.submit(function() {
             adviseeRelUtils.resolveAdvisorNames();
             adviseeRelUtils.buildAdvisingRelLabel();
-            alert(this.adRelshiplabel.val());
-            return false;
         });            
     },
     
@@ -80,6 +79,12 @@ var adviseeRelUtils = {
             if (firstName) {
                 name += ', ' + firstName;
             }            
+
+            // we don't want the user to see the label getting built, so hide the acSelector
+            // field and display a bogus field that just has the last name in it.
+            this.fauxLabel.val(lastName);
+            this.advisee.hide();
+            this.fauxLabel.show();
             this.advisor.val(name);
             this.lastName.val(lastName);
         } 
@@ -91,7 +96,6 @@ var adviseeRelUtils = {
     },    
 
     buildAdvisingRelLabel: function() {
-        alert("here");
         if ( this.advisor.val() != "" ) {
             this.adRelshiplabel.val(this.advisor.val() + " " + adviseeRelUtils.advisingString + " " + this.subjName);
         }
diff --git a/productMods/templates/freemarker/edit/forms/personHasAdviseeRelationship.ftl b/productMods/templates/freemarker/edit/forms/personHasAdviseeRelationship.ftl
index 1a281d84..d7fe9520 100644
--- a/productMods/templates/freemarker/edit/forms/personHasAdviseeRelationship.ftl
+++ b/productMods/templates/freemarker/edit/forms/personHasAdviseeRelationship.ftl
@@ -124,6 +124,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     <p >
         <label for="advisor">${i18n().advisor_capitalized}: ${i18n().last_name}  ${requiredHint}<span style="padding-left:322px">${i18n().first_name}  ${requiredHint}</span></label>
             <input class="acSelector" size="50"  type="text" acGroupName="advisor" id="advisor" name="advisorLabel" value="${advisorLabelValue}" >
+            <input type="text" size="50"  id="maskLabelBuilding" name="maskLabelBuilding" value="" style="display:none" >
             <input  size="30"  type="text" id="firstName" name="firstName" value="${firstNameValue}" ><br />
             <input type="hidden" id="lastName" name="lastName" value="">
             <input class="display" type="hidden" acGroupName="advisor" id="advisorDisplay" name="advisorLabelDisplay" value="${advisorLabelDisplayValue}" >
diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3
index 7f2b7bd0..24f027fb 100644
--- a/rdf/display/everytime/PropertyConfig.n3
+++ b/rdf/display/everytime/PropertyConfig.n3
@@ -27,6 +27,7 @@ local:personInPositionConfig a :ObjectPropertyDisplayConfig ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> ;
     vitro:displayRankAnnot 40;
     vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasPositionHistoryGenerator"^^xsd:string .
 
 local:organizationForPositionContext a :ConfigContext ;
@@ -41,6 +42,7 @@ local:organizationForPositionConfig a :ObjectPropertyDisplayConfig ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> ;
     vitro:displayRankAnnot 15;
     vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.OrganizationHasPositionHistoryGenerator"^^xsd:string .
 
 local:authorInAuthorshipContext a :ConfigContext ;
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 e3690e90..22fa72fa 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
@@ -93,7 +93,7 @@ public class PersonHasAdviseeRelationshipGenerator extends VivoBaseGenerator imp
         conf.addSparqlForExistingLiteral("endField-value", existingEndDateQuery);
         
         conf.addSparqlForExistingUris("advisingRelType", advisingRelTypeQuery);
-        conf.addSparqlForExistingUris("adviseeRole", existingAdviseeRoleQuery);
+        conf.addSparqlForExistingUris("advisingRelationship", existingAdvisingRelQuery);
         conf.addSparqlForExistingUris("advisorRole", existingAdvisorRoleQuery);
         conf.addSparqlForExistingUris("existingSubjArea", subjAreaQuery);
         conf.addSparqlForExistingUris("existingAdvisor", advisorQuery);
@@ -249,22 +249,22 @@ public class PersonHasAdviseeRelationshipGenerator extends VivoBaseGenerator imp
         "?vcardName vcard:familyName ?lastName .";
     
     final static String degreeAssertion  =      
-        "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?degree . \n" +
-        "?degree <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . ";
+        "?advisingRelationship <http://vivoweb.org/ontology/core#degreeCandidacy> ?degree . \n" +
+        " ";
 
     //This is for an existing subject area
     //Where we only need the existing subject area label
     final static String n3ForExistingSubjAreaAssertion  =      
-        "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingSubjArea . \n" +
-        "?existingSubjArea <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . ";   
+        "?advisingRelationship <http://vivoweb.org/ontology/core#hasSubjectArea> ?existingSubjArea . \n" +
+        "?existingSubjArea <http://vivoweb.org/ontology/core#subjectAreaOf> ?advisingRelationship . ";   
     //For new subject area, we include all new information
     //new subject area should always be a new resource
     //and the following should only get evaluated 
     //when there is something in the label
     
     final static String n3ForNewSubjAreaAssertion  =   
-    	"?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?newSubjArea . \n" + 
-	    "?newSubjArea <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" + 
+    	"?advisingRelationship <http://vivoweb.org/ontology/core#hasSubjectArea> ?newSubjArea . \n" + 
+	    "?newSubjArea <http://vivoweb.org/ontology/core#subjectAreaOf> ?advisingRelationship . \n" + 
         "?newSubjArea <"+ label + "> ?subjAreaLabel . \n" + 
         "?newSubjArea a <" + subjAreaClass + "> . ";    
 
@@ -286,70 +286,90 @@ public class PersonHasAdviseeRelationshipGenerator extends VivoBaseGenerator imp
 
     /* Queries for editing an existing entry */
 
+    final static String existingAdvisingRelQuery  =      
+        "SELECT ?advisingRelationship WHERE { \n" +
+        " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
+        "}";
+
     final static String advisingRelTypeQuery =
     	"PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n" +
-        "SELECT ?advisingRelType WHERE { \n" + 
-        "  ?advisingRelationship vitro:mostSpecificType ?advisingRelType . \n" + 
-        "}";
-
-    final static String advisorQuery  =      
-        "SELECT ?existingAdvisor WHERE { \n" +
-        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdvisor . \n" +
-        " ?existingAdvisor a <" + advisorClass + ">  . \n" +
-        " FILTER  (?person != ?existingAdvisor)  . \n" +
-        "}";
-
-    final static String existingAdviseeRoleQuery  =      
-        "SELECT ?adviseeRole WHERE { \n" +
-        "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
-        "?adviseeRole a  <" + adviseeRoleClass + "> . \n" +              
-        "}";
-
-    final static String existingAdvisorRoleQuery  =      
-        "SELECT ?advisorRole WHERE { \n" +
-        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
-        " ?advisorRole a  <" + advisorRoleClass + "> . \n" +              
-        "}";
-
-    final static String advisorLabelQuery =
-        "SELECT ?existingAdvisorLabel WHERE { \n" +
-        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdvisor . \n" +
-        " ?existingAdvisor a <" + advisorClass + ">  . \n" +
-        " ?existingAdvisor <"  + label + "> ?existingAdvisorLabel . \n" +
-        " FILTER  (?person != ?existingAdvisor)  . \n" +
-        "}";
-
-    final static String subjAreaQuery =
-        "SELECT ?existingSubjArea WHERE { \n" +
-        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingSubjArea . \n" +
-        " ?existingSubjArea a <http://www.w3.org/2004/02/skos/core#Concept>  . \n" +
-        " ?existingSubjArea <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#mostSpecificType> ?type \n" +
-        " FILTER  (?type != <http://vivoweb.org/ontology/core#AcademicDegree>)  . \n" +        
-        "}";
-
-    final static String subjAreaLabelQuery  =      
-        "SELECT ?existingSubjAreaLabel WHERE { \n" +
-        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingSubjArea . \n" +
-        " ?existingSubjArea a <http://www.w3.org/2004/02/skos/core#Concept>  . \n" +
-        " ?existingSubjArea <" + label + "> ?existingSubjAreaLabel . \n" +
-        " ?existingSubjArea <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#mostSpecificType> ?type \n" +
-        " FILTER  (?type != <http://vivoweb.org/ontology/core#AcademicDegree>)  . \n" +        
+        "SELECT ?advisingRelType WHERE { \n" +
+        " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
+        " ?advisingRelationship vitro:mostSpecificType ?advisingRelType . \n" + 
         "}";
 
     final static String advisingRelLabelQuery =
         "SELECT ?existingAdvisingRelLabel WHERE { \n" +
+        " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         " ?advisingRelationship <"  + label + "> ?existingAdvisingRelLabel . \n" +
         "}";
 
+    final static String advisorQuery  =      
+        "SELECT ?existingAdvisor WHERE { \n" +
+        " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdvisor . \n" +
+        " ?existingAdvisor <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?existingAdvisor a <" + advisorClass + ">  . \n" +
+        " ?existingAdvisor <http://purl.obolibrary.org/obo/RO_0000053> ?existingAdvisorRole . \n" +
+        " ?existingAdvisorRole a <" + advisorRoleClass + ">  . \n" +
+        "}";
+
+    final static String advisorLabelQuery =
+        "SELECT ?existingAdvisorLabel WHERE { \n" +
+        " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdvisor . \n" +
+        " ?existingAdvisor <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?existingAdvisor a <" + advisorClass + ">  . \n" +
+        " ?existingAdvisor <"  + label + "> ?existingAdvisorLabel . \n" +
+        " ?existingAdvisor <http://purl.obolibrary.org/obo/RO_0000053> ?existingAdvisorRole . \n" +
+        " ?existingAdvisorRole a <" + advisorRoleClass + ">  . \n" +
+        "}";
+
+    final static String existingAdvisorRoleQuery  =      
+        "SELECT ?existingAdvisorRole WHERE { \n" +
+        " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdvisorRole . \n" +
+        " ?existingAdvisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?existingAdvisorRole a  <" + advisorRoleClass + "> . \n" +              
+        "}";
+
+    final static String subjAreaQuery =
+        "SELECT ?existingSubjArea WHERE { \n" +
+        " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#hasSubjectArea> ?existingSubjArea . \n" +
+        " ?existingSubjArea a <http://www.w3.org/2004/02/skos/core#Concept>  . \n" +
+        " ?existingSubjArea <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#mostSpecificType> ?type \n" +
+        "}";
+
+    final static String subjAreaLabelQuery  =      
+        "SELECT ?existingSubjAreaLabel WHERE { \n" +
+        " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#hasSubjectArea> ?existingSubjArea . \n" +
+        " ?existingSubjArea a <http://www.w3.org/2004/02/skos/core#Concept>  . \n" +
+        " ?existingSubjArea <" + label + "> ?existingSubjAreaLabel . \n" +
+        " ?existingSubjArea <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#mostSpecificType> ?type \n" +
+        "}";
+
     final static String degreeQuery  =  
         "SELECT ?existingDegree WHERE {\n"+
-        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingDegree . \n" +
+        " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#degreeCandidacy> ?existingDegree . \n" +
         " ?existingDegree a  <" + degreeClass + "> . \n" +
         "}";
         
-
     final static String existingStartDateQuery =
         "SELECT ?existingDateStart WHERE { \n" +
+        " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
@@ -358,6 +378,8 @@ public class PersonHasAdviseeRelationshipGenerator extends VivoBaseGenerator imp
     
     final static String existingEndDateQuery =
         "SELECT ?existingEndDate WHERE { \n" +
+        " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n " +
         "  ?intervalNode <" + intervalToEnd + "> ?endNode . \n" +
@@ -366,11 +388,15 @@ public class PersonHasAdviseeRelationshipGenerator extends VivoBaseGenerator imp
 
     final static String existingIntervalNodeQuery =
         "SELECT ?existingIntervalNode WHERE { \n" + 
+        " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?existingIntervalNode . \n" +
         "  ?existingIntervalNode a <" + intervalType + "> . }";
 
     final static String existingStartNodeQuery = 
         "SELECT ?existingStartNode WHERE { \n" +
+        " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToStart + "> ?existingStartNode . \n" + 
@@ -378,6 +404,8 @@ public class PersonHasAdviseeRelationshipGenerator extends VivoBaseGenerator imp
 
     final static String existingEndNodeQuery = 
         "SELECT ?existingEndNode WHERE { \n" +
+        " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToEnd + "> ?existingEndNode . \n" + 
@@ -385,6 +413,8 @@ public class PersonHasAdviseeRelationshipGenerator extends VivoBaseGenerator imp
 
     final static String existingStartPrecisionQuery = 
         "SELECT ?existingStartPrecision WHERE { \n" +
+        " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
@@ -393,6 +423,8 @@ public class PersonHasAdviseeRelationshipGenerator extends VivoBaseGenerator imp
 
     final static String existingEndPrecisionQuery = 
         "SELECT ?existingEndPrecision WHERE { \n" +
+        " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
+        " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToEnd + "> ?endNode . \n" +
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 68d02e4e..8ab694a7 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
@@ -263,8 +263,8 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp
     //when there is something in the label
     
     final static String n3ForNewSubjAreaAssertion  =   
-    	"?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?newSubjArea . \n" + 
-	    "?newSubjArea <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" + 
+    	"?advisingRelationship <http://vivoweb.org/ontology/core#hasSubjectArea> ?newSubjArea . \n" + 
+	    "?newSubjArea <http://vivoweb.org/ontology/core#subjectAreaOf> ?advisingRelationship . \n" + 
         "?newSubjArea <"+ label + "> ?subjAreaLabel . \n" + 
         "?newSubjArea a <" + subjAreaClass + "> . ";    
 

From cb611da8adb21ff878479ca86cbced928a3ccb3a Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Thu, 24 Oct 2013 17:18:13 -0400
Subject: [PATCH 3/4] issued credential was using dateTimeValue not dateIssued;
 also property config changes for VIVO-408

---
 .../themes/wilma/i18n/all_es.properties       |  8 ++-
 .../listViewConfig-issuedCredential.xml       |  6 +-
 .../edit/forms/dateTimeValueForm.ftl          | 58 +++++++++++++++++++
 rdf/display/everytime/PropertyConfig.n3       | 27 +++++++++
 .../PersonHasIssuedCredentialGenerator.java   |  2 +-
 themes/wilma/i18n/all.properties              |  9 ++-
 6 files changed, 104 insertions(+), 6 deletions(-)
 create mode 100644 productMods/templates/freemarker/edit/forms/dateTimeValueForm.ftl

diff --git a/languages/example/themes/wilma/i18n/all_es.properties b/languages/example/themes/wilma/i18n/all_es.properties
index c779a684..1dc13fa6 100644
--- a/languages/example/themes/wilma/i18n/all_es.properties
+++ b/languages/example/themes/wilma/i18n/all_es.properties
@@ -869,4 +869,10 @@ select_credential_or_enter_name = Por favor, introduzca o seleccione un valor en
 type_of_credential = Tipo de Credencial
 credential_name = Nombre de Credencial
 selected_credential = Credential seleccionado
-year_issued = Año de Emisión
\ No newline at end of file
+year_issued = Año de Emisión
+year_awarded_for = año otorgado por
+create_year_awarded = Crear año concede
+edit_year_awarded = Editar año concede
+publication_date_for = fecha de publicación de
+create_publication_date = Crear fecha de publicación
+edit_publication_date = Editar fecha de publicación
diff --git a/productMods/config/listViewConfig-issuedCredential.xml b/productMods/config/listViewConfig-issuedCredential.xml
index a59a9fd1..349187ad 100644
--- a/productMods/config/listViewConfig-issuedCredential.xml
+++ b/productMods/config/listViewConfig-issuedCredential.xml
@@ -44,7 +44,7 @@
                                            ?dateTimeEndValue core:dateTime ?dateTimeEnd
                                          }
                               }  
-                     OPTIONAL { ?issuedCredential core:dateTimeValue ?dateTimeValue 
+                     OPTIONAL { ?issuedCredential core:dateIssued ?dateTimeValue 
                                 OPTIONAL { ?dateTimeValue core:dateTime ?dateTime }
                               }  
                     }  ORDER BY  DESC(?dateTime) DESC(?dateTimeEnd)
@@ -136,12 +136,12 @@
         CONSTRUCT { 
             ?subject ?property ?issuedCredential . 
             ?issuedCredential a core:IssuedCredential . 
-            ?issuedCredential core:dateTimeValue ?dateTimeValue .
+            ?issuedCredential core:dateIssued ?dateTimeValue .
             ?dateTimeValue core:dateTime ?dateTime 
         } WHERE {
             ?subject ?property ?issuedCredential .
             ?issuedCredential a core:IssuedCredential .
-            ?issuedCredential core:dateTimeValue ?dateTimeValue .
+            ?issuedCredential core:dateIssued ?dateTimeValue .
             ?dateTimeValue core:dateTime ?dateTime  
         } 
     </query-construct>
diff --git a/productMods/templates/freemarker/edit/forms/dateTimeValueForm.ftl b/productMods/templates/freemarker/edit/forms/dateTimeValueForm.ftl
new file mode 100644
index 00000000..48439917
--- /dev/null
+++ b/productMods/templates/freemarker/edit/forms/dateTimeValueForm.ftl
@@ -0,0 +1,58 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for adding/editing time values -->
+
+<#--Retrieve certain edit configuration information-->
+<#assign editMode = editConfiguration.pageData.editMode />
+<#assign htmlForElements = editConfiguration.pageData.htmlForElements />
+<#assign domainUri = editConfiguration.pageData.domainUri!"" />
+
+<#if editMode == "edit">        
+        <#assign titleVerb="${i18n().edit_capitalized}">        
+        <#assign disabledVal="disabled">
+        <#assign submitButtonText="${i18n().edit_date_time_value}">
+<#else>
+        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign submitButtonText="${i18n().create_date_time_value}">
+        <#assign disabledVal=""/>
+</#if>
+<#if domainUri?contains("IAO_0000030")>        
+    <#assign titleObject="${i18n().publication_date_for}">  
+    <#if editMode == "edit">  
+        <#assign submitButtonText="${i18n().edit_publication_date}">
+    <#else>
+        <#assign submitButtonText="${i18n().create_publication_date}">
+    </#if>
+<#elseif domainUri?contains("AwardReceipt")>
+    <#assign titleObject="${i18n().year_awarded_for}">
+    <#if editMode == "edit">  
+        <#assign submitButtonText="${i18n().edit_year_awarded}">
+    <#else>
+        <#assign submitButtonText="${i18n().create_year_awarded}">
+    </#if>
+<#else>
+        <#assign titleObject="${i18n().date_time_value_for}">
+</#if>
+
+<h2>${titleVerb} ${titleObject} ${editConfiguration.subjectName}</h2>
+
+<form class="customForm" action ="${submitUrl}" class="customForm">
+<#--Need to draw edit elements for dates here-->
+ <#if htmlForElements?keys?seq_contains("dateTimeField")>
+		${htmlForElements["dateTimeField"]}
+ </#if>
+
+    <p class="submit">
+        <input type="hidden" name="editKey" value="${editKey}" />
+        <input type="submit" id="submit" value="${submitButtonText}" role="button" />
+    
+        <span class="or"> ${i18n().or} </span>
+    
+        <a class="cancel" href="${editConfiguration.cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
+    </p>
+</form>
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />',
+                  '<link rel="stylesheet" href="${urls.base}/edit/forms/css/personHasEducationalTraining.css" />')}
+
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/utils.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')}
\ No newline at end of file
diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3
index 24f027fb..0ae8434d 100644
--- a/rdf/display/everytime/PropertyConfig.n3
+++ b/rdf/display/everytime/PropertyConfig.n3
@@ -710,5 +710,32 @@ local:grantRelatesConfig a :ObjectPropertyDisplayConfig ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbiography> .
 
+### faux properties for dateTimeValue ###
 
+local:publicationDateContext a :ConfigContext ;
+    :hasConfiguration local:publicationDateConfig ;
+    :configContextFor <http://vivoweb.org/ontology/core#dateTimeValue> ;
+    :qualifiedByDomain      <http://purl.obolibrary.org/obo/IAO_0000030> ;
+    :qualifiedBy      <http://vivoweb.org/ontology/core#DateTimeValue> .
 
+local:publicationDateConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-dateTimeValue.xml"^^xsd:string ;
+    :displayName "publication date" ;
+    vitro:displayRankAnnot 10;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGrouptime> .
+
+local:yearAwardedContext a :ConfigContext ;
+    :hasConfiguration local:yearAwardedConfig ;
+    :configContextFor <http://vivoweb.org/ontology/core#dateTimeValue> ;
+    :qualifiedByDomain      <http://vivoweb.org/ontology/core#AwardReceipt> ;
+    :qualifiedBy      <http://vivoweb.org/ontology/core#DateTimeValue> .
+
+local:yearAwardedConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-dateTimeValue.xml"^^xsd:string ;
+    :displayName "year awarded" ;
+    vitro:displayRankAnnot 10;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGrouptime> .
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java
index 594f5d4e..760b04c3 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java
@@ -28,7 +28,7 @@ public class PersonHasIssuedCredentialGenerator extends VivoBaseGenerator implem
 
     final static String issuedCredentialTypeClass = vivoCore + "IssuedCredential";
     final static String credentialTypeClass = vivoCore + "Credential";
-    final static String yearCredentialedPred = vivoCore + "dateTimeValue";
+    final static String yearCredentialedPred = vivoCore + "dateIssued";
     final static String issuedCredentialToInterval = vivoCore + "dateTimeInterval";
     final static String intervalType = vivoCore + "DateTimeInterval";
     final static String intervalToStart = vivoCore + "start";
diff --git a/themes/wilma/i18n/all.properties b/themes/wilma/i18n/all.properties
index 1f90bda2..f2a2052c 100644
--- a/themes/wilma/i18n/all.properties
+++ b/themes/wilma/i18n/all.properties
@@ -876,4 +876,11 @@ select_credential_or_enter_name = Please enter or select a value in the Credenti
 type_of_credential = Type of Credential
 credential_name = Credential Name
 selected_credential = Selected Credential
-year_issued = Year Issued
\ No newline at end of file
+year_issued = Year Issued
+year_awarded_for = year awarded for
+create_year_awarded = Create year awarded
+edit_year_awarded = Edit year awarded
+publication_date_for = publication date for
+create_publication_date = Create publication date
+edit_publication_date = Edit publication date
+

From 55f43cfd0e794be3cf06cd84ff9afb1b110228d2 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Fri, 25 Oct 2013 09:52:25 -0400
Subject: [PATCH 4/4] Tweak the formatting of supported browsers list.

---
 doc/upgrade-1.6.html | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/doc/upgrade-1.6.html b/doc/upgrade-1.6.html
index 3b7b9b58..42bc64d5 100644
--- a/doc/upgrade-1.6.html
+++ b/doc/upgrade-1.6.html
@@ -436,24 +436,26 @@ rdf/tbox/filegraph/tbox/vivo-skos-1.5.owl</pre>
                 	    <p>
             	            For this release, the following browsers are supported.
              	        </p>
-                	    <p>
-            	            Mac:
-             	        </p>
-        		 	        <ul>
-        		 	            <li>Chrome 30.0.1599.69 and above</li>
-        		 	            <li>FireFox 3.6.28, 10.0.12, 24</li>
-        		 	            <li>Opera 12.02</li>
-        		 	            <li>Safari 5.0.3</li>
-        		 	        </ul>
-            	    	</li>
-            	    	<li>
-        		            PC:
-        		 	        <ul>
-        		 	            <li>Chrome 25.1364.2 and above</li>
-        		 	            <li>FireFox 10.0.12, 24</li>
-        		 	            <li>Internet Explorer 8, 9, 10</li>
-        		 	            <li>Opera 12.02</li>
-        		 	        </ul>
+			    	    <ul>
+			    	    	<li>
+			    	    		Mac:
+					 	        <ul>
+					 	            <li>Chrome 30.0.1599.69 and above</li>
+					 	            <li>FireFox 3.6.28, 10.0.12, 24</li>
+					 	            <li>Opera 12.02</li>
+					 	            <li>Safari 5.0.3</li>
+					 	        </ul>
+			    	    	</li>
+			    	    	<li>
+					            PC:
+					 	        <ul>
+					 	            <li>Chrome 25.1364.2 and above</li>
+					 	            <li>FireFox 10.0.12, 24</li>
+					 	            <li>Internet Explorer 8, 9, 10</li>
+					 	            <li>Opera 12.02</li>
+					 	        </ul>
+					 	    </li>
+			    	    </ul>
                 	</li>
                </ul>