Merge branch 'develop' into feature/elk

productMods/WEB-INF/resources/startup_listeners.txt

@@ -13,9 +13,6 @@ edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSetup
 
 edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSmokeTests
 
-# For the conversion from 1.6 or earlier (RDB) to 1.7 or later (TDB)
-edu.cornell.mannlib.vitro.webapp.servlet.setup.GuardAgainstUnmigratedRDB
-
 edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings$Setup
 
 edu.cornell.mannlib.vitro.webapp.application.ApplicationImpl$ComponentsSetup
@@ -36,6 +33,7 @@ edu.cornell.mannlib.vitro.webapp.servlet.setup.FileGraphSetup
 
 # Invokes process to perform updates to align with ontology changes if needed -->
 edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase
+edu.cornell.mannlib.vitro.webapp.migration.Release18Migrator
 
 edu.cornell.mannlib.vitro.webapp.application.ApplicationImpl$ReasonersSetup
 edu.cornell.mannlib.vitro.webapp.servlet.setup.SimpleReasonerSetup
@@ -48,7 +46,7 @@ edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionRegistry$Setup
 
 edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsSmokeTest
 
-edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper$Setup
+edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBean$Setup
 
 edu.cornell.mannlib.vitro.webapp.auth.policy.setup.CommonPolicyFamilySetup
 

productMods/WEB-INF/web.xml

@@ -819,6 +819,15 @@
     <url-pattern>/showObjectPropertyHierarchy</url-pattern>
   </servlet-mapping>
 
+  <servlet>
+    <servlet-name>ListFauxPropertiesController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListFauxPropertiesController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>ListFauxPropertiesController</servlet-name>
+    <url-pattern>/listFauxProperties</url-pattern>
+  </servlet-mapping>
+
   <servlet>
     <servlet-name>ShowDataPropertyHierarchyController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ShowDataPropertyHierarchyController</servlet-class>

productMods/config/listViewConfig-default.xml

@@ -24,6 +24,7 @@
                ?title WHERE {
   
             ?subject ?property ?object .
+			?object a ?objectType .
                 LET (?localName := afn:localname(?object)) 
             
             OPTIONAL { ?object rdfs:label ?label } 
@@ -60,16 +61,16 @@
         
         CONSTRUCT {
             ?subject ?property ?object .
+			?object a ?objectType .
             ?object a ?subclass .
             ?object rdfs:label ?label .
         } WHERE {
             { 
                 ?subject ?property ?object .
-            } UNION {                
-                ?subject ?property ?object .
-                ?object a ?subclass .
+				?object a ?objectType .
             } UNION {      
                 ?subject ?property ?object .
+				?object a ?objectType .
                 ?object rdfs:label ?label .
             }        
         }
@@ -84,6 +85,7 @@
 
         CONSTRUCT {
             ?subject ?property ?object .
+			?object a ?objectType .
             ?object vitro:mostSpecificType ?typeUri .
             ?typeUri vitro:inClassGroup ?classGroup .
             ?classGroup a vitro:ClassGroup .
@@ -94,14 +96,17 @@
         } WHERE {
             { 
                 ?subject ?property ?object .
+				?object a ?objectType .
             } UNION {            
                 ?subject ?property ?object .
+				?object a ?objectType .
                 ?object vitro:mostSpecificType ?typeUri .
                 ?typeUri rdfs:label ?type .
                 ?typeUri vitro:inClassGroup ?classGroup .
                 ?classGroup a vitro:ClassGroup
             } UNION {            
                 ?subject ?property ?object .
+				?object a ?objectType .
                 ?object obo:ARG_2000028 ?vcard . 
                 ?vcard vcard:hasTitle ?titleObj .
                 ?titleObj vcard:title ?title

productMods/config/listViewConfig-organizationForTraining.xml

@@ -167,13 +167,13 @@
         PREFIX core: <http://vivoweb.org/ontology/core#>   
         CONSTRUCT { 
             ?subject ?property ?edTraining .
-            ?leaderRole core:dateTimeInterval ?dateTimeInterval .
+            ?edTraining core:dateTimeInterval ?dateTimeInterval .
             ?dateTimeInterval core:start ?dateTimeStartValue .
             ?dateTimeStartValue core:dateTime ?dateTimeStart 
         } WHERE {
             ?subject ?property ?edTraining .
             ?edTraining a core:EducationalProcess .
-            ?leaderRole core:dateTimeInterval ?dateTimeInterval .
+            ?edTraining core:dateTimeInterval ?dateTimeInterval .
             ?dateTimeInterval core:start ?dateTimeStartValue .
             ?dateTimeStartValue core:dateTime ?dateTimeStart 
         } 
@@ -183,15 +183,15 @@
         PREFIX core: <http://vivoweb.org/ontology/core#>   
         CONSTRUCT { 
             ?subject ?property ?edTraining .
-            ?leaderRole core:dateTimeInterval ?dateTimeInterval .
+            ?edTraining core:dateTimeInterval ?dateTimeInterval .
             ?dateTimeInterval core:end ?dateTimeEndValue .
-            ?dateTimeStartValue core:dateTime ?dateTimeEnd 
+            ?dateTimeEndValue core:dateTime ?dateTimeEnd 
         } WHERE {
             ?subject ?property ?edTraining .
             ?edTraining a core:EducationalProcess .
-            ?leaderRole core:dateTimeInterval ?dateTimeInterval .
+            ?edTraining core:dateTimeInterval ?dateTimeInterval .
             ?dateTimeInterval core:end ?dateTimeEndValue .
-            ?dateTimeStartValue core:dateTime ?dateTimeEnd
+            ?dateTimeEndValue core:dateTime ?dateTimeEnd
         } 
     </query-construct>