From f384f1447547bb51c8268b11e51893492a740553 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Wed, 8 Oct 2014 10:36:38 -0400
Subject: [PATCH 01/30] Remove obsolete code lines, reduce compiler warnings,
 add generics.

---
 .../edit/PropertyRetryController.java         | 38 ++++++-------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java
index 935dfcf4c..739f50be6 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java
@@ -22,6 +22,7 @@ import edu.cornell.mannlib.vedit.beans.Option;
 import edu.cornell.mannlib.vedit.controller.BaseEditController;
 import edu.cornell.mannlib.vedit.forwarder.PageForwarder;
 import edu.cornell.mannlib.vedit.forwarder.impl.UrlForwarder;
+import edu.cornell.mannlib.vedit.listener.ChangeListener;
 import edu.cornell.mannlib.vedit.util.FormUtils;
 import edu.cornell.mannlib.vedit.validator.Validator;
 import edu.cornell.mannlib.vedit.validator.impl.IntValidator;
@@ -29,14 +30,12 @@ import edu.cornell.mannlib.vedit.validator.impl.XMLNameValidator;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionListener;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.edit.utils.RoleLevelOptionsSetup;
 import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
-import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 
 public class PropertyRetryController extends BaseEditController {
     
@@ -67,10 +66,8 @@ public class PropertyRetryController extends BaseEditController {
         }
 
         ObjectPropertyDao propDao = ModelAccess.on(getServletContext()).getWebappDaoFactory().getObjectPropertyDao();
-                //getUnfilteredWebappDaoFactory().getObjectPropertyDao();
         epo.setDataAccessObject(propDao);
         OntologyDao ontDao = request.getUnfilteredWebappDaoFactory().getOntologyDao();
-        VClassDao vclassDao = request.getUnfilteredWebappDaoFactory().getVClassDao();
 
         ObjectProperty propertyForEditing = null;
         if (!epo.getUseRecycledBean()){
@@ -82,6 +79,7 @@ public class PropertyRetryController extends BaseEditController {
                     epo.setAction("update");
                 } catch (NullPointerException e) {
                     log.error("Need to implement 'record not found' error message.");
+                    throw(e);
                 }
             } else {
                 propertyForEditing = new ObjectProperty();
@@ -105,9 +103,9 @@ public class PropertyRetryController extends BaseEditController {
 
 
         //set any validators
-        List localNameValidatorList = new ArrayList();
+        List<Validator> localNameValidatorList = new ArrayList<>();
         localNameValidatorList.add(new XMLNameValidator());
-        List localNameInverseValidatorList = new ArrayList();
+        List<Validator> localNameInverseValidatorList = new ArrayList<>();
         localNameInverseValidatorList.add(new XMLNameValidator(true));
         epo.getValidatorMap().put("LocalName", localNameValidatorList);
         epo.getValidatorMap().put("LocalNameInverse", localNameInverseValidatorList);
@@ -116,7 +114,7 @@ public class PropertyRetryController extends BaseEditController {
         epo.getValidatorMap().put("DisplayRank", displayRankValidatorList);
 
         //set up any listeners
-        List changeListenerList = new ArrayList();
+        List<ChangeListener> changeListenerList = new ArrayList<>();
         changeListenerList.add(new PropertyRestrictionListener(getServletContext()));
         epo.setChangeListenerList(changeListenerList);
 
@@ -127,7 +125,7 @@ public class PropertyRetryController extends BaseEditController {
 
         //set the getMethod so we can retrieve a new bean after we've inserted it
         try {
-            Class[] args = new Class[1];
+            Class<?>[] args = new Class[1];
             args[0] = String.class;
             epo.setGetMethod(propDao.getClass().getDeclaredMethod("getObjectPropertyByURI",args));
         } catch (NoSuchMethodException e) {
@@ -149,7 +147,7 @@ public class PropertyRetryController extends BaseEditController {
         optionMap.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getUpdateOptionsList(propertyForEditing));
         optionMap.put("HiddenFromPublishBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getPublishOptionsList(propertyForEditing));    
 
-        List groupOptList = FormUtils.makeOptionListFromBeans(request.getUnfilteredWebappDaoFactory().getPropertyGroupDao().getPublicGroups(true),"URI","Name", ((propertyForEditing.getGroupURI()==null) ? "" : propertyForEditing.getGroupURI()), null, (propertyForEditing.getGroupURI()!=null));
+        List<Option> groupOptList = FormUtils.makeOptionListFromBeans(request.getUnfilteredWebappDaoFactory().getPropertyGroupDao().getPublicGroups(true),"URI","Name", ((propertyForEditing.getGroupURI()==null) ? "" : propertyForEditing.getGroupURI()), null, (propertyForEditing.getGroupURI()!=null));
         HashMap<String,Option> hashMap = new HashMap<String,Option>();
         groupOptList = getSortedList(hashMap,groupOptList,request);
         groupOptList.add(0,new Option("","none"));
@@ -163,7 +161,6 @@ public class PropertyRetryController extends BaseEditController {
         request.setAttribute("inverseFunctional",propertyForEditing.getInverseFunctional());
         request.setAttribute("selectFromExisting",propertyForEditing.getSelectFromExisting());
         request.setAttribute("offerCreateNewOption", propertyForEditing.getOfferCreateNewOption());
-        //request.setAttribute("stubObjectRelation", propertyForEditing.getStubObjectRelation());
         request.setAttribute("objectIndividualSortPropertyURI", propertyForEditing.getObjectIndividualSortPropertyURI());
         request.setAttribute("domainEntitySortDirection", propertyForEditing.getDomainEntitySortDirection());
         request.setAttribute("collateBySubclass", propertyForEditing.getCollateBySubclass());
@@ -203,7 +200,8 @@ public class PropertyRetryController extends BaseEditController {
 
     }
 
-    public void doGet (HttpServletRequest request, HttpServletResponse response) {
+    @Override
+	public void doGet (HttpServletRequest request, HttpServletResponse response) {
         doPost(request, response);
     }
 
@@ -269,21 +267,9 @@ public class PropertyRetryController extends BaseEditController {
         optionMap.put("RangeVClassURI", rangeOptionList);
     }
     
-    private List<VClass> makeVClassListForOptions(String VClassURI, List<VClass> allClassBeanList, VClassDao vclassDao) {
-        List<VClass> currentClassList = new ArrayList<VClass>();
-        VClass currentVClass = vclassDao.getVClassByURI(VClassURI);
-        if (currentVClass != null && currentVClass.isAnonymous()) {
-            currentClassList.addAll(allClassBeanList);
-            currentClassList.add(0,currentVClass);
-        } else {
-            currentClassList = allClassBeanList; 
-        }
-        return currentClassList;
-    }
-    
-    class PropertyInsertPageForwarder implements PageForwarder {
-
-        public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo){
+    private static class PropertyInsertPageForwarder implements PageForwarder {
+        @Override
+		public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo){
             String newPropertyUrl = "propertyEdit?uri=";
             ObjectProperty p = (ObjectProperty) epo.getNewBean();
             try {

From 21df0f53beee99610218af3292d33aa9d6819595 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Mon, 27 Oct 2014 12:42:48 -0400
Subject: [PATCH 02/30] Starting the skeleton

---
 .../edit/FauxPropertyEditController.java      |  12 +
 .../edit/FauxPropertyRetryController.java     |  31 +++
 .../vitro/webapp/dao/FauxPropertyDao.java     |  10 +
 .../vitro/webapp/dao/WebappDaoFactory.java    |   5 +
 .../filtering/FauxPropertyDaoFiltering.java   | 218 ++++++++++++++++++
 .../filtering/WebappDaoFactoryFiltering.java  |  10 +
 .../webapp/dao/jena/FauxPropertyDaoJena.java  |  33 +++
 .../webapp/dao/jena/WebappDaoFactoryJena.java |  10 +
 .../webapp/dao/WebappDaoFactoryStub.java      |  15 +-
 9 files changed, 342 insertions(+), 2 deletions(-)
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyEditController.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyEditController.java
new file mode 100644
index 000000000..73559b00a
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyEditController.java
@@ -0,0 +1,12 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.edit;
+
+import edu.cornell.mannlib.vedit.controller.BaseEditController;
+
+/**
+ * TODO
+ */
+public class FauxPropertyEditController extends BaseEditController {
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
new file mode 100644
index 000000000..57d771a50
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
@@ -0,0 +1,31 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.edit;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import edu.cornell.mannlib.vedit.controller.BaseEditController;
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+
+/**
+ * TODO
+ */
+public class FauxPropertyRetryController extends BaseEditController {
+	@Override
+	public void doPost(HttpServletRequest req, HttpServletResponse response) {
+		if (!isAuthorizedToDisplayPage(req, response,
+				SimplePermission.EDIT_ONTOLOGY.ACTION)) {
+			return;
+		}
+
+		// TODO
+	}
+	
+    @Override
+	public void doGet (HttpServletRequest request, HttpServletResponse response) {
+        doPost(request, response);
+    }
+
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java
new file mode 100644
index 000000000..68b1a0afd
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java
@@ -0,0 +1,10 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao;
+
+/**
+ * TODO
+ */
+public interface FauxPropertyDao {
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactory.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactory.java
index 5cfa5d278..37ad01170 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactory.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactory.java
@@ -91,6 +91,11 @@ public interface WebappDaoFactory {
      * returns a Data Access Object for working with ontology class objects 
      */
     public VClassDao getVClassDao();
+    
+    /**
+     * returns a Data Access Object for working with "faux" ObjectProperties.
+     */
+    public FauxPropertyDao getFauxPropertyDao();
 
 
     /* ==================== DAOs for ABox manipulation ===================== */
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java
new file mode 100644
index 000000000..ec9c9299b
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java
@@ -0,0 +1,218 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao.filtering;
+
+import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
+
+class FauxPropertyDaoFiltering extends BaseFiltering implements FauxPropertyDao{
+    final FauxPropertyDao innerFauxPropertyDao;    
+    final VitroFilters filters;   
+
+    public FauxPropertyDaoFiltering(FauxPropertyDao fauxPropertyDao,
+            VitroFilters filters) {
+        super();
+        this.innerFauxPropertyDao = fauxPropertyDao;
+        this.filters = filters;              
+    }  
+    
+//    /* filtered methods */
+//    public List getAllObjectProperties() {
+//        return filterAndWrap(innerFauxPropertyDao.getAllObjectProperties(), filters);        
+//    }
+//
+//    public List getObjectPropertiesForFauxPropertyStatements(List fauxPropertyStatements) {
+//        //assume that the objPropStmts are already filtered
+//        List<FauxProperty> list =
+//            innerFauxPropertyDao
+//                .getObjectPropertiesForFauxPropertyStatements(fauxPropertyStatements);
+//       return filterAndWrap(list, filters);
+//    }
+//
+//
+//    public FauxProperty getFauxPropertyByURI(String fauxPropertyURI) {
+//        FauxProperty newOprop=innerFauxPropertyDao.getFauxPropertyByURI(fauxPropertyURI);
+//        return (newOprop == null) ? null : new FauxPropertyFiltering(newOprop, filters);
+//    }
+//    
+//    public FauxProperty getFauxPropertyByURIs(String fauxPropertyURI, String domainURI, String rangeURI) {
+//        FauxProperty newOprop=innerFauxPropertyDao.getFauxPropertyByURIs(fauxPropertyURI, domainURI, rangeURI);
+//        return (newOprop == null) ? null : new FauxPropertyFiltering(newOprop, filters);
+//    }
+//
+//    public FauxProperty getFauxPropertyByURIs(String fauxPropertyURI, String domainURI, String rangeURI, FauxProperty base) {
+//        FauxProperty newOprop=innerFauxPropertyDao.getFauxPropertyByURIs(fauxPropertyURI, domainURI, rangeURI, base);
+//        return (newOprop == null) ? null : new FauxPropertyFiltering(newOprop, filters);
+//    }
+//    
+//    public List<FauxPropertyStatement> getStatementsUsingFauxProperty(FauxProperty op) {
+//        return FauxPropertyStatementDaoFiltering.filterAndWrapList(innerFauxPropertyDao.getStatementsUsingFauxProperty(op),filters);       
+//    }
+//    
+//    public List getRootObjectProperties() {
+//        return filterAndWrap(innerFauxPropertyDao.getRootObjectProperties(),filters);
+//    }
+// 
+//    
+//    /* other methods */
+//    public void deleteFauxProperty(String fauxPropertyURI) {
+//        innerFauxPropertyDao.deleteFauxProperty(fauxPropertyURI);
+//    }
+//
+//
+//    public void deleteFauxProperty(FauxProperty fauxProperty) {
+//        innerFauxPropertyDao.deleteFauxProperty(fauxProperty);
+//    }
+//
+//
+//    public void fillObjectPropertiesForIndividual(Individual individual) {
+//        innerFauxPropertyDao.fillObjectPropertiesForIndividual(individual);
+//    }
+//
+//    public int insertFauxProperty(FauxProperty fauxProperty) throws InsertException {
+//        return innerFauxPropertyDao.insertFauxProperty(fauxProperty);
+//    }
+//
+//    public void updateFauxProperty(FauxProperty fauxProperty) {
+//        innerFauxPropertyDao.updateFauxProperty(fauxProperty);
+//    }
+//
+//    public void addSuperproperty(FauxProperty property, FauxProperty superproperty) {
+//    	innerFauxPropertyDao.addSuperproperty(property, superproperty);
+//    }
+//    
+//    public void addSuperproperty(String propertyURI, String superpropertyURI) {
+//    	innerFauxPropertyDao.addSuperproperty(propertyURI, superpropertyURI);
+//    }
+//    
+//    public void removeSuperproperty(FauxProperty property, FauxProperty superproperty) {
+//    	innerFauxPropertyDao.removeSuperproperty(property, superproperty);
+//    }
+//    
+//    public void removeSuperproperty(String propertyURI, String superpropertyURI) {
+//    	innerFauxPropertyDao.removeSuperproperty(propertyURI, superpropertyURI);
+//    }
+//    
+//    public void addSubproperty(FauxProperty property, FauxProperty subproperty) {
+//    	innerFauxPropertyDao.addSubproperty(property, subproperty);
+//    }
+//    
+//    public void addSubproperty(String propertyURI, String subpropertyURI) {
+//    	innerFauxPropertyDao.addSubproperty(propertyURI, subpropertyURI);
+//    }
+//    
+//    public void removeSubproperty(FauxProperty property, FauxProperty subproperty) {
+//    	innerFauxPropertyDao.removeSubproperty(property, subproperty);
+//    }
+//    
+//    public void removeSubproperty(String propertyURI, String subpropertyURI) {
+//    	innerFauxPropertyDao.removeSubproperty(propertyURI, subpropertyURI);
+//    }
+//    
+//    public List <String> getSubPropertyURIs(String propertyURI) {
+//    	return innerFauxPropertyDao.getSubPropertyURIs(propertyURI);
+//    }
+//
+//    public List <String> getAllSubPropertyURIs(String propertyURI) {
+//    	return innerFauxPropertyDao.getAllSubPropertyURIs(propertyURI);
+//    }
+//
+//    public List <String> getSuperPropertyURIs(String propertyURI, boolean direct) {
+//    	return innerFauxPropertyDao.getSuperPropertyURIs(propertyURI, direct);
+//    }
+//
+//    public List <String> getAllSuperPropertyURIs(String propertyURI) {
+//    	return innerFauxPropertyDao.getAllSuperPropertyURIs(propertyURI);
+//    }    
+//                                             
+//    public static List<FauxProperty> filterAndWrap(List<FauxProperty> list, VitroFilters filters){
+//        if( list == null ) return null;
+//        if( list.size() ==0 ) return list;
+//        
+//        List<FauxProperty> filtered = new LinkedList<FauxProperty>();         
+//        Filter.filter(list, 
+//                new AndUnary<FauxProperty>(notNull,filters.getFauxPropertyFilter()), 
+//                filtered);
+//                                
+//        List<FauxProperty> wrapped = new LinkedList<FauxProperty>();        
+//        for( FauxProperty prop : filtered){
+//            if( prop != null){
+//                wrapped.add( new FauxPropertyFiltering(prop, filters));
+//            }
+//        }        
+//        return wrapped;   
+//    }
+//    
+//    private static final UnaryFunctor<FauxProperty,Boolean> notNull =
+//        new UnaryFunctor<FauxProperty,Boolean>(){
+//            @Override
+//            public Boolean fn(FauxProperty arg) {
+//                return arg != null;
+//            }
+//    };
+//
+//	public void addSubproperty(Property property, Property subproperty) {
+//		innerFauxPropertyDao.addSubproperty(property, subproperty);	
+//	}
+//
+//	public void addSuperproperty(Property property, Property superproperty) {
+//		innerFauxPropertyDao.addSuperproperty(property, superproperty);
+//	}
+//
+//	public void removeSubproperty(Property property, Property subproperty) {
+//		innerFauxPropertyDao.removeSubproperty(property, subproperty);
+//	}
+//
+//	public void removeSuperproperty(Property property, Property superproperty) {
+//		innerFauxPropertyDao.removeSuperproperty(property, superproperty);
+//	}
+//
+//	public void addEquivalentProperty(String propertyURI,
+//			String equivalentPropertyURI) {
+//		innerFauxPropertyDao.addEquivalentProperty(propertyURI, equivalentPropertyURI);
+//	}
+//
+//	public void addEquivalentProperty(Property property,
+//			Property equivalentProperty) {
+//		innerFauxPropertyDao.addEquivalentProperty(property, equivalentProperty);
+//	}
+//
+//	public List<String> getEquivalentPropertyURIs(String propertyURI) {
+//		return innerFauxPropertyDao.getEquivalentPropertyURIs(propertyURI);
+//	}
+//
+//	public void removeEquivalentProperty(String propertyURI,
+//			String equivalentPropertyURI) {
+//		innerFauxPropertyDao.removeEquivalentProperty(propertyURI, equivalentPropertyURI);
+//	}
+//
+//	public void removeEquivalentProperty(Property property,
+//			Property equivalentProperty) {
+//		innerFauxPropertyDao.removeEquivalentProperty(property, equivalentProperty);
+//	}
+//    
+//	public boolean skipEditForm(String predicateURI) {
+//		return innerFauxPropertyDao.skipEditForm(predicateURI);
+//	}
+//	
+//    public List <VClass> getClassesWithRestrictionOnProperty(String propertyURI) {
+//    	return innerFauxPropertyDao.getClassesWithRestrictionOnProperty(propertyURI);
+//    }
+//
+//    @Override
+//    // This may need to be filtered at some point.
+//    public List<FauxProperty> getFauxPropertyList(Individual subject) {
+//        return innerFauxPropertyDao.getFauxPropertyList(subject);
+//    }
+//    
+//    @Override
+//    // This may need to be filtered at some point.
+//    public List<FauxProperty> getFauxPropertyList(String subjectUri) {
+//        return innerFauxPropertyDao.getFauxPropertyList(subjectUri);
+//    }
+//
+//    @Override
+//    public String getCustomListViewConfigFileName(FauxProperty fauxProperty) {
+//        return innerFauxPropertyDao.getCustomListViewConfigFileName(fauxProperty);
+//    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/WebappDaoFactoryFiltering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/WebappDaoFactoryFiltering.java
index b362daca8..82e7a7d1c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/WebappDaoFactoryFiltering.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/WebappDaoFactoryFiltering.java
@@ -10,6 +10,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
 import edu.cornell.mannlib.vitro.webapp.dao.DatatypeDao;
 import edu.cornell.mannlib.vitro.webapp.dao.DisplayModelDao;
+import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
 import edu.cornell.mannlib.vitro.webapp.dao.MenuDao;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
@@ -57,6 +58,7 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
     transient private DataPropertyStatementDao filteringDataPropertyStatementDao=null;
     transient private IndividualDao            filteringIndividualDao=null;
     transient private ObjectPropertyDao        filteringObjectPropertyDao=null;
+    transient private FauxPropertyDao          filteringFauxPropertyDao=null;
     transient private ObjectPropertyStatementDao filteringObjectPropertyStatementDao=null;
     transient private VClassDao                filteringVClassDao=null;
 
@@ -232,6 +234,14 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
         return filteringObjectPropertyDao;
     }
 
+    public FauxPropertyDao getFauxPropertyDao() {
+    	if (filteringFauxPropertyDao == null ){
+    		filteringFauxPropertyDao = new FauxPropertyDaoFiltering(innerWebappDaoFactory.getFauxPropertyDao(),
+    				filters);
+    	}
+    	return filteringFauxPropertyDao;
+    }
+    
 
     public VClassDao getVClassDao() {
         if (filteringVClassDao == null ){
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
new file mode 100644
index 000000000..3bfcddfe0
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
@@ -0,0 +1,33 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao.jena;
+
+import java.util.Map;
+
+import org.apache.jena.atlas.lib.Pair;
+
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
+
+/**
+ * TODO
+ */
+public class FauxPropertyDaoJena implements FauxPropertyDao {
+
+	/**
+	 * @param rdfService
+	 * @param dwf
+	 * @param customListViewConfigFileMap
+	 * @param webappDaoFactoryJena
+	 */
+	public FauxPropertyDaoJena(
+			RDFService rdfService,
+			DatasetWrapperFactory dwf,
+			Map<Pair<String, Pair<ObjectProperty, String>>, String> customListViewConfigFileMap,
+			WebappDaoFactoryJena webappDaoFactoryJena) {
+		// TODO Auto-generated constructor stub
+		throw new RuntimeException("FauxPropertyDaoJena Constructor not implemented.");
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
index a74cada20..cc3e12677 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
@@ -33,6 +33,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
 import edu.cornell.mannlib.vitro.webapp.dao.DatatypeDao;
 import edu.cornell.mannlib.vitro.webapp.dao.DisplayModelDao;
+import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
 import edu.cornell.mannlib.vitro.webapp.dao.MenuDao;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
@@ -375,6 +376,15 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
         return objectPropertyDao;
     }
 
+    private FauxPropertyDao fauxPropertyDao = null;
+    @Override
+    public FauxPropertyDao getFauxPropertyDao() {
+    	if( fauxPropertyDao == null )
+    		fauxPropertyDao = new FauxPropertyDaoJena(
+    				rdfService, dwf, config.customListViewConfigFileMap, this);
+    	return fauxPropertyDao;
+    }
+    
     private PropertyInstanceDao propertyInstanceDao = null;
     @Override
 	public PropertyInstanceDao getPropertyInstanceDao() {
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java
index 809aba701..a5ecbac35 100644
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java
@@ -3,7 +3,6 @@
 package stubs.edu.cornell.mannlib.vitro.webapp.dao;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import edu.cornell.mannlib.vitro.webapp.dao.ApplicationDao;
@@ -11,6 +10,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
 import edu.cornell.mannlib.vitro.webapp.dao.DatatypeDao;
 import edu.cornell.mannlib.vitro.webapp.dao.DisplayModelDao;
+import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
 import edu.cornell.mannlib.vitro.webapp.dao.MenuDao;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
@@ -42,6 +42,7 @@ public class WebappDaoFactoryStub implements WebappDaoFactory {
 	private MenuDao menuDao;
 	private ObjectPropertyDao objectPropertyDao;
 	private ObjectPropertyStatementDao objectPropertyStatementDao;
+	private FauxPropertyDao fauxPropertyDao;
 	private OntologyDao ontologyDao;
 	private UserAccountsDao userAccountsDao;
 	private VClassDao vClassDao;
@@ -74,6 +75,10 @@ public class WebappDaoFactoryStub implements WebappDaoFactory {
 		this.objectPropertyStatementDao = objectPropertyStatementDao;
 	}
 	
+	public void setFauxPropertyDao(FauxPropertyDao fauxPropertyDao) {
+		this.fauxPropertyDao = fauxPropertyDao;
+	}
+
 	public void setOntologyDao(OntologyDao ontologyDao) {
 		this.ontologyDao = ontologyDao;
 	}
@@ -120,9 +125,15 @@ public class WebappDaoFactoryStub implements WebappDaoFactory {
 		return this.objectPropertyDao;
 	}
 
+	@Override
+	public FauxPropertyDao getFauxPropertyDao() {
+		return this.fauxPropertyDao;
+	}
+
 	@Override
 	public ObjectPropertyStatementDao getObjectPropertyStatementDao() {
-return this.objectPropertyStatementDao;	}
+		return this.objectPropertyStatementDao;
+	}
 
 	@Override
 	public OntologyDao getOntologyDao() {

From 02ac3944e0373354560ff2cae6068bcb17c40cda Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Thu, 30 Oct 2014 15:52:23 -0400
Subject: [PATCH 03/30] VIVO-774 show list of faux properties on the Property
 Editing page.

---
 .../vitro/webapp/beans/FauxProperty.java      |  73 ++++
 .../edit/PropertyEditController.java          |  19 +-
 .../vitro/webapp/dao/FauxPropertyDao.java     |  37 +-
 .../filtering/FauxPropertyDaoFiltering.java   | 251 +++----------
 .../webapp/dao/jena/FauxPropertyDaoJena.java  | 332 +++++++++++++++++-
 .../webapp/dao/jena/WebappDaoFactoryJena.java |   6 +-
 .../vitro/webapp/utils/SparqlQueryRunner.java |  10 +
 .../templates/edit/specific/props_edit.jsp    |  37 ++
 8 files changed, 530 insertions(+), 235 deletions(-)
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
new file mode 100644
index 000000000..08a440c47
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
@@ -0,0 +1,73 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.beans;
+
+import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource;
+
+import java.util.Objects;
+
+/**
+ * Represents a specialization on an ObjectProperty, only meaningful for
+ * display.
+ * 
+ * Must have a baseURI and a rangeURI. Other fields are optional.
+ */
+public class FauxProperty extends BaseResourceBean implements ResourceBean {
+	private final String rangeURI;
+	private final String domainURI;
+
+	private String rangeLabel;
+	private String domainLabel;
+
+	/**
+	 * Arguments are in this order to mimic the relationship: subject ==>
+	 * property ==> object
+	 * 
+	 * @param domainURI
+	 *            URI of the subject class. May be null.
+	 * @param baseURI
+	 *            URI of the property. May not be null.
+	 * @param rangeUri
+	 *            URI of the object class. May not be null.
+	 */
+	public FauxProperty(String domainURI, String baseURI, String rangeURI) {
+		super(Objects.requireNonNull(baseURI, "baseURI may not be null"));
+		this.rangeURI = Objects.requireNonNull(rangeURI,
+				"rangeURI may not be null");
+		this.domainURI = domainURI;
+	}
+
+	public String getRangeURI() {
+		return rangeURI;
+	}
+
+	public void setRangeLabel(String rangeLabel) {
+		this.rangeLabel = rangeLabel;
+	}
+
+	public String getRangeLabel() {
+		return (rangeLabel == null) ? localName(rangeURI) : rangeLabel;
+	}
+
+	public String getDomainURI() {
+		return domainURI;
+	}
+
+	public void setDomainLabel(String domainLabel) {
+		this.domainLabel = domainLabel;
+	}
+
+	public String getDomainLabel() {
+		return (domainLabel == null) ? (domainURI == null ? "null"
+				: localName(domainURI)) : domainLabel;
+	}
+
+	private String localName(String uriString) {
+		try {
+			return createResource(uriString).getLocalName();
+		} catch (Exception e) {
+			return uriString;
+		}
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java
index 8741f65d1..460bbd229 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java
@@ -17,8 +17,10 @@ import org.apache.commons.logging.LogFactory;
 
 import edu.cornell.mannlib.vedit.beans.EditProcessObject;
 import edu.cornell.mannlib.vedit.beans.FormObject;
+import edu.cornell.mannlib.vedit.beans.Option;
 import edu.cornell.mannlib.vedit.controller.BaseEditController;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
 import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
@@ -33,7 +35,8 @@ public class PropertyEditController extends BaseEditController {
 
 	private static final Log log = LogFactory.getLog(PropertyEditController.class.getName());
 	
-    public void doPost (HttpServletRequest request, HttpServletResponse response) {
+    @Override
+	public void doPost (HttpServletRequest request, HttpServletResponse response) {
 		if (!isAuthorizedToDisplayPage(request, response,
 				SimplePermission.EDIT_ONTOLOGY.ACTION)) {
         	return;
@@ -189,11 +192,9 @@ public class PropertyEditController extends BaseEditController {
         request.setAttribute("suppressquery","true");
 
 
-        boolean FORCE_NEW = true;
-
         EditProcessObject epo = super.createEpo(request, FORCE_NEW);
         FormObject foo = new FormObject();
-        HashMap OptionMap = new HashMap();
+        HashMap<String, List<Option>> OptionMap = new HashMap<>();
         foo.setOptionLists(OptionMap);
         epo.setFormObject(foo);
 
@@ -210,11 +211,18 @@ public class PropertyEditController extends BaseEditController {
         sortForPickList(subProps, vreq);
         request.setAttribute("subproperties", subProps);
         
+        // equivalent properties and faux properties 
+        
         List<ObjectProperty> eqProps = getObjectPropertiesForURIList(
                 opDao.getEquivalentPropertyURIs(p.getURI()), opDao);
         sortForPickList(eqProps, vreq);
         request.setAttribute("equivalentProperties", eqProps);
         
+        List<FauxProperty> fauxProps = vreq.getUnfilteredAssertionsWebappDaoFactory().getFauxPropertyDao().
+        		getFauxPropertiesForBaseUri(p.getURI());
+        sortForPickList(fauxProps, vreq);
+        request.setAttribute("fauxproperties", fauxProps);
+        
         RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
         request.setAttribute("epoKey",epo.getKey());
         request.setAttribute("propertyWebapp", p);
@@ -232,7 +240,8 @@ public class PropertyEditController extends BaseEditController {
 
     }
 
-    public void doGet (HttpServletRequest request, HttpServletResponse response) {
+    @Override
+	public void doGet (HttpServletRequest request, HttpServletResponse response) {
         doPost(request,response);
     }
     
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java
index 68b1a0afd..8edfefa9b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java
@@ -2,9 +2,44 @@
 
 package edu.cornell.mannlib.vitro.webapp.dao;
 
+import java.util.List;
+
+import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
+
 /**
- * TODO
+ * Utility methods for fetching, storing and manipulating FauxProperty objects.
  */
 public interface FauxPropertyDao {
 
+	/**
+	 * Get all of the FauxProperties that are based on this URI.
+	 * 
+	 * @return May return an empty list. Never returns null.
+	 */
+	List<FauxProperty> getFauxPropertiesForBaseUri(String uri);
+
+	/**
+	 * If the display model contains a ConfigContext with this URI, get the
+	 * FauxProperty that it describes.
+	 * 
+	 * @return May return null.
+	 */
+	FauxProperty getFauxPropertyFromConfigContextUri(String contextUri);
+
+	/**
+	 * If the display model contains a ConfigContext based on these URIs, get
+	 * the FauxProperty that it describes. May return null.
+	 * 
+	 * @param domainUri
+	 *            May be null, but then this will only match a ConfigContext
+	 *            that has no qualifiedByDomain property.
+	 * @param baseUri
+	 *            Object of configContextFor property. May not be null.
+	 * @param rangeUri
+	 *            Object of qualifiedBy property. May not be null.
+	 * @return May return null.
+	 */
+	FauxProperty getFauxPropertyByUris(String domainUri, String baseUri,
+			String rangeUri);
+
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java
index ec9c9299b..8d34d7d2b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java
@@ -2,217 +2,50 @@
 
 package edu.cornell.mannlib.vitro.webapp.dao.filtering;
 
+import java.util.List;
+
+import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
 import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 
-class FauxPropertyDaoFiltering extends BaseFiltering implements FauxPropertyDao{
-    final FauxPropertyDao innerFauxPropertyDao;    
-    final VitroFilters filters;   
+/**
+ * TODO Find out if this is really necessary. If so, what is filtered?
+ */
+public class FauxPropertyDaoFiltering extends BaseFiltering implements FauxPropertyDao {
+	final FauxPropertyDao innerFauxPropertyDao;
+	final VitroFilters filters;
+
+	public FauxPropertyDaoFiltering(FauxPropertyDao fauxPropertyDao,
+			VitroFilters filters) {
+		super();
+		this.innerFauxPropertyDao = fauxPropertyDao;
+		this.filters = filters;
+	}
+
+	/* filtered methods */
+
+	@Override
+	public List<FauxProperty> getFauxPropertiesForBaseUri(String uri) {
+		// TODO Auto-generated method stub
+		throw new RuntimeException(
+				"FauxPropertyDao.getFauxPropertiesForBaseUri() not implemented.");
+	}
+
+	@Override
+	public FauxProperty getFauxPropertyFromConfigContextUri(String contextUri) {
+		// TODO Auto-generated method stub
+		throw new RuntimeException(
+				"FauxPropertyDaoFiltering.getFauxPropertyFromConfigContextUri() not implemented.");
+
+	}
+
+	@Override
+	public FauxProperty getFauxPropertyByUris(String domainUri, String baseUri,
+			String rangeUri) {
+		// TODO Auto-generated method stub
+		throw new RuntimeException(
+				"FauxPropertyDaoFiltering.getFauxPropertyByUris() not implemented.");
+
+	}
 
-    public FauxPropertyDaoFiltering(FauxPropertyDao fauxPropertyDao,
-            VitroFilters filters) {
-        super();
-        this.innerFauxPropertyDao = fauxPropertyDao;
-        this.filters = filters;              
-    }  
-    
-//    /* filtered methods */
-//    public List getAllObjectProperties() {
-//        return filterAndWrap(innerFauxPropertyDao.getAllObjectProperties(), filters);        
-//    }
-//
-//    public List getObjectPropertiesForFauxPropertyStatements(List fauxPropertyStatements) {
-//        //assume that the objPropStmts are already filtered
-//        List<FauxProperty> list =
-//            innerFauxPropertyDao
-//                .getObjectPropertiesForFauxPropertyStatements(fauxPropertyStatements);
-//       return filterAndWrap(list, filters);
-//    }
-//
-//
-//    public FauxProperty getFauxPropertyByURI(String fauxPropertyURI) {
-//        FauxProperty newOprop=innerFauxPropertyDao.getFauxPropertyByURI(fauxPropertyURI);
-//        return (newOprop == null) ? null : new FauxPropertyFiltering(newOprop, filters);
-//    }
-//    
-//    public FauxProperty getFauxPropertyByURIs(String fauxPropertyURI, String domainURI, String rangeURI) {
-//        FauxProperty newOprop=innerFauxPropertyDao.getFauxPropertyByURIs(fauxPropertyURI, domainURI, rangeURI);
-//        return (newOprop == null) ? null : new FauxPropertyFiltering(newOprop, filters);
-//    }
-//
-//    public FauxProperty getFauxPropertyByURIs(String fauxPropertyURI, String domainURI, String rangeURI, FauxProperty base) {
-//        FauxProperty newOprop=innerFauxPropertyDao.getFauxPropertyByURIs(fauxPropertyURI, domainURI, rangeURI, base);
-//        return (newOprop == null) ? null : new FauxPropertyFiltering(newOprop, filters);
-//    }
-//    
-//    public List<FauxPropertyStatement> getStatementsUsingFauxProperty(FauxProperty op) {
-//        return FauxPropertyStatementDaoFiltering.filterAndWrapList(innerFauxPropertyDao.getStatementsUsingFauxProperty(op),filters);       
-//    }
-//    
-//    public List getRootObjectProperties() {
-//        return filterAndWrap(innerFauxPropertyDao.getRootObjectProperties(),filters);
-//    }
-// 
-//    
-//    /* other methods */
-//    public void deleteFauxProperty(String fauxPropertyURI) {
-//        innerFauxPropertyDao.deleteFauxProperty(fauxPropertyURI);
-//    }
-//
-//
-//    public void deleteFauxProperty(FauxProperty fauxProperty) {
-//        innerFauxPropertyDao.deleteFauxProperty(fauxProperty);
-//    }
-//
-//
-//    public void fillObjectPropertiesForIndividual(Individual individual) {
-//        innerFauxPropertyDao.fillObjectPropertiesForIndividual(individual);
-//    }
-//
-//    public int insertFauxProperty(FauxProperty fauxProperty) throws InsertException {
-//        return innerFauxPropertyDao.insertFauxProperty(fauxProperty);
-//    }
-//
-//    public void updateFauxProperty(FauxProperty fauxProperty) {
-//        innerFauxPropertyDao.updateFauxProperty(fauxProperty);
-//    }
-//
-//    public void addSuperproperty(FauxProperty property, FauxProperty superproperty) {
-//    	innerFauxPropertyDao.addSuperproperty(property, superproperty);
-//    }
-//    
-//    public void addSuperproperty(String propertyURI, String superpropertyURI) {
-//    	innerFauxPropertyDao.addSuperproperty(propertyURI, superpropertyURI);
-//    }
-//    
-//    public void removeSuperproperty(FauxProperty property, FauxProperty superproperty) {
-//    	innerFauxPropertyDao.removeSuperproperty(property, superproperty);
-//    }
-//    
-//    public void removeSuperproperty(String propertyURI, String superpropertyURI) {
-//    	innerFauxPropertyDao.removeSuperproperty(propertyURI, superpropertyURI);
-//    }
-//    
-//    public void addSubproperty(FauxProperty property, FauxProperty subproperty) {
-//    	innerFauxPropertyDao.addSubproperty(property, subproperty);
-//    }
-//    
-//    public void addSubproperty(String propertyURI, String subpropertyURI) {
-//    	innerFauxPropertyDao.addSubproperty(propertyURI, subpropertyURI);
-//    }
-//    
-//    public void removeSubproperty(FauxProperty property, FauxProperty subproperty) {
-//    	innerFauxPropertyDao.removeSubproperty(property, subproperty);
-//    }
-//    
-//    public void removeSubproperty(String propertyURI, String subpropertyURI) {
-//    	innerFauxPropertyDao.removeSubproperty(propertyURI, subpropertyURI);
-//    }
-//    
-//    public List <String> getSubPropertyURIs(String propertyURI) {
-//    	return innerFauxPropertyDao.getSubPropertyURIs(propertyURI);
-//    }
-//
-//    public List <String> getAllSubPropertyURIs(String propertyURI) {
-//    	return innerFauxPropertyDao.getAllSubPropertyURIs(propertyURI);
-//    }
-//
-//    public List <String> getSuperPropertyURIs(String propertyURI, boolean direct) {
-//    	return innerFauxPropertyDao.getSuperPropertyURIs(propertyURI, direct);
-//    }
-//
-//    public List <String> getAllSuperPropertyURIs(String propertyURI) {
-//    	return innerFauxPropertyDao.getAllSuperPropertyURIs(propertyURI);
-//    }    
-//                                             
-//    public static List<FauxProperty> filterAndWrap(List<FauxProperty> list, VitroFilters filters){
-//        if( list == null ) return null;
-//        if( list.size() ==0 ) return list;
-//        
-//        List<FauxProperty> filtered = new LinkedList<FauxProperty>();         
-//        Filter.filter(list, 
-//                new AndUnary<FauxProperty>(notNull,filters.getFauxPropertyFilter()), 
-//                filtered);
-//                                
-//        List<FauxProperty> wrapped = new LinkedList<FauxProperty>();        
-//        for( FauxProperty prop : filtered){
-//            if( prop != null){
-//                wrapped.add( new FauxPropertyFiltering(prop, filters));
-//            }
-//        }        
-//        return wrapped;   
-//    }
-//    
-//    private static final UnaryFunctor<FauxProperty,Boolean> notNull =
-//        new UnaryFunctor<FauxProperty,Boolean>(){
-//            @Override
-//            public Boolean fn(FauxProperty arg) {
-//                return arg != null;
-//            }
-//    };
-//
-//	public void addSubproperty(Property property, Property subproperty) {
-//		innerFauxPropertyDao.addSubproperty(property, subproperty);	
-//	}
-//
-//	public void addSuperproperty(Property property, Property superproperty) {
-//		innerFauxPropertyDao.addSuperproperty(property, superproperty);
-//	}
-//
-//	public void removeSubproperty(Property property, Property subproperty) {
-//		innerFauxPropertyDao.removeSubproperty(property, subproperty);
-//	}
-//
-//	public void removeSuperproperty(Property property, Property superproperty) {
-//		innerFauxPropertyDao.removeSuperproperty(property, superproperty);
-//	}
-//
-//	public void addEquivalentProperty(String propertyURI,
-//			String equivalentPropertyURI) {
-//		innerFauxPropertyDao.addEquivalentProperty(propertyURI, equivalentPropertyURI);
-//	}
-//
-//	public void addEquivalentProperty(Property property,
-//			Property equivalentProperty) {
-//		innerFauxPropertyDao.addEquivalentProperty(property, equivalentProperty);
-//	}
-//
-//	public List<String> getEquivalentPropertyURIs(String propertyURI) {
-//		return innerFauxPropertyDao.getEquivalentPropertyURIs(propertyURI);
-//	}
-//
-//	public void removeEquivalentProperty(String propertyURI,
-//			String equivalentPropertyURI) {
-//		innerFauxPropertyDao.removeEquivalentProperty(propertyURI, equivalentPropertyURI);
-//	}
-//
-//	public void removeEquivalentProperty(Property property,
-//			Property equivalentProperty) {
-//		innerFauxPropertyDao.removeEquivalentProperty(property, equivalentProperty);
-//	}
-//    
-//	public boolean skipEditForm(String predicateURI) {
-//		return innerFauxPropertyDao.skipEditForm(predicateURI);
-//	}
-//	
-//    public List <VClass> getClassesWithRestrictionOnProperty(String propertyURI) {
-//    	return innerFauxPropertyDao.getClassesWithRestrictionOnProperty(propertyURI);
-//    }
-//
-//    @Override
-//    // This may need to be filtered at some point.
-//    public List<FauxProperty> getFauxPropertyList(Individual subject) {
-//        return innerFauxPropertyDao.getFauxPropertyList(subject);
-//    }
-//    
-//    @Override
-//    // This may need to be filtered at some point.
-//    public List<FauxProperty> getFauxPropertyList(String subjectUri) {
-//        return innerFauxPropertyDao.getFauxPropertyList(subjectUri);
-//    }
-//
-//    @Override
-//    public String getCustomListViewConfigFileName(FauxProperty fauxProperty) {
-//        return innerFauxPropertyDao.getCustomListViewConfigFileName(fauxProperty);
-//    }
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
index 3bfcddfe0..3201d9b4f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
@@ -2,32 +2,330 @@
 
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
-import java.util.Map;
+import static com.hp.hpl.jena.rdf.model.ResourceFactory.createProperty;
+import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource;
 
-import org.apache.jena.atlas.lib.Pair;
+import java.util.ArrayList;
+import java.util.List;
 
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.query.Syntax;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.ResIterator;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.shared.Lock;
+import com.hp.hpl.jena.vocabulary.RDF;
+
+import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
 import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.AbstractOntModelDecorator;
+import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner;
+import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner.QueryParser;
 
 /**
  * TODO
  */
 public class FauxPropertyDaoJena implements FauxPropertyDao {
+	private static final Log log = LogFactory.getLog(FauxPropertyDaoJena.class);
 
-	/**
-	 * @param rdfService
-	 * @param dwf
-	 * @param customListViewConfigFileMap
-	 * @param webappDaoFactoryJena
-	 */
-	public FauxPropertyDaoJena(
-			RDFService rdfService,
-			DatasetWrapperFactory dwf,
-			Map<Pair<String, Pair<ObjectProperty, String>>, String> customListViewConfigFileMap,
-			WebappDaoFactoryJena webappDaoFactoryJena) {
-		// TODO Auto-generated constructor stub
-		throw new RuntimeException("FauxPropertyDaoJena Constructor not implemented.");
+	// ----------------------------------------------------------------------
+	// Constants
+	// ----------------------------------------------------------------------
+
+	private static final String APPLICATION_CONTEXT_NS = "http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#";
+	private static final Resource CONFIG_CONTEXT = createResource(APPLICATION_CONTEXT_NS
+			+ "ConfigContext");
+	private static final Property HAS_CONFIGURATION = createProperty(APPLICATION_CONTEXT_NS
+			+ "hasConfiguration");
+	private static final Property CONFIG_CONTEXT_FOR = createProperty(APPLICATION_CONTEXT_NS
+			+ "configContextFor");
+	private static final Property QUALIFIED_BY_RANGE = createProperty(APPLICATION_CONTEXT_NS
+			+ "qualifiedBy");
+	private static final Property QUALIFIED_BY_DOMAIN = createProperty(APPLICATION_CONTEXT_NS
+			+ "qualifiedByDomain");
+
+	private static final Property DISPLAY_NAME = createProperty(APPLICATION_CONTEXT_NS
+			+ "displayName");
+
+	// ----------------------------------------------------------------------
+	// Queries and parsers
+	// ----------------------------------------------------------------------
+
+	private static final String QUERY_LOCATE_CONFIG_CONTEXT_WITH_DOMAIN = "" //
+			+ "PREFIX : <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" //
+			+ "\n" //
+			+ "SELECT DISTINCT ?context \n" //
+			+ "WHERE { \n" //
+			+ "    ?context a :ConfigContext ; \n" //
+			+ "        :configContextFor ?baseUri ; \n" //
+			+ "        :qualifiedByDomain ?domainUri ; \n" //
+			+ "        :qualifiedBy ?rangeUri . \n" //
+			+ "} \n"; //
+
+	// TODO Add a filter that will reject solutions that include qualifiedByDomain
+	private static final String QUERY_LOCATE_CONFIG_CONTEXT_WITH_NO_DOMAIN = "" //
+			+ "PREFIX : <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" //
+			+ "\n" //
+			+ "SELECT DISTINCT ?context \n" //
+			+ "WHERE { \n" //
+			+ "    ?context a :ConfigContext ; \n" //
+			+ "        :configContextFor ?baseUri ; \n" //
+			+ "        :qualifiedBy ?rangeUri . \n" //
+			+ "} \n"; //
+
+	private static final QueryParser<String> PARSER_LOCATE_CONFIG_CONTEXT = new QueryParser<String>() {
+		@Override
+		protected String defaultValue() {
+			return null;
+		}
+
+		@Override
+		protected String parseResults(String queryStr, ResultSet results) {
+			if (results.hasNext()) {
+				return ifResourcePresent(results.next(), "context", null);
+			} else {
+				return null;
+			}
+		}
+	};
+
+	// ----------------------------------------------------------------------
+	// The instance
+	// ----------------------------------------------------------------------
+
+	private final LockingOntModelSelector models;
+
+	public FauxPropertyDaoJena(WebappDaoFactoryJena wadf) {
+		this.models = new LockingOntModelSelector(wadf.getOntModelSelector());
 	}
 
+	@Override
+	public List<FauxProperty> getFauxPropertiesForBaseUri(String uri) {
+		List<FauxProperty> list = new ArrayList<>();
+		try (LockedOntModel displayModel = models.getDisplayModel().read()) {
+			if (uri != null) {
+				ResIterator contextResources = displayModel
+						.listSubjectsWithProperty(CONFIG_CONTEXT_FOR,
+								createResource(uri));
+				for (Resource context : contextResources.toList()) {
+					if (!context.isURIResource()) {
+						continue;
+					}
+
+					FauxProperty fp = getFauxPropertyFromConfigContextUri(context
+							.getURI());
+					if (fp == null) {
+						continue;
+					}
+
+					list.add(fp);
+				}
+			}
+		}
+		return list;
+	}
+
+	@Override
+	public FauxProperty getFauxPropertyFromConfigContextUri(String contextUri) {
+		try (LockedOntModel displayModel = models.getDisplayModel().read()) {
+			if (contextUri == null) {
+				return null;
+			}
+
+			Resource context = createResource(contextUri);
+			if (!displayModel.contains(context, RDF.type, CONFIG_CONTEXT)) {
+				log.debug("'" + contextUri + "' is not a CONFIG_CONTEXT");
+				return null;
+			}
+
+			String baseUri = getUriValue(displayModel, context,
+					CONFIG_CONTEXT_FOR);
+			if (baseUri == null) {
+				log.debug("'" + contextUri + "' has no value for '"
+						+ CONFIG_CONTEXT_FOR + "'");
+				return null;
+			}
+
+			String rangeUri = getUriValue(displayModel, context,
+					QUALIFIED_BY_RANGE);
+			if (rangeUri == null) {
+				log.debug("'" + contextUri + "' has no value for '"
+						+ QUALIFIED_BY_RANGE + "'");
+				return null;
+			}
+
+			// domainURI is optional.
+			String domainUri = getUriValue(displayModel, context,
+					QUALIFIED_BY_DOMAIN);
+
+			FauxProperty fp = new FauxProperty(domainUri, baseUri, rangeUri);
+			populateInstance(fp, displayModel, context);
+			return fp;
+		}
+	}
+
+	@Override
+	public FauxProperty getFauxPropertyByUris(String domainUri, String baseUri,
+			String rangeUri) {
+		try (LockedOntModel displayModel = models.getDisplayModel().read()) {
+			String queryString;
+			if (domainUri == null) {
+				queryString = substituteUri(
+						substituteUri(
+								QUERY_LOCATE_CONFIG_CONTEXT_WITH_NO_DOMAIN,
+								baseUri, "baseUri"), rangeUri, "rangeUri");
+			} else {
+				queryString = substituteUri(
+						substituteUri(
+								substituteUri(
+										QUERY_LOCATE_CONFIG_CONTEXT_WITH_DOMAIN,
+										baseUri, "baseUri"), rangeUri,
+								"rangeUri"), domainUri, "domainUri");
+			}
+
+			String contextUri = new SparqlQueryRunner(displayModel)
+					.executeSelect(PARSER_LOCATE_CONFIG_CONTEXT, queryString);
+
+			if (contextUri == null) {
+				log.debug("Can't find a ContextConfig for '" + domainUri
+						+ "', '" + baseUri + "', '" + rangeUri + "'");
+				return null;
+			}
+
+			FauxProperty fp = new FauxProperty(domainUri, baseUri, rangeUri);
+			populateInstance(fp, displayModel, createResource(contextUri));
+			return fp;
+		}
+	}
+
+	/**
+	 * Add labels, annotations, and whatever else we can find on the
+	 * ConfigContext.
+	 */
+	private void populateInstance(FauxProperty fp, LockedOntModel model,
+			Resource context) {
+		String configUri = getUriValue(model, context, HAS_CONFIGURATION);
+		if (configUri == null) {
+			return;
+		}
+		Resource config = createResource(configUri);
+
+		String displayName = getStringValue(model, config, DISPLAY_NAME);
+		if (displayName != null) {
+			fp.setPickListName(displayName);
+		}
+		
+		// TODO pull all sorts of things from the configuration.
+		// TODO pull labels for the domain and range classes.
+	}
+
+	private String substituteUri(String queryString, String variableName,
+			String uri) {
+		return queryString.replace("?" + variableName, "<" + uri + ">");
+	}
+	
+	/**
+	 * Returns a single URI that is the object of this subject and property.
+	 * Returns null if no valid statement is found.
+	 */
+	private String getUriValue(LockedOntModel displayModel, Resource subject,
+			Property property) {
+		List<RDFNode> nodeList = displayModel.listObjectsOfProperty(subject,
+				property).toList();
+		if (nodeList.isEmpty()) {
+			log.warn("'" + subject.getURI() + "' has no value for '"
+					+ property.getURI() + "'.");
+			return null;
+		}
+
+		RDFNode node = nodeList.get(0);
+		if (nodeList.size() > 1) {
+			log.warn("'" + subject.getURI() + "' has " + nodeList.size()
+					+ " values for ''. Using '" + node + "'");
+		}
+		if (!node.isURIResource()) {
+			log.warn("Value of '" + subject.getURI() + property.getURI()
+					+ "' '' is not a URI resource.");
+			return null;
+		}
+		return node.asResource().getURI();
+	}
+
+	/**
+	 * Returns a single String value that is the object of this subject and
+	 * property. Returns null if no valid statement is found.
+	 */
+	private String getStringValue(LockedOntModel displayModel,
+			Resource subject, Property property) {
+		List<RDFNode> nodeList = displayModel.listObjectsOfProperty(subject,
+				property).toList();
+		if (nodeList.isEmpty()) {
+			log.warn("'" + subject.getURI() + "' has no value for '"
+					+ property.getURI() + "'.");
+			return null;
+		}
+
+		RDFNode node = nodeList.get(0);
+		if (nodeList.size() > 1) {
+			log.warn("'" + subject.getURI() + "' has " + nodeList.size()
+					+ " values for ''. Using '" + node + "'");
+		}
+		if (!node.isLiteral()) {
+			log.warn("Value of '" + subject.getURI() + property.getURI()
+					+ "' '' is not a Literal.");
+			return null;
+		}
+		return node.asLiteral().getString();
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper classes. Are they worth it, just to use try-with-resources?
+	// ----------------------------------------------------------------------
+
+	private static class LockingOntModelSelector {
+		private final OntModelSelector oms;
+
+		public LockingOntModelSelector(OntModelSelector oms) {
+			this.oms = oms;
+		}
+
+		public LockableOntModel getDisplayModel() {
+			return new LockableOntModel(oms.getDisplayModel());
+		}
+	}
+
+	private static class LockableOntModel {
+		private final OntModel ontModel;
+
+		public LockableOntModel(OntModel ontModel) {
+			this.ontModel = ontModel;
+		}
+
+		public LockedOntModel read() {
+			ontModel.enterCriticalSection(Lock.READ);
+			return new LockedOntModel(ontModel);
+		}
+	}
+
+	private static class LockedOntModel extends AbstractOntModelDecorator
+			implements AutoCloseable {
+
+		protected LockedOntModel(OntModel m) {
+			super(m);
+		}
+
+		/**
+		 * Just unlocks the model. Doesn't actually close it, because we may
+		 * want to use it again.
+		 */
+		@Override
+		public void close() {
+			super.leaveCriticalSection();
+		}
+	}
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
index cc3e12677..e96192b30 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
@@ -379,9 +379,9 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
     private FauxPropertyDao fauxPropertyDao = null;
     @Override
     public FauxPropertyDao getFauxPropertyDao() {
-    	if( fauxPropertyDao == null )
-    		fauxPropertyDao = new FauxPropertyDaoJena(
-    				rdfService, dwf, config.customListViewConfigFileMap, this);
+    	if( fauxPropertyDao == null ) {
+			fauxPropertyDao = new FauxPropertyDaoJena(this);
+    	}
     	return fauxPropertyDao;
     }
     
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java
index 87f9fd4ce..6ffb697ca 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java
@@ -15,6 +15,7 @@ import com.hp.hpl.jena.query.Syntax;
 import com.hp.hpl.jena.rdf.model.Literal;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.RDFNode;
 
 /**
  * Execute SPARQL queries against a model.
@@ -95,6 +96,15 @@ public class SparqlQueryRunner {
 
 		protected abstract T defaultValue();
 
+		protected String ifResourcePresent(QuerySolution solution,
+				String variableName, String defaultValue) {
+			RDFNode node = solution.get(variableName);
+			if (node == null || !node.isURIResource()) {
+				return defaultValue;
+			}
+			return node.asResource().getURI();
+		}
+
 		protected String ifLiteralPresent(QuerySolution solution,
 				String variableName, String defaultValue) {
 			Literal literal = solution.getLiteral(variableName);
diff --git a/webapp/web/templates/edit/specific/props_edit.jsp b/webapp/web/templates/edit/specific/props_edit.jsp
index c4c130621..cad21169b 100644
--- a/webapp/web/templates/edit/specific/props_edit.jsp
+++ b/webapp/web/templates/edit/specific/props_edit.jsp
@@ -91,6 +91,43 @@
     </td>
 </tr>
 
+<tr><td colspan="3"><hr/></td></tr>
+<!-- _____________________________________________ faux properties __________________________________________ -->
+<tr valign="bottom" align="center">
+	<td colspan="2" valign="bottom" align="left">
+	  <c:if test="${!empty fauxproperties}">
+		<c:forEach var="fauxproperty" items="${fauxproperties}">
+		  <ul style="list-style-type:none;">
+		    <c:url var="fauxpropertyURL" value="fauxpropertyEdit">
+			  <c:param name="property" value="${property.URI}"/>
+			  <c:param name="domain" value="${fauxproperty.domainURI}" />
+			  <c:param name="range" value="${fauxproperty.rangeURI}" />
+			</c:url>
+			<li>
+			  <a href="${fauxpropertyURL}">${fauxproperty.pickListName}</a>
+			  <c:choose>
+			    <c:when test="${empty fauxproperty.domainLabel}">
+			      no domain,
+			    </c:when>
+			    <c:otherwise>
+			      domain: ${fauxproperty.domainLabel},
+			    </c:otherwise>
+			  </c:choose> 
+			  range: ${fauxproperty.rangeLabel}
+			</li>
+		  </ul>
+		</c:forEach>
+	  </c:if>
+	</td>
+	<td>
+		<form action="editForm" method="get">
+			<input type="hidden" name="basepropertyURI" value="${property.URI}"/>
+			<input type="hidden" name="controller" value="FauxProperty"/>
+			<input type="submit" class="form-button" value="Create New Faux Property"/>
+		</form>
+	</td>
+</tr>
+
 <tr><td colspan="3"><hr/></td></tr>
 <!-- _____________________________________________ superproperties __________________________________________ -->
 <tr valign="bottom" align="center">

From 0bf6abb197861adddbdf8dbcb8bdcfd973029126 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Fri, 31 Oct 2014 12:59:44 -0400
Subject: [PATCH 04/30] VIVO-774 clean up the handling of RoleLevel changes.

Create an interface for the Listener to act on.
If the changed object doesn't implement the interface, log a warning and do nothing, instead of throwing a ClassCastException.
The level values should never be null.
---
 .../bean/PropertyRestrictionListener.java     | 61 +++++++++++--------
 .../policy/bean/RoleRestrictedProperty.java   | 17 ++++++
 .../vitro/webapp/beans/BaseResourceBean.java  | 26 ++++----
 .../vitro/webapp/beans/DataProperty.java      |  4 +-
 .../vitro/webapp/beans/ObjectProperty.java    |  4 +-
 5 files changed, 75 insertions(+), 37 deletions(-)
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/RoleRestrictedProperty.java

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionListener.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionListener.java
index abf488f6d..97b1f359a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionListener.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionListener.java
@@ -15,7 +15,6 @@ import com.hp.hpl.jena.rdf.model.Model;
 import edu.cornell.mannlib.vedit.beans.EditProcessObject;
 import edu.cornell.mannlib.vedit.listener.ChangeListener;
 import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
-import edu.cornell.mannlib.vitro.webapp.beans.Property;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 
 /**
@@ -38,12 +37,16 @@ public class PropertyRestrictionListener implements ChangeListener {
 	 */
 	@Override
 	public void doDeleted(Object oldObj, EditProcessObject epo) {
-		Property p = (Property) oldObj;
-		if (anyRoleChanged(p.getHiddenFromDisplayBelowRoleLevel(),
-				p.getProhibitedFromUpdateBelowRoleLevel(),
-				p.getHiddenFromPublishBelowRoleLevel(), null, null, null)) {
-			log.debug("rebuilding the PropertyRestrictionPolicyHelper after deletion");
-			createAndSetBean();
+		if (oldObj instanceof RoleRestrictedProperty) {
+			RoleRestrictedProperty p = (RoleRestrictedProperty) oldObj;
+			if (anyRoleChanged(p.getHiddenFromDisplayBelowRoleLevel(),
+					p.getProhibitedFromUpdateBelowRoleLevel(),
+					p.getHiddenFromPublishBelowRoleLevel(), null, null, null)) {
+				log.debug("rebuilding the PropertyRestrictionPolicyHelper after deletion");
+				createAndSetBean();
+			}
+		} else {
+			log.warn("Not an instance of RoleRestrictedProperty: " + oldObj);
 		}
 	}
 
@@ -52,13 +55,17 @@ public class PropertyRestrictionListener implements ChangeListener {
 	 */
 	@Override
 	public void doInserted(Object newObj, EditProcessObject epo) {
-		Property p = (Property) newObj;
-		if (anyRoleChanged(null, null, null,
-				p.getHiddenFromDisplayBelowRoleLevel(),
-				p.getProhibitedFromUpdateBelowRoleLevel(),
-				p.getHiddenFromPublishBelowRoleLevel())) {
-			log.debug("rebuilding the PropertyRestrictionPolicyHelper after insertion");
-			createAndSetBean();
+		if (newObj instanceof RoleRestrictedProperty) {
+			RoleRestrictedProperty p = (RoleRestrictedProperty) newObj;
+			if (anyRoleChanged(null, null, null,
+					p.getHiddenFromDisplayBelowRoleLevel(),
+					p.getProhibitedFromUpdateBelowRoleLevel(),
+					p.getHiddenFromPublishBelowRoleLevel())) {
+				log.debug("rebuilding the PropertyRestrictionPolicyHelper after insertion");
+				createAndSetBean();
+			}
+		} else {
+			log.warn("Not an instance of RoleRestrictedProperty: " + newObj);
 		}
 	}
 
@@ -67,16 +74,22 @@ public class PropertyRestrictionListener implements ChangeListener {
 	 */
 	@Override
 	public void doUpdated(Object oldObj, Object newObj, EditProcessObject epo) {
-		Property oldP = (Property) oldObj;
-		Property newP = (Property) newObj;
-		if (anyRoleChanged(oldP.getHiddenFromDisplayBelowRoleLevel(),
-				oldP.getProhibitedFromUpdateBelowRoleLevel(),
-				oldP.getHiddenFromPublishBelowRoleLevel(),
-				newP.getHiddenFromDisplayBelowRoleLevel(),
-				newP.getProhibitedFromUpdateBelowRoleLevel(),
-				newP.getHiddenFromPublishBelowRoleLevel())) {
-			log.debug("rebuilding the PropertyRestrictionPolicyHelper after update");
-			createAndSetBean();
+		if (oldObj instanceof RoleRestrictedProperty
+				&& newObj instanceof RoleRestrictedProperty) {
+			RoleRestrictedProperty oldP = (RoleRestrictedProperty) oldObj;
+			RoleRestrictedProperty newP = (RoleRestrictedProperty) newObj;
+			if (anyRoleChanged(oldP.getHiddenFromDisplayBelowRoleLevel(),
+					oldP.getProhibitedFromUpdateBelowRoleLevel(),
+					oldP.getHiddenFromPublishBelowRoleLevel(),
+					newP.getHiddenFromDisplayBelowRoleLevel(),
+					newP.getProhibitedFromUpdateBelowRoleLevel(),
+					newP.getHiddenFromPublishBelowRoleLevel())) {
+				log.debug("rebuilding the PropertyRestrictionPolicyHelper after update");
+				createAndSetBean();
+			}
+		} else {
+			log.warn("Not instances of RoleRestrictedProperty: " + oldObj
+					+ ", " + newObj);
 		}
 	}
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/RoleRestrictedProperty.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/RoleRestrictedProperty.java
new file mode 100644
index 000000000..fb93bce16
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/RoleRestrictedProperty.java
@@ -0,0 +1,17 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
+
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+
+/**
+ * A property or faux property whose usage can be restricted according to the
+ * user's role level.
+ */
+public interface RoleRestrictedProperty {
+	RoleLevel getHiddenFromDisplayBelowRoleLevel();
+
+	RoleLevel getProhibitedFromUpdateBelowRoleLevel();
+
+	RoleLevel getHiddenFromPublishBelowRoleLevel();
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
index d9d0158d2..d61836cb1 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
@@ -25,9 +25,9 @@ public class BaseResourceBean implements ResourceBean {
     protected String localNameWithPrefix = null;
     protected String pickListName = null;
     
-    protected RoleLevel hiddenFromDisplayBelowRoleLevel = null;
-    protected RoleLevel prohibitedFromUpdateBelowRoleLevel = null;
-    protected RoleLevel hiddenFromPublishBelowRoleLevel = null;
+    protected RoleLevel hiddenFromDisplayBelowRoleLevel = RoleLevel.PUBLIC;
+    protected RoleLevel prohibitedFromUpdateBelowRoleLevel = RoleLevel.PUBLIC;
+    protected RoleLevel hiddenFromPublishBelowRoleLevel = RoleLevel.PUBLIC;
     
 	public enum RoleLevel {
 		PUBLIC("http://vitro.mannlib.cornell.edu/ns/vitro/role#public",
@@ -78,6 +78,10 @@ public class BaseResourceBean implements ResourceBean {
 		public String getShorthand() {
 			return shorthand;
 		}
+		
+		public static RoleLevel notNull(RoleLevel level) {
+			return (level == null) ? RoleLevel.values()[0] : level;
+		}
 
 		public static RoleLevel getRoleByUri(String uri2) {
 			if (uri2 == null)
@@ -208,13 +212,13 @@ public class BaseResourceBean implements ResourceBean {
     }
     
     @Override
-	public void setHiddenFromDisplayBelowRoleLevel(RoleLevel eR) {
-        hiddenFromDisplayBelowRoleLevel = eR;
+	public void setHiddenFromDisplayBelowRoleLevel(RoleLevel level) {
+        hiddenFromDisplayBelowRoleLevel = RoleLevel.notNull(level);
     }
     
     @Override
 	public void setHiddenFromDisplayBelowRoleLevelUsingRoleUri(String roleUri) {
-        hiddenFromDisplayBelowRoleLevel = BaseResourceBean.RoleLevel.getRoleByUri(roleUri);
+        hiddenFromDisplayBelowRoleLevel = RoleLevel.getRoleByUri(roleUri);
     }
 
     @Override
@@ -223,13 +227,13 @@ public class BaseResourceBean implements ResourceBean {
     }
     
     @Override
-	public void setProhibitedFromUpdateBelowRoleLevel(RoleLevel eR) {
-        prohibitedFromUpdateBelowRoleLevel = eR;
+	public void setProhibitedFromUpdateBelowRoleLevel(RoleLevel level) {
+        prohibitedFromUpdateBelowRoleLevel = RoleLevel.notNull(level);
     }
     
     @Override
 	public void setProhibitedFromUpdateBelowRoleLevelUsingRoleUri(String roleUri) {
-        prohibitedFromUpdateBelowRoleLevel = BaseResourceBean.RoleLevel.getRoleByUri(roleUri);
+        prohibitedFromUpdateBelowRoleLevel = RoleLevel.getRoleByUri(roleUri);
     }
 
 	@Override
@@ -238,8 +242,8 @@ public class BaseResourceBean implements ResourceBean {
 	}
     
     @Override
-	public void setHiddenFromPublishBelowRoleLevel(RoleLevel eR) {
-        hiddenFromPublishBelowRoleLevel = eR;
+	public void setHiddenFromPublishBelowRoleLevel(RoleLevel level) {
+        hiddenFromPublishBelowRoleLevel = RoleLevel.notNull(level);
     }
     
     @Override
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataProperty.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataProperty.java
index ea243fad2..191485226 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataProperty.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataProperty.java
@@ -6,13 +6,15 @@ import java.text.Collator;
 import java.util.List;
 import java.util.LinkedList;
 
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.RoleRestrictedProperty;
+
 /**
  * class representing a property that relates an entity (object)
  * to a data literal
  * @author bjl23
  *
  */
-public class DataProperty extends Property implements Comparable<DataProperty>, ResourceBean {
+public class DataProperty extends Property implements Comparable<DataProperty>, ResourceBean, RoleRestrictedProperty {
 
     private String name = null;
     private String publicName = null;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java
index 0f9005dae..d78d92057 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java
@@ -17,11 +17,13 @@ import org.joda.time.DateTime;
 
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
 
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.RoleRestrictedProperty;
+
 /**
  * a class representing an object property
  *
  */
-public class ObjectProperty extends Property implements Comparable<ObjectProperty>, ResourceBean, Cloneable
+public class ObjectProperty extends Property implements Comparable<ObjectProperty>, ResourceBean, Cloneable, RoleRestrictedProperty
 {
 	private static final Log log = LogFactory.getLog(ObjectProperty.class.getName());
 	

From 564130329ea34e832ff94693e6b4d8df42827bb8 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Fri, 31 Oct 2014 16:50:35 -0400
Subject: [PATCH 05/30] Remove previous "improvements".

---
 .../vitro/webapp/beans/BaseResourceBean.java     | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
index d61836cb1..67e02fad8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
@@ -25,9 +25,9 @@ public class BaseResourceBean implements ResourceBean {
     protected String localNameWithPrefix = null;
     protected String pickListName = null;
     
-    protected RoleLevel hiddenFromDisplayBelowRoleLevel = RoleLevel.PUBLIC;
-    protected RoleLevel prohibitedFromUpdateBelowRoleLevel = RoleLevel.PUBLIC;
-    protected RoleLevel hiddenFromPublishBelowRoleLevel = RoleLevel.PUBLIC;
+    protected RoleLevel hiddenFromDisplayBelowRoleLevel = null;
+    protected RoleLevel prohibitedFromUpdateBelowRoleLevel = null;
+    protected RoleLevel hiddenFromPublishBelowRoleLevel = null;
     
 	public enum RoleLevel {
 		PUBLIC("http://vitro.mannlib.cornell.edu/ns/vitro/role#public",
@@ -79,10 +79,6 @@ public class BaseResourceBean implements ResourceBean {
 			return shorthand;
 		}
 		
-		public static RoleLevel notNull(RoleLevel level) {
-			return (level == null) ? RoleLevel.values()[0] : level;
-		}
-
 		public static RoleLevel getRoleByUri(String uri2) {
 			if (uri2 == null)
 				return RoleLevel.values()[0];
@@ -213,7 +209,7 @@ public class BaseResourceBean implements ResourceBean {
     
     @Override
 	public void setHiddenFromDisplayBelowRoleLevel(RoleLevel level) {
-        hiddenFromDisplayBelowRoleLevel = RoleLevel.notNull(level);
+        hiddenFromDisplayBelowRoleLevel = level;
     }
     
     @Override
@@ -228,7 +224,7 @@ public class BaseResourceBean implements ResourceBean {
     
     @Override
 	public void setProhibitedFromUpdateBelowRoleLevel(RoleLevel level) {
-        prohibitedFromUpdateBelowRoleLevel = RoleLevel.notNull(level);
+        prohibitedFromUpdateBelowRoleLevel = level;
     }
     
     @Override
@@ -243,7 +239,7 @@ public class BaseResourceBean implements ResourceBean {
     
     @Override
 	public void setHiddenFromPublishBelowRoleLevel(RoleLevel level) {
-        hiddenFromPublishBelowRoleLevel = RoleLevel.notNull(level);
+        hiddenFromPublishBelowRoleLevel = level;
     }
     
     @Override

From 190bf87979cc8587bd6fcda62682a33bc42a7db2 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Fri, 31 Oct 2014 18:17:38 -0400
Subject: [PATCH 06/30] VIVO-774 More functionality: implement
 deleteFauxProperty()

---
 .../vitro/webapp/beans/FauxProperty.java      |  39 ++-
 .../edit/FauxPropertyRetryController.java     | 119 +++++++-
 .../vitro/webapp/dao/FauxPropertyDao.java     |  13 +
 .../filtering/FauxPropertyDaoFiltering.java   |  10 +
 .../webapp/dao/jena/FauxPropertyDaoJena.java  | 287 +++++++++++++-----
 .../vitro/webapp/utils/SparqlQueryRunner.java |  31 ++
 .../webapp/utils/SparqlQueryRunnerTest.java   |  92 ++++++
 .../edit/specific/fauxProperty_retry.jsp      |   6 +
 .../templates/edit/specific/props_edit.jsp    |  32 +-
 9 files changed, 519 insertions(+), 110 deletions(-)
 create mode 100644 webapp/test/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunnerTest.java
 create mode 100644 webapp/web/templates/edit/specific/fauxProperty_retry.jsp

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
index 08a440c47..c3025b3ab 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
@@ -6,15 +6,27 @@ import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource;
 
 import java.util.Objects;
 
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.RoleRestrictedProperty;
+
 /**
  * Represents a specialization on an ObjectProperty, only meaningful for
  * display.
  * 
- * Must have a baseURI and a rangeURI. Other fields are optional.
+ * BaseURI is required, may not be null, and may not be modified.
+ * 
+ * It would be nice to place the same restrictions on rangeURI, but it may be
+ * null when the FauxProperty is being created, and it may be modified. The DAO
+ * will need to check rangeURI for validity before accepting an insert or
+ * modification.
+ * 
+ * TODO Can we do this more cleanly? Can handle this as two classes FauxProperty
+ * and NewFauxProperty, and have each class enforce its own internal
+ * constraints? For example, the range must not be null, must represent a valid
+ * class, and must be equal to or a subclass of the range of the base property.
  */
-public class FauxProperty extends BaseResourceBean implements ResourceBean {
-	private final String rangeURI;
-	private final String domainURI;
+public class FauxProperty extends BaseResourceBean implements ResourceBean, RoleRestrictedProperty {
+	private String rangeURI;
+	private String domainURI;
 
 	private String rangeLabel;
 	private String domainLabel;
@@ -28,14 +40,21 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean {
 	 * @param baseURI
 	 *            URI of the property. May not be null.
 	 * @param rangeUri
-	 *            URI of the object class. May not be null.
+	 *            URI of the object class. May be null.
 	 */
 	public FauxProperty(String domainURI, String baseURI, String rangeURI) {
 		super(Objects.requireNonNull(baseURI, "baseURI may not be null"));
-		this.rangeURI = Objects.requireNonNull(rangeURI,
-				"rangeURI may not be null");
+		this.rangeURI = rangeURI;
 		this.domainURI = domainURI;
 	}
+	
+	public FauxProperty() {
+		// This is required by OperationUtils.cloneBean()
+	}
+
+	public void setRangeURI(String rangeURI) {
+		this.rangeURI = rangeURI;
+	}
 
 	public String getRangeURI() {
 		return rangeURI;
@@ -49,6 +68,10 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean {
 		return (rangeLabel == null) ? localName(rangeURI) : rangeLabel;
 	}
 
+	public void setDomainURI(String domainURI) {
+		this.domainURI = domainURI;
+	}
+	
 	public String getDomainURI() {
 		return domainURI;
 	}
@@ -61,7 +84,7 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean {
 		return (domainLabel == null) ? (domainURI == null ? "null"
 				: localName(domainURI)) : domainLabel;
 	}
-
+	
 	private String localName(String uriString) {
 		try {
 			return createResource(uriString).getLocalName();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
index 57d771a50..93838c4d7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
@@ -2,16 +2,36 @@
 
 package edu.cornell.mannlib.vitro.webapp.controller.edit;
 
+import java.util.Collections;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vedit.beans.EditProcessObject;
+import edu.cornell.mannlib.vedit.beans.FormObject;
 import edu.cornell.mannlib.vedit.controller.BaseEditController;
+import edu.cornell.mannlib.vedit.util.FormUtils;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionListener;
+import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
+import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 
 /**
  * TODO
  */
 public class FauxPropertyRetryController extends BaseEditController {
+	private static final Log log = LogFactory
+			.getLog(FauxPropertyRetryController.class);
+	
+	
 	@Override
 	public void doPost(HttpServletRequest req, HttpServletResponse response) {
 		if (!isAuthorizedToDisplayPage(req, response,
@@ -19,13 +39,98 @@ public class FauxPropertyRetryController extends BaseEditController {
 			return;
 		}
 
-		// TODO
-	}
-	
-    @Override
-	public void doGet (HttpServletRequest request, HttpServletResponse response) {
-        doPost(request, response);
-    }
+		VitroRequest request = new VitroRequest(req);
 
+		// create an EditProcessObject for this and put it in the session
+		EditProcessObject epo = super.createEpo(request);
+
+		ServletContext ctx = getServletContext();
+
+		FauxPropertyDao fpDao = ModelAccess.on(ctx).getWebappDaoFactory()
+				.getFauxPropertyDao();
+		epo.setDataAccessObject(fpDao);
+
+		FauxProperty fpForEditing = null;
+		if (epo.getUseRecycledBean()) {
+			fpForEditing = (FauxProperty) epo.getNewBean();
+		} else {
+			String create = request.getParameter("create");
+			String baseUri = request.getParameter("baseUri");
+			String rangeUri = request.getParameter("rangeUri");
+			String domainUri = request.getParameter("domainUri");
+			if (create != null) {
+				fpForEditing = new FauxProperty(null, baseUri, null);
+				epo.setAction("insert");
+			} else {
+				fpForEditing = fpDao.getFauxPropertyByUris(domainUri, baseUri,
+						rangeUri);
+				if (fpForEditing == null) {
+					throw new IllegalArgumentException(
+							"FauxProperty does not exist for <" + domainUri
+									+ "> ==> <" + baseUri + "> ==> <"
+									+ rangeUri + ">");
+				}
+				epo.setAction("update");
+			}
+			epo.setOriginalBean(fpForEditing);
+		}
+
+		// set any validators
+		// TODO NONE YET
+
+		// set up any listeners
+		epo.setChangeListenerList(Collections
+				.singletonList(new PropertyRestrictionListener(ctx)));
+
+		// where should the postinsert pageforwarder go?
+		// TODO
+		// make a postdelete pageforwarder that will send us to the control
+		// panel for the base property.
+		// TODO
+
+		FormObject foo = new FormObject();
+		foo.setErrorMap(epo.getErrMsgMap());
+
+		// We will need to set a lot of option lists and stuff.
+		// TODO
+
+		// Put attributes on the request so the JSP can populate the fields.
+		// request.setAttribute("transitive",propertyForEditing.getTransitive());
+		// request.setAttribute("objectIndividualSortPropertyURI",
+		// propertyForEditing.getObjectIndividualSortPropertyURI());
+		// TODO
+
+		// checkboxes are pretty annoying : we don't know if someone *unchecked*
+		// a box, so we have to default to false on updates.
+		// propertyForEditing.setSymmetric(false);
+		// TODO
+
+		epo.setFormObject(foo);
+
+		FormUtils.populateFormFromBean(fpForEditing, epo.getAction(), foo,
+				epo.getBadValueMap());
+
+        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
+        request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
+        request.setAttribute("colspan","5");
+        request.setAttribute("formJsp","/templates/edit/specific/fauxProperty_retry.jsp");
+        request.setAttribute("scripts","/templates/edit/formBasic.js");
+        request.setAttribute("title","Faux Property Editing Form");
+        request.setAttribute("_action",epo.getAction());
+        setRequestAttributes(request,epo);
+
+        try {
+            rd.forward(request, response);
+        } catch (Exception e) {
+            log.error("Could not forward to view.");
+            log.error(e.getMessage());
+            log.error(e.getStackTrace());
+        }
+	}
+
+	@Override
+	public void doGet(HttpServletRequest request, HttpServletResponse response) {
+		doPost(request, response);
+	}
 
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java
index 8edfefa9b..8579e1b85 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java
@@ -42,4 +42,17 @@ public interface FauxPropertyDao {
 	FauxProperty getFauxPropertyByUris(String domainUri, String baseUri,
 			String rangeUri);
 
+	/**
+	 * Delete this FauxProperty from the display model.
+	 * 
+	 * Delete any ConfigContext that is based on the constraints in this
+	 * FauxProperty, and any ObjectPropertyDisplayConfigs that depend on that
+	 * ConfigContext.
+	 * 
+	 * If no such ConfigContext is found, no error is raised.
+	 * 
+	 * No check is made to see whether the ObjectPropertyDisplayConfig matches
+	 * the settings on this FauxProperty.
+	 */
+	void deleteFauxProperty(FauxProperty fp);
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java
index 8d34d7d2b..ac7442a24 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java
@@ -48,4 +48,14 @@ public class FauxPropertyDaoFiltering extends BaseFiltering implements FauxPrope
 
 	}
 
+	/* (non-Javadoc)
+	 * @see edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao#deleteFauxProperty(edu.cornell.mannlib.vitro.webapp.beans.FauxProperty)
+	 */
+	@Override
+	public void deleteFauxProperty(FauxProperty fp) {
+		// TODO Auto-generated method stub
+		throw new RuntimeException("FauxPropertyDao.deleteFauxProperty() not implemented.");
+		
+	}
+
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
index 3201d9b4f..7cbb2f4b3 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
@@ -4,16 +4,21 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
 import static com.hp.hpl.jena.rdf.model.ResourceFactory.createProperty;
 import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource;
+import static edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner.bindValues;
+import static edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner.uriValue;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.query.QuerySolution;
 import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.query.Syntax;
 import com.hp.hpl.jena.rdf.model.Property;
 import com.hp.hpl.jena.rdf.model.RDFNode;
 import com.hp.hpl.jena.rdf.model.ResIterator;
@@ -23,6 +28,7 @@ import com.hp.hpl.jena.vocabulary.RDF;
 
 import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
 import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.AbstractOntModelDecorator;
 import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner;
 import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner.QueryParser;
@@ -51,49 +57,12 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 
 	private static final Property DISPLAY_NAME = createProperty(APPLICATION_CONTEXT_NS
 			+ "displayName");
+	private static final Property RDFS_LABEL = createProperty(VitroVocabulary.LABEL);
 
 	// ----------------------------------------------------------------------
 	// Queries and parsers
 	// ----------------------------------------------------------------------
 
-	private static final String QUERY_LOCATE_CONFIG_CONTEXT_WITH_DOMAIN = "" //
-			+ "PREFIX : <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" //
-			+ "\n" //
-			+ "SELECT DISTINCT ?context \n" //
-			+ "WHERE { \n" //
-			+ "    ?context a :ConfigContext ; \n" //
-			+ "        :configContextFor ?baseUri ; \n" //
-			+ "        :qualifiedByDomain ?domainUri ; \n" //
-			+ "        :qualifiedBy ?rangeUri . \n" //
-			+ "} \n"; //
-
-	// TODO Add a filter that will reject solutions that include qualifiedByDomain
-	private static final String QUERY_LOCATE_CONFIG_CONTEXT_WITH_NO_DOMAIN = "" //
-			+ "PREFIX : <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" //
-			+ "\n" //
-			+ "SELECT DISTINCT ?context \n" //
-			+ "WHERE { \n" //
-			+ "    ?context a :ConfigContext ; \n" //
-			+ "        :configContextFor ?baseUri ; \n" //
-			+ "        :qualifiedBy ?rangeUri . \n" //
-			+ "} \n"; //
-
-	private static final QueryParser<String> PARSER_LOCATE_CONFIG_CONTEXT = new QueryParser<String>() {
-		@Override
-		protected String defaultValue() {
-			return null;
-		}
-
-		@Override
-		protected String parseResults(String queryStr, ResultSet results) {
-			if (results.hasNext()) {
-				return ifResourcePresent(results.next(), "context", null);
-			} else {
-				return null;
-			}
-		}
-	};
-
 	// ----------------------------------------------------------------------
 	// The instance
 	// ----------------------------------------------------------------------
@@ -164,7 +133,7 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 					QUALIFIED_BY_DOMAIN);
 
 			FauxProperty fp = new FauxProperty(domainUri, baseUri, rangeUri);
-			populateInstance(fp, displayModel, context);
+			populateInstance(fp, context);
 			return fp;
 		}
 	}
@@ -172,63 +141,74 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 	@Override
 	public FauxProperty getFauxPropertyByUris(String domainUri, String baseUri,
 			String rangeUri) {
-		try (LockedOntModel displayModel = models.getDisplayModel().read()) {
-			String queryString;
-			if (domainUri == null) {
-				queryString = substituteUri(
-						substituteUri(
-								QUERY_LOCATE_CONFIG_CONTEXT_WITH_NO_DOMAIN,
-								baseUri, "baseUri"), rangeUri, "rangeUri");
-			} else {
-				queryString = substituteUri(
-						substituteUri(
-								substituteUri(
-										QUERY_LOCATE_CONFIG_CONTEXT_WITH_DOMAIN,
-										baseUri, "baseUri"), rangeUri,
-								"rangeUri"), domainUri, "domainUri");
-			}
-
-			String contextUri = new SparqlQueryRunner(displayModel)
-					.executeSelect(PARSER_LOCATE_CONFIG_CONTEXT, queryString);
-
-			if (contextUri == null) {
-				log.debug("Can't find a ContextConfig for '" + domainUri
-						+ "', '" + baseUri + "', '" + rangeUri + "'");
-				return null;
-			}
-
+		Set<ConfigContext> contexts = ConfigContext.findByQualifiers(models,
+				domainUri, baseUri, rangeUri);
+		for (ConfigContext context : contexts) {
 			FauxProperty fp = new FauxProperty(domainUri, baseUri, rangeUri);
-			populateInstance(fp, displayModel, createResource(contextUri));
+			populateInstance(fp, createResource(context.getContextUri()));
 			return fp;
 		}
+		log.debug("Can't find a FauxProperty for '" + domainUri + "', '"
+				+ baseUri + "', '" + rangeUri + "'");
+		return null;
+	}
+
+	@Override
+	public void deleteFauxProperty(FauxProperty fp) {
+		Set<ConfigContext> contexts = ConfigContext.findByQualifiers(models,
+				fp.getDomainURI(), fp.getURI(), fp.getRangeURI());
+		try (LockedOntModel displayModel = models.getDisplayModel().write()) {
+			for (ConfigContext context : contexts) {
+				Resource configResource = createResource(context.getConfigUri());
+				displayModel.removeAll(configResource, null, null);
+				displayModel.removeAll(null, null, configResource);
+				Resource contextResource = createResource(context.getContextUri());
+				displayModel.removeAll(contextResource, null, null);
+				displayModel.removeAll(null, null, contextResource);
+			}
+		}
 	}
 
 	/**
 	 * Add labels, annotations, and whatever else we can find on the
-	 * ConfigContext.
+	 * ObjectPropertyDisplayConfig.
 	 */
-	private void populateInstance(FauxProperty fp, LockedOntModel model,
-			Resource context) {
-		String configUri = getUriValue(model, context, HAS_CONFIGURATION);
-		if (configUri == null) {
-			return;
-		}
-		Resource config = createResource(configUri);
+	private void populateInstance(FauxProperty fp, Resource context) {
+		// Range label and domain label.
+		try (LockedOntModel tboxModel = models.getTBoxModel().read()) {
+			String rangeLabel = getStringValue(tboxModel,
+					createProperty(fp.getRangeURI()), RDFS_LABEL);
+			if (rangeLabel != null) {
+				fp.setRangeLabel(rangeLabel);
+			}
+
+			String domainLabel = getStringValue(tboxModel,
+					createProperty(fp.getDomainURI()), RDFS_LABEL);
+			if (domainLabel != null) {
+				fp.setDomainLabel(domainLabel);
+			}
 
-		String displayName = getStringValue(model, config, DISPLAY_NAME);
-		if (displayName != null) {
-			fp.setPickListName(displayName);
 		}
-		
+
+		// Display name.
+		try (LockedOntModel displayModel = models.getDisplayModel().read()) {
+			String configUri = getUriValue(displayModel, context,
+					HAS_CONFIGURATION);
+			if (configUri == null) {
+				return;
+			}
+			Resource config = createResource(configUri);
+
+			String displayName = getStringValue(displayModel, config,
+					DISPLAY_NAME);
+			if (displayName != null) {
+				fp.setPickListName(displayName);
+			}
+		}
+
 		// TODO pull all sorts of things from the configuration.
-		// TODO pull labels for the domain and range classes.
 	}
 
-	private String substituteUri(String queryString, String variableName,
-			String uri) {
-		return queryString.replace("?" + variableName, "<" + uri + ">");
-	}
-	
 	/**
 	 * Returns a single URI that is the object of this subject and property.
 	 * Returns null if no valid statement is found.
@@ -283,6 +263,135 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 		return node.asLiteral().getString();
 	}
 
+	// ----------------------------------------------------------------------
+	// ConfigContext
+	// ----------------------------------------------------------------------
+
+	private static final String QUERY_LOCATE_CONFIG_CONTEXT_WITH_DOMAIN = "" //
+			+ "PREFIX : <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" //
+			+ "\n" //
+			+ "SELECT DISTINCT ?context ?config \n" //
+			+ "WHERE { \n" //
+			+ "    ?context a :ConfigContext ; \n" //
+			+ "        :configContextFor ?baseUri ; \n" //
+			+ "        :qualifiedByDomain ?domainUri ; \n" //
+			+ "        :qualifiedBy ?rangeUri ; \n" //
+			+ "        :hasConfiguration ?config . \n" //
+			+ "} \n"; //
+
+	// TODO Add a filter that will reject solutions that include
+	// qualifiedByDomain
+	private static final String QUERY_LOCATE_CONFIG_CONTEXT_WITH_NO_DOMAIN = "" //
+			+ "PREFIX : <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" //
+			+ "\n" //
+			+ "SELECT DISTINCT ?context \n" //
+			+ "WHERE { \n" //
+			+ "    ?context a :ConfigContext ; \n" //
+			+ "        :configContextFor ?baseUri ; \n" //
+			+ "        :qualifiedBy ?rangeUri ; \n" //
+			+ "        :hasConfiguration ?config . \n" //
+			+ "} \n"; //
+
+	private static class ParserLocateConfigContext extends
+			QueryParser<Set<ConfigContext>> {
+		private final String domainUri;
+		private final String baseUri;
+		private final String rangeUri;
+
+		public ParserLocateConfigContext(String domainUri, String baseUri,
+				String rangeUri) {
+			this.domainUri = domainUri;
+			this.baseUri = baseUri;
+			this.rangeUri = rangeUri;
+		}
+
+		@Override
+		protected Set<ConfigContext> defaultValue() {
+			return Collections.emptySet();
+		}
+
+		@Override
+		protected Set<ConfigContext> parseResults(String queryStr,
+				ResultSet results) {
+			Set<ConfigContext> set = new HashSet<>();
+			while (results.hasNext()) {
+				QuerySolution row = results.next();
+				String contextUri = ifResourcePresent(row, "context", null);
+				String configUri = ifResourcePresent(row, "config", null);
+				if (contextUri != null && configUri != null) {
+					set.add(new ConfigContext(contextUri, configUri, domainUri,
+							baseUri, rangeUri));
+				}
+			}
+			return set;
+		}
+	}
+
+	private static class ConfigContext {
+		public static Set<ConfigContext> findByQualifiers(
+				LockingOntModelSelector models, String domainUri,
+				String baseUri, String rangeUri) {
+			try (LockedOntModel displayModel = models.getDisplayModel().read()) {
+
+				String queryString;
+				if (domainUri == null) {
+					queryString = bindValues(
+							QUERY_LOCATE_CONFIG_CONTEXT_WITH_NO_DOMAIN,
+							uriValue("baseUri", baseUri),
+							uriValue("rangeUri", rangeUri));
+				} else {
+					queryString = bindValues(
+							QUERY_LOCATE_CONFIG_CONTEXT_WITH_DOMAIN,
+							uriValue("baseUri", baseUri),
+							uriValue("rangeUri", rangeUri),
+							uriValue("domainUri", domainUri));
+				}
+
+				ParserLocateConfigContext parser = new ParserLocateConfigContext(
+						domainUri, baseUri, rangeUri);
+				return new SparqlQueryRunner(displayModel).executeSelect(
+						parser, queryString);
+			}
+
+		}
+
+		private final String contextUri;
+		private final String configUri;
+		private final String domainUri;
+		private final String baseUri;
+		private final String rangeUri;
+
+		public ConfigContext(String contextUri, String configUri,
+				String domainUri, String baseUri, String rangeUri) {
+			this.contextUri = contextUri;
+			this.configUri = configUri;
+			this.domainUri = domainUri;
+			this.baseUri = baseUri;
+			this.rangeUri = rangeUri;
+		}
+
+		public String getContextUri() {
+			return contextUri;
+		}
+
+		public String getConfigUri() {
+			return configUri;
+		}
+
+		public String getDomainUri() {
+			return domainUri;
+		}
+
+		public String getBaseUri() {
+			return baseUri;
+		}
+
+		public String getRangeUri() {
+			return rangeUri;
+		}
+
+	}
+
 	// ----------------------------------------------------------------------
 	// Helper classes. Are they worth it, just to use try-with-resources?
 	// ----------------------------------------------------------------------
@@ -297,6 +406,10 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 		public LockableOntModel getDisplayModel() {
 			return new LockableOntModel(oms.getDisplayModel());
 		}
+
+		public LockableOntModel getTBoxModel() {
+			return new LockableOntModel(oms.getTBoxModel());
+		}
 	}
 
 	private static class LockableOntModel {
@@ -310,6 +423,11 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 			ontModel.enterCriticalSection(Lock.READ);
 			return new LockedOntModel(ontModel);
 		}
+
+		public LockedOntModel write() {
+			ontModel.enterCriticalSection(Lock.WRITE);
+			return new LockedOntModel(ontModel);
+		}
 	}
 
 	private static class LockedOntModel extends AbstractOntModelDecorator
@@ -328,4 +446,5 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 			super.leaveCriticalSection();
 		}
 	}
+
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java
index 6ffb697ca..f2fda46dc 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java
@@ -136,5 +136,36 @@ public class SparqlQueryRunner {
 		}
 
 	}
+	
+	public static String bindValues(String rawString, VariableValue... values) {
+		String queryString = rawString;
+		for (VariableValue value: values) {
+			queryString = value.bind(queryString);
+		}
+		return queryString;
+	}
+	
+	public static UriValue uriValue(String name, String uri) {
+		return new UriValue(name, uri);
+	}
 
+	public interface VariableValue {
+		String bind(String rawString);
+	}
+	
+	private static class UriValue implements VariableValue {
+		private final String name;
+		private final String uri;
+		
+		public UriValue(String name, String uri) {
+			this.name = name;
+			this.uri = uri;
+		}
+
+		@Override
+		public String bind(String rawString) {
+			return rawString.replaceAll("\\?" + name + "\\b", "<" + uri + ">");
+		}
+		
+	}
 }
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunnerTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunnerTest.java
new file mode 100644
index 000000000..2ae77111e
--- /dev/null
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunnerTest.java
@@ -0,0 +1,92 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils;
+
+import static org.junit.Assert.*;
+import static edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner.*;
+
+import org.junit.Test;
+
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+
+/**
+ * For now, just test the methods that manipulate the query string.
+ */
+public class SparqlQueryRunnerTest extends AbstractTestClass {
+	@Test
+	public void bindValuesNameNotFound() {
+		String raw = "No such name here";
+		String expected = raw;
+		assertEquals(expected, bindValues(raw, uriValue("bogus", "BOGUS")));
+	}
+
+	@Test
+	public void bindOneUri() {
+		String raw = "Replace both ?this and ?this also.";
+		String expected = "Replace both <URI> and <URI> also.";
+		assertEquals(expected, bindValues(raw, uriValue("this", "URI")));
+	}
+
+	@Test
+	public void bindTwoUris() {
+		String raw = "Replace both ?this and ?that also.";
+		String expected = "Replace both <URI> and <ANOTHER> also.";
+		assertEquals(
+				expected,
+				bindValues(raw, uriValue("this", "URI"),
+						uriValue("that", "ANOTHER")));
+	}
+
+	@Test
+	public void honorWordBoundary() {
+		String raw = "Replace ?this but not ?thistle.";
+		String expected = "Replace <URI> but not ?thistle.";
+		assertEquals(expected, bindValues(raw, uriValue("this", "URI")));
+	}
+
+	@Test
+	public void honorStringLimit() {
+		String raw = "?this";
+		String expected = "<URI>";
+		assertEquals(expected, bindValues(raw, uriValue("this", "URI")));
+	}
+
+	private static final String REAL_WORLD_RAW = "" //
+			+ "PREFIX : <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" //
+			+ "\n" //
+			+ "SELECT DISTINCT ?context ?config \n" //
+			+ "WHERE { \n" //
+			+ "    ?context a :ConfigContext ; \n" //
+			+ "        :configContextFor ?baseUri ; \n" //
+			+ "        :qualifiedByDomain ?domainUri ; \n" //
+			+ "        :qualifiedBy ?rangeUri ; \n" //
+			+ "        :hasConfiguration ?config . \n" //
+			+ "} \n"; //
+
+	private static final String REAL_WORLD_EXPECTED = "" //
+			+ "PREFIX : <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" //
+			+ "\n" //
+			+ "SELECT DISTINCT ?context ?config \n" //
+			+ "WHERE { \n" //
+			+ "    ?context a :ConfigContext ; \n" //
+			+ "        :configContextFor <http://vivoweb.org/ontology/core#relates> ; \n" //
+			+ "        :qualifiedByDomain <http://vivoweb.org/ontology/core#Contract> ; \n" //
+			+ "        :qualifiedBy <http://vivoweb.org/ontology/core#ResearcherRole> ; \n" //
+			+ "        :hasConfiguration ?config . \n" //
+			+ "} \n"; //
+
+	@Test
+	public void realWorldExample() {
+		assertEquals(
+				REAL_WORLD_EXPECTED,
+				bindValues(
+						REAL_WORLD_RAW,
+						uriValue("baseUri",
+								"http://vivoweb.org/ontology/core#relates"),
+						uriValue("domainUri",
+								"http://vivoweb.org/ontology/core#Contract"),
+						uriValue("rangeUri",
+								"http://vivoweb.org/ontology/core#ResearcherRole")));
+	}
+
+}
diff --git a/webapp/web/templates/edit/specific/fauxProperty_retry.jsp b/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
new file mode 100644
index 000000000..f98542e88
--- /dev/null
+++ b/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
@@ -0,0 +1,6 @@
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
+<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<h1>Like, TOTALLY BOGUS.</h1>
\ No newline at end of file
diff --git a/webapp/web/templates/edit/specific/props_edit.jsp b/webapp/web/templates/edit/specific/props_edit.jsp
index cad21169b..dc9cc1905 100644
--- a/webapp/web/templates/edit/specific/props_edit.jsp
+++ b/webapp/web/templates/edit/specific/props_edit.jsp
@@ -98,18 +98,25 @@
 	  <c:if test="${!empty fauxproperties}">
 		<c:forEach var="fauxproperty" items="${fauxproperties}">
 		  <ul style="list-style-type:none;">
-		    <c:url var="fauxpropertyURL" value="fauxpropertyEdit">
-			  <c:param name="property" value="${property.URI}"/>
-			  <c:param name="domain" value="${fauxproperty.domainURI}" />
-			  <c:param name="range" value="${fauxproperty.rangeURI}" />
-			</c:url>
 			<li>
-			  <a href="${fauxpropertyURL}">${fauxproperty.pickListName}</a>
 			  <c:choose>
 			    <c:when test="${empty fauxproperty.domainLabel}">
+		          <c:url var="fauxpropertyURL" value="editForm">
+			        <c:param name="controller" value="FauxProperty"/>
+			        <c:param name="baseUri" value="${property.URI}"/>
+			        <c:param name="rangeUri" value="${fauxproperty.rangeURI}" />
+			      </c:url>
+			      <a href="${fauxpropertyURL}">${fauxproperty.pickListName}</a>
 			      no domain,
 			    </c:when>
 			    <c:otherwise>
+		          <c:url var="fauxpropertyURL" value="editForm">
+			        <c:param name="controller" value="FauxProperty"/>
+			        <c:param name="baseUri" value="${property.URI}"/>
+			        <c:param name="domainUri" value="${fauxproperty.domainURI}" />
+			        <c:param name="rangeUri" value="${fauxproperty.rangeURI}" />
+			      </c:url>
+			      <a href="${fauxpropertyURL}">${fauxproperty.pickListName}</a>
 			      domain: ${fauxproperty.domainLabel},
 			    </c:otherwise>
 			  </c:choose> 
@@ -120,14 +127,17 @@
 	  </c:if>
 	</td>
 	<td>
-		<form action="editForm" method="get">
-			<input type="hidden" name="basepropertyURI" value="${property.URI}"/>
-			<input type="hidden" name="controller" value="FauxProperty"/>
-			<input type="submit" class="form-button" value="Create New Faux Property"/>
-		</form>
+	<form action="editForm" method="get">
+	  <input type="hidden" name="create" value="create"/>
+	  <input type="hidden" name="baseUri" value="${property.URI}"/>
+	  <input type="hidden" name="controller" value="FauxProperty"/>
+	  <input type="submit" class="form-button" value="Create New Faux Property"/>
+	</form>
 	</td>
 </tr>
 
+
+
 <tr><td colspan="3"><hr/></td></tr>
 <!-- _____________________________________________ superproperties __________________________________________ -->
 <tr valign="bottom" align="center">

From c8368dbe2dbb6dffa95446538dd10b1d6e5ef519 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Mon, 3 Nov 2014 15:09:43 -0500
Subject: [PATCH 07/30] Produce the pick-lists for range and domain.

Still not submitting the results.
---
 .../cornell/mannlib/vedit/util/FormUtils.java |  37 ++-
 .../edit/FauxPropertyRetryController.java     | 247 ++++++++++++------
 .../edit/specific/fauxProperty_retry.jsp      |  12 +-
 3 files changed, 210 insertions(+), 86 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vedit/util/FormUtils.java b/webapp/src/edu/cornell/mannlib/vedit/util/FormUtils.java
index 77e8fdefb..3b50449ac 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/util/FormUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/util/FormUtils.java
@@ -6,23 +6,27 @@ import java.lang.reflect.Method;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import edu.cornell.mannlib.vedit.beans.EditProcessObject;
 import edu.cornell.mannlib.vedit.beans.FormObject;
 import edu.cornell.mannlib.vedit.beans.Option;
-import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
 public class FormUtils {
@@ -247,6 +251,35 @@ public class FormUtils {
         }
         return vclassOptionList;
     }
+    
+	public static List<Option> makeOptionListOfSubVClasses(
+			WebappDaoFactory wadf, String parentVClassUri,
+			String selectedVClassURI) {
+		VClassDao vClassDao = wadf.getVClassDao();
+		
+		Set<String> uris = new HashSet<>(vClassDao.getAllSubClassURIs(parentVClassUri));
+		uris.add(parentVClassUri);
+		
+		List<Option> options = new LinkedList<>();
+		for (String vclassUri: uris) {
+			VClass vclass = vClassDao.getVClassByURI(vclassUri);
+        	Option option = new Option();
+        	option.setValue(vclass.getURI());
+        	option.setBody(vclass.getPickListName());
+        	options.add(option);
+        	if(Objects.equals(selectedVClassURI, vclass.getURI())) {
+        	    option.setSelected(true);
+        	}
+		}
+		
+		Collections.sort(options, new Comparator<Option>() {
+			@Override
+			public int compare(Option o1, Option o2) {
+				return o1.getBody().compareTo(o2.getBody());
+			}});
+		
+		return options;
+	}
 
     public static void beanSet(Object newObj, String field, String value) {
         beanSet (newObj, field, value, null);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
index 93838c4d7..fc606ee1f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
@@ -2,7 +2,11 @@
 
 package edu.cornell.mannlib.vitro.webapp.controller.edit;
 
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
@@ -14,14 +18,17 @@ import org.apache.commons.logging.LogFactory;
 
 import edu.cornell.mannlib.vedit.beans.EditProcessObject;
 import edu.cornell.mannlib.vedit.beans.FormObject;
+import edu.cornell.mannlib.vedit.beans.Option;
 import edu.cornell.mannlib.vedit.controller.BaseEditController;
 import edu.cornell.mannlib.vedit.util.FormUtils;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionListener;
 import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.Property;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 
 /**
@@ -30,8 +37,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 public class FauxPropertyRetryController extends BaseEditController {
 	private static final Log log = LogFactory
 			.getLog(FauxPropertyRetryController.class);
-	
-	
+
 	@Override
 	public void doPost(HttpServletRequest req, HttpServletResponse response) {
 		if (!isAuthorizedToDisplayPage(req, response,
@@ -39,93 +45,32 @@ public class FauxPropertyRetryController extends BaseEditController {
 			return;
 		}
 
-		VitroRequest request = new VitroRequest(req);
-
 		// create an EditProcessObject for this and put it in the session
-		EditProcessObject epo = super.createEpo(request);
+		EditProcessObject epo = super.createEpo(req);
 
-		ServletContext ctx = getServletContext();
+		// Populate it.
+		EpoPopulator populator = new EpoPopulator(req, epo);
+		populator.populate();
 
-		FauxPropertyDao fpDao = ModelAccess.on(ctx).getWebappDaoFactory()
-				.getFauxPropertyDao();
-		epo.setDataAccessObject(fpDao);
+		req.setAttribute("bodyJsp", "/templates/edit/formBasic.jsp");
+		req.setAttribute("colspan", "5");
+		req.setAttribute("formJsp",
+				"/templates/edit/specific/fauxProperty_retry.jsp");
+		req.setAttribute("scripts", "/templates/edit/formBasic.js");
+		req.setAttribute("title", "Faux Property Editing Form");
+		req.setAttribute("_action", epo.getAction());
+		setRequestAttributes(req, epo);
 
-		FauxProperty fpForEditing = null;
-		if (epo.getUseRecycledBean()) {
-			fpForEditing = (FauxProperty) epo.getNewBean();
-		} else {
-			String create = request.getParameter("create");
-			String baseUri = request.getParameter("baseUri");
-			String rangeUri = request.getParameter("rangeUri");
-			String domainUri = request.getParameter("domainUri");
-			if (create != null) {
-				fpForEditing = new FauxProperty(null, baseUri, null);
-				epo.setAction("insert");
-			} else {
-				fpForEditing = fpDao.getFauxPropertyByUris(domainUri, baseUri,
-						rangeUri);
-				if (fpForEditing == null) {
-					throw new IllegalArgumentException(
-							"FauxProperty does not exist for <" + domainUri
-									+ "> ==> <" + baseUri + "> ==> <"
-									+ rangeUri + ">");
-				}
-				epo.setAction("update");
-			}
-			epo.setOriginalBean(fpForEditing);
+		try {
+			RequestDispatcher rd = req
+					.getRequestDispatcher(Controllers.BASIC_JSP);
+			rd.forward(req, response);
+		} catch (Exception e) {
+			log.error("Could not forward to view.");
+			log.error(e.getMessage());
+			log.error(e.getStackTrace());
 		}
 
-		// set any validators
-		// TODO NONE YET
-
-		// set up any listeners
-		epo.setChangeListenerList(Collections
-				.singletonList(new PropertyRestrictionListener(ctx)));
-
-		// where should the postinsert pageforwarder go?
-		// TODO
-		// make a postdelete pageforwarder that will send us to the control
-		// panel for the base property.
-		// TODO
-
-		FormObject foo = new FormObject();
-		foo.setErrorMap(epo.getErrMsgMap());
-
-		// We will need to set a lot of option lists and stuff.
-		// TODO
-
-		// Put attributes on the request so the JSP can populate the fields.
-		// request.setAttribute("transitive",propertyForEditing.getTransitive());
-		// request.setAttribute("objectIndividualSortPropertyURI",
-		// propertyForEditing.getObjectIndividualSortPropertyURI());
-		// TODO
-
-		// checkboxes are pretty annoying : we don't know if someone *unchecked*
-		// a box, so we have to default to false on updates.
-		// propertyForEditing.setSymmetric(false);
-		// TODO
-
-		epo.setFormObject(foo);
-
-		FormUtils.populateFormFromBean(fpForEditing, epo.getAction(), foo,
-				epo.getBadValueMap());
-
-        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
-        request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
-        request.setAttribute("colspan","5");
-        request.setAttribute("formJsp","/templates/edit/specific/fauxProperty_retry.jsp");
-        request.setAttribute("scripts","/templates/edit/formBasic.js");
-        request.setAttribute("title","Faux Property Editing Form");
-        request.setAttribute("_action",epo.getAction());
-        setRequestAttributes(request,epo);
-
-        try {
-            rd.forward(request, response);
-        } catch (Exception e) {
-            log.error("Could not forward to view.");
-            log.error(e.getMessage());
-            log.error(e.getStackTrace());
-        }
 	}
 
 	@Override
@@ -133,4 +78,140 @@ public class FauxPropertyRetryController extends BaseEditController {
 		doPost(request, response);
 	}
 
+	private static class EpoPopulator {
+		private final VitroRequest req;
+		private final ServletContext ctx;
+		private final EditProcessObject epo;
+
+		private final FauxPropertyDao fpDao;
+
+		private FauxProperty beanForEditing;
+		private Property baseProperty;
+
+		EpoPopulator(HttpServletRequest req, EditProcessObject epo) {
+			this.req = new VitroRequest(req);
+			this.ctx = req.getSession().getServletContext();
+
+			this.epo = epo;
+
+			this.fpDao = ModelAccess.on(ctx).getWebappDaoFactory()
+					.getFauxPropertyDao();
+
+		}
+
+		void populate() {
+			epo.setDataAccessObject(fpDao);
+			epo.setAction(determineAction());
+
+			if (epo.getUseRecycledBean()) {
+				beanForEditing = (FauxProperty) epo.getNewBean();
+			} else {
+				beanForEditing = locateBeanForEditing();
+				epo.setOriginalBean(beanForEditing);
+			}
+
+			this.baseProperty = req.getUnfilteredWebappDaoFactory()
+					.getObjectPropertyDao()
+					.getObjectPropertyByURI(beanForEditing.getURI());
+
+			doABunchOfOtherJunk();
+		}
+
+		private String determineAction() {
+			return (req.getParameter("create") == null) ? "update" : "insert";
+		}
+
+		private FauxProperty locateBeanForEditing() {
+			String baseUri = req.getParameter("baseUri");
+			String rangeUri = req.getParameter("rangeUri");
+			String domainUri = req.getParameter("domainUri");
+
+			if (epo.getAction().equals("insert")) {
+				return new FauxProperty(null, baseUri, null);
+			}
+
+			FauxProperty bean = fpDao.getFauxPropertyByUris(domainUri, baseUri,
+					rangeUri);
+			if (bean == null) {
+				throw new IllegalArgumentException(
+						"FauxProperty does not exist for <" + domainUri
+								+ "> ==> <" + baseUri + "> ==> <" + rangeUri
+								+ ">");
+			}
+			return bean;
+		}
+
+		private void doABunchOfOtherJunk() {
+			// set any validators
+			// TODO NONE YET
+
+			// set up any listeners
+			epo.setChangeListenerList(Collections
+					.singletonList(new PropertyRestrictionListener(ctx)));
+
+			// where should the postinsert pageforwarder go?
+			// TODO
+			// make a postdelete pageforwarder that will send us to the control
+			// panel for the base property.
+			// TODO
+
+			FormObject foo = new FormObject();
+			foo.setErrorMap(epo.getErrMsgMap());
+
+			foo.setOptionLists(new HashMap<>(createOptionsMap()));
+
+			// We will need to set a lot of option lists and stuff.
+			// TODO
+
+			// Put attributes on the request so the JSP can populate the fields.
+			// request.setAttribute("transitive",propertyForEditing.getTransitive());
+			// request.setAttribute("objectIndividualSortPropertyURI",
+			// propertyForEditing.getObjectIndividualSortPropertyURI());
+			// TODO
+
+			// checkboxes are pretty annoying : we don't know if someone
+			// *unchecked*
+			// a box, so we have to default to false on updates.
+			// propertyForEditing.setSymmetric(false);
+			// TODO
+
+			epo.setFormObject(foo);
+
+			FormUtils.populateFormFromBean(beanForEditing, epo.getAction(),
+					foo, epo.getBadValueMap());
+		}
+
+		private Map<String, List<Option>> createOptionsMap() {
+			Map<String, List<Option>> map = new HashMap<>();
+			map.put("DomainVClassURI",
+					createRootedVClassOptionList(
+							baseProperty.getDomainVClassURI(),
+							beanForEditing.getDomainURI()));
+			map.put("RangeVClassURI",
+					createRootedVClassOptionList(
+							baseProperty.getRangeVClassURI(),
+							beanForEditing.getRangeURI()));
+			return map;
+		}
+
+		private List<Option> createRootedVClassOptionList(String rootVClassUri,
+				String currentSelection) {
+			WebappDaoFactory wadf = req.getUnfilteredWebappDaoFactory();
+
+			List<Option> list = new ArrayList<>();
+			list.add(new Option("", "(none specified)"));
+
+			if (rootVClassUri == null) {
+				list.addAll(FormUtils.makeVClassOptionList(wadf,
+						currentSelection));
+			} else {
+				list.addAll(FormUtils.makeOptionListOfSubVClasses(wadf,
+						rootVClassUri, currentSelection));
+			}
+
+			return list;
+		}
+
+	}
+
 }
diff --git a/webapp/web/templates/edit/specific/fauxProperty_retry.jsp b/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
index f98542e88..45694b0cc 100644
--- a/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
+++ b/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
@@ -3,4 +3,14 @@
 <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
-<h1>Like, TOTALLY BOGUS.</h1>
\ No newline at end of file
+<tr><td colspan="5"><hr class="formDivider"/></td></tr>
+<tr class="editformcell">
+    <td valign="top" colspan="2">
+        <b>Domain class</b><br />
+        <select name="DomainVClassURI"><form:option name="DomainVClassURI"/></select>
+    </td>
+    <td valign="top" colspan="2">
+        <b>Range class</b><br />
+        <select name="RangeVClassURI" ><form:option name="RangeVClassURI"/></select>
+    </td>
+</tr>

From 852da3ff2a825086b058c2369bf7615fd30751c3 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Wed, 5 Nov 2014 11:37:52 -0500
Subject: [PATCH 08/30] Implement insert and update in FauxPropertyDaoJena

---
 .../vitro/webapp/beans/FauxProperty.java      | 178 ++++++-
 .../edit/FauxPropertyRetryController.java     |  76 ++-
 .../vitro/webapp/dao/FauxPropertyDao.java     |  32 +-
 .../filtering/FauxPropertyDaoFiltering.java   |  19 +-
 .../webapp/dao/jena/FauxPropertyDaoJena.java  | 453 +++++++++++++-----
 .../edit/specific/fauxProperty_retry.jsp      | 155 +++++-
 6 files changed, 743 insertions(+), 170 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
index c3025b3ab..a7aebf510 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
@@ -11,26 +11,36 @@ import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.RoleRestrictedProperty;
 /**
  * Represents a specialization on an ObjectProperty, only meaningful for
  * display.
- * 
- * BaseURI is required, may not be null, and may not be modified.
- * 
- * It would be nice to place the same restrictions on rangeURI, but it may be
- * null when the FauxProperty is being created, and it may be modified. The DAO
- * will need to check rangeURI for validity before accepting an insert or
- * modification.
- * 
- * TODO Can we do this more cleanly? Can handle this as two classes FauxProperty
- * and NewFauxProperty, and have each class enforce its own internal
- * constraints? For example, the range must not be null, must represent a valid
- * class, and must be equal to or a subclass of the range of the base property.
  */
-public class FauxProperty extends BaseResourceBean implements ResourceBean, RoleRestrictedProperty {
+public class FauxProperty extends BaseResourceBean implements ResourceBean,
+		RoleRestrictedProperty {
+	// Must be null on insert. Must not be null on update. Ignored on delete.
+	private String contextUri;
+	// Must be null on insert. Must not be null on update. Ignored on delete.
+	private String configUri;
+
+	// Must not be null on insert or update. Partial identifier on delete.
 	private String rangeURI;
+	// May be null. Partial identifier on delete.
 	private String domainURI;
 
 	private String rangeLabel;
 	private String domainLabel;
 
+	private String groupURI;
+
+	private String publicDescription;
+
+	private int displayTier;
+	private int displayLimit;
+
+	private boolean collateBySubclass;
+	private boolean selectFromExisting;
+	private boolean offerCreateNewOption;
+
+	private String customEntryForm;
+	private String customListView;
+
 	/**
 	 * Arguments are in this order to mimic the relationship: subject ==>
 	 * property ==> object
@@ -47,44 +57,150 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean, Role
 		this.rangeURI = rangeURI;
 		this.domainURI = domainURI;
 	}
-	
+
 	public FauxProperty() {
 		// This is required by OperationUtils.cloneBean()
 	}
 
-	public void setRangeURI(String rangeURI) {
-		this.rangeURI = rangeURI;
+	public String getContextUri() {
+		return contextUri;
+	}
+
+	public void setContextUri(String contextUri) {
+		this.contextUri = contextUri;
+	}
+
+	public String getConfigUri() {
+		return configUri;
+	}
+
+	public void setConfigUri(String configUri) {
+		this.configUri = configUri;
+	}
+
+	// BaseURI becomes an alias for URI
+	public String getBaseURI() {
+		return getURI();
+	}
+
+	public void setBaseURI(String baseURI) {
+		setURI(baseURI);
 	}
 
 	public String getRangeURI() {
 		return rangeURI;
 	}
 
-	public void setRangeLabel(String rangeLabel) {
-		this.rangeLabel = rangeLabel;
+	public void setRangeURI(String rangeURI) {
+		this.rangeURI = rangeURI;
 	}
 
 	public String getRangeLabel() {
 		return (rangeLabel == null) ? localName(rangeURI) : rangeLabel;
 	}
 
-	public void setDomainURI(String domainURI) {
-		this.domainURI = domainURI;
+	public void setRangeLabel(String rangeLabel) {
+		this.rangeLabel = rangeLabel;
 	}
-	
+
 	public String getDomainURI() {
 		return domainURI;
 	}
 
-	public void setDomainLabel(String domainLabel) {
-		this.domainLabel = domainLabel;
+	public void setDomainURI(String domainURI) {
+		this.domainURI = domainURI;
 	}
 
 	public String getDomainLabel() {
 		return (domainLabel == null) ? (domainURI == null ? "null"
 				: localName(domainURI)) : domainLabel;
 	}
-	
+
+	public void setDomainLabel(String domainLabel) {
+		this.domainLabel = domainLabel;
+	}
+
+	public String getGroupURI() {
+		return groupURI;
+	}
+
+	public void setGroupURI(String groupURI) {
+		this.groupURI = groupURI;
+	}
+
+	// DisplayName becomes an alias for PickListName
+	public String getDisplayName() {
+		return getPickListName();
+	}
+
+	public void setDisplayName(String displayName) {
+		setPickListName(displayName);
+	}
+
+	public String getPublicDescription() {
+		return publicDescription;
+	}
+
+	public void setPublicDescription(String publicDescription) {
+		this.publicDescription = publicDescription;
+	}
+
+	public int getDisplayTier() {
+		return displayTier;
+	}
+
+	public void setDisplayTier(int displayTier) {
+		this.displayTier = displayTier;
+	}
+
+	public int getDisplayLimit() {
+		return displayLimit;
+	}
+
+	public void setDisplayLimit(int displayLimit) {
+		this.displayLimit = displayLimit;
+	}
+
+	public boolean isCollateBySubclass() {
+		return collateBySubclass;
+	}
+
+	public void setCollateBySubclass(boolean collateBySubclass) {
+		this.collateBySubclass = collateBySubclass;
+	}
+
+	public boolean isSelectFromExisting() {
+		return selectFromExisting;
+	}
+
+	public void setSelectFromExisting(boolean selectFromExisting) {
+		this.selectFromExisting = selectFromExisting;
+	}
+
+	public boolean isOfferCreateNewOption() {
+		return offerCreateNewOption;
+	}
+
+	public void setOfferCreateNewOption(boolean offerCreateNewOption) {
+		this.offerCreateNewOption = offerCreateNewOption;
+	}
+
+	public String getCustomEntryForm() {
+		return customEntryForm;
+	}
+
+	public void setCustomEntryForm(String customEntryForm) {
+		this.customEntryForm = customEntryForm;
+	}
+
+	public String getCustomListView() {
+		return customListView;
+	}
+
+	public void setCustomListView(String customListView) {
+		this.customListView = customListView;
+	}
+
 	private String localName(String uriString) {
 		try {
 			return createResource(uriString).getLocalName();
@@ -93,4 +209,18 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean, Role
 		}
 	}
 
+	@Override
+	public String toString() {
+		return "FauxProperty[domainURI=" + domainURI + ", baseUri=" + getURI()
+				+ ", rangeURI=" + rangeURI + ", rangeLabel=" + rangeLabel
+				+ ", domainLabel=" + domainLabel + ", pickListName="
+				+ getPickListName() + ", groupURI=" + groupURI
+				+ "publicDescription=" + publicDescription + ", displayTier="
+				+ displayTier + ", displayLimit=" + displayLimit
+				+ ", collateBySubclass=" + collateBySubclass
+				+ ", selectFromExisting=" + selectFromExisting
+				+ ", offerCreateNewOption=" + offerCreateNewOption
+				+ ", customEntryForm=" + customEntryForm + ", customListView="
+				+ customListView + "]";
+	}
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
index fc606ee1f..ad328e240 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
@@ -2,8 +2,13 @@
 
 package edu.cornell.mannlib.vitro.webapp.controller.edit;
 
+import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.POLICY_NEUTRAL;
+
+import java.text.Collator;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,12 +26,16 @@ import edu.cornell.mannlib.vedit.beans.FormObject;
 import edu.cornell.mannlib.vedit.beans.Option;
 import edu.cornell.mannlib.vedit.controller.BaseEditController;
 import edu.cornell.mannlib.vedit.util.FormUtils;
+import edu.cornell.mannlib.vedit.validator.Validator;
+import edu.cornell.mannlib.vedit.validator.impl.RequiredFieldValidator;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionListener;
 import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.Property;
+import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.edit.utils.RoleLevelOptionsSetup;
 import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
@@ -81,6 +90,8 @@ public class FauxPropertyRetryController extends BaseEditController {
 	private static class EpoPopulator {
 		private final VitroRequest req;
 		private final ServletContext ctx;
+		private final WebappDaoFactory wadf;
+
 		private final EditProcessObject epo;
 
 		private final FauxPropertyDao fpDao;
@@ -91,6 +102,7 @@ public class FauxPropertyRetryController extends BaseEditController {
 		EpoPopulator(HttpServletRequest req, EditProcessObject epo) {
 			this.req = new VitroRequest(req);
 			this.ctx = req.getSession().getServletContext();
+			this.wadf = ModelAccess.on(req).getWebappDaoFactory(POLICY_NEUTRAL);
 
 			this.epo = epo;
 
@@ -114,6 +126,8 @@ public class FauxPropertyRetryController extends BaseEditController {
 					.getObjectPropertyDao()
 					.getObjectPropertyByURI(beanForEditing.getURI());
 
+			setFieldValidators();
+
 			doABunchOfOtherJunk();
 		}
 
@@ -141,10 +155,13 @@ public class FauxPropertyRetryController extends BaseEditController {
 			return bean;
 		}
 
-		private void doABunchOfOtherJunk() {
-			// set any validators
-			// TODO NONE YET
+		private void setFieldValidators() {
+			epo.getValidatorMap()
+					.put("RangeURI",
+							Arrays.asList(new Validator[] { new RequiredFieldValidator() }));
+		}
 
+		private void doABunchOfOtherJunk() {
 			// set up any listeners
 			epo.setChangeListenerList(Collections
 					.singletonList(new PropertyRestrictionListener(ctx)));
@@ -183,21 +200,52 @@ public class FauxPropertyRetryController extends BaseEditController {
 
 		private Map<String, List<Option>> createOptionsMap() {
 			Map<String, List<Option>> map = new HashMap<>();
-			map.put("DomainVClassURI",
+
+			map.put("GroupURI", createClassGroupOptionList());
+			
+			map.put("DomainURI",
 					createRootedVClassOptionList(
 							baseProperty.getDomainVClassURI(),
 							beanForEditing.getDomainURI()));
-			map.put("RangeVClassURI",
+			map.put("RangeURI",
 					createRootedVClassOptionList(
 							baseProperty.getRangeVClassURI(),
 							beanForEditing.getRangeURI()));
+			
+			map.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",
+					RoleLevelOptionsSetup.getDisplayOptionsList(beanForEditing));
+			map.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",
+					RoleLevelOptionsSetup.getUpdateOptionsList(beanForEditing));
+			map.put("HiddenFromPublishBelowRoleLevelUsingRoleUri",
+					RoleLevelOptionsSetup.getPublishOptionsList(beanForEditing));
+
 			return map;
 		}
 
+		private List<Option> createClassGroupOptionList() {
+			List<Option> groupOptList = getGroupOptList(beanForEditing
+					.getGroupURI());
+			Collections.sort(groupOptList,
+					new OptionsBodyComparator(req.getCollator()));
+			groupOptList.add(0, new Option("", "none"));
+			return groupOptList;
+		}
+
+		private List<Option> getGroupOptList(String currentGroupURI) {
+			List<PropertyGroup> groups = wadf.getPropertyGroupDao()
+					.getPublicGroups(true);
+			if (currentGroupURI == null) {
+				return FormUtils.makeOptionListFromBeans(groups, "URI", "Name",
+						"", null, false);
+
+			} else {
+				return FormUtils.makeOptionListFromBeans(groups, "URI", "Name",
+						currentGroupURI, null, true);
+			}
+		}
+
 		private List<Option> createRootedVClassOptionList(String rootVClassUri,
 				String currentSelection) {
-			WebappDaoFactory wadf = req.getUnfilteredWebappDaoFactory();
-
 			List<Option> list = new ArrayList<>();
 			list.add(new Option("", "(none specified)"));
 
@@ -212,6 +260,20 @@ public class FauxPropertyRetryController extends BaseEditController {
 			return list;
 		}
 
+		private static class OptionsBodyComparator implements
+				Comparator<Option> {
+			private final Collator collator;
+
+			public OptionsBodyComparator(Collator collator) {
+				this.collator = collator;
+			}
+
+			@Override
+			public int compare(Option o1, Option o2) {
+				return collator.compare(o1.getBody(), o2.getBody());
+			}
+		}
+
 	}
 
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java
index 8579e1b85..3e2c4d1b6 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java
@@ -24,7 +24,7 @@ public interface FauxPropertyDao {
 	 * 
 	 * @return May return null.
 	 */
-	FauxProperty getFauxPropertyFromConfigContextUri(String contextUri);
+	FauxProperty getFauxPropertyFromContextUri(String contextUri);
 
 	/**
 	 * If the display model contains a ConfigContext based on these URIs, get
@@ -42,6 +42,36 @@ public interface FauxPropertyDao {
 	FauxProperty getFauxPropertyByUris(String domainUri, String baseUri,
 			String rangeUri);
 
+	/**
+	 * Creates a new FauxProperty in the display model.
+	 * 
+	 * By "a new FauxProperty", we mean a new ConfigContext and a new
+	 * ObjectPropertyDisplayConfig linked to it.
+	 * 
+	 * @throws IllegalStateException
+	 *             if fp does not have null values for contextUri and configUri,
+	 *             or if a FauxProperty already exists with this combination of
+	 *             domain, base, and range URIs.
+	 * @throws IllegalArgumentException
+	 *             if fp is not internally consistent.
+	 */
+	void insertFauxProperty(FauxProperty fp);
+
+	/**
+	 * Updates the properties of this FauxProperty in the display model.
+	 * 
+	 * By "this FauxProperty", we mean the ConfigContext and
+	 * ObjectPropertyDisplayConfig whose URIs are stored in this FauxProperty.
+	 * 
+	 * @throws IllegalStateException
+	 *             if the display model contains no such individuals. If you
+	 *             want to create a new FauxProperty instance, you should be
+	 *             using insertFauxProperty() instead.
+	 * @throws IllegalArgumentException
+	 *             if fp is not internally consistent.
+	 */
+	void updateFauxProperty(FauxProperty fp);
+
 	/**
 	 * Delete this FauxProperty from the display model.
 	 * 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java
index ac7442a24..001d7c914 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java
@@ -32,7 +32,7 @@ public class FauxPropertyDaoFiltering extends BaseFiltering implements FauxPrope
 	}
 
 	@Override
-	public FauxProperty getFauxPropertyFromConfigContextUri(String contextUri) {
+	public FauxProperty getFauxPropertyFromContextUri(String contextUri) {
 		// TODO Auto-generated method stub
 		throw new RuntimeException(
 				"FauxPropertyDaoFiltering.getFauxPropertyFromConfigContextUri() not implemented.");
@@ -48,9 +48,13 @@ public class FauxPropertyDaoFiltering extends BaseFiltering implements FauxPrope
 
 	}
 
-	/* (non-Javadoc)
-	 * @see edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao#deleteFauxProperty(edu.cornell.mannlib.vitro.webapp.beans.FauxProperty)
-	 */
+	@Override
+	public void updateFauxProperty(FauxProperty fp) {
+		// TODO Auto-generated method stub
+		throw new RuntimeException("FauxPropertyDaoFiltering.updateFauxProperty() not implemented.");
+		
+	}
+
 	@Override
 	public void deleteFauxProperty(FauxProperty fp) {
 		// TODO Auto-generated method stub
@@ -58,4 +62,11 @@ public class FauxPropertyDaoFiltering extends BaseFiltering implements FauxPrope
 		
 	}
 
+	@Override
+	public void insertFauxProperty(FauxProperty fp) {
+		// TODO Auto-generated method stub
+		throw new RuntimeException("FauxPropertyDao.insertFauxProperty() not implemented.");
+		
+	}
+
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
index 7cbb2f4b3..c59fbc729 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
@@ -2,23 +2,28 @@
 
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
-import static com.hp.hpl.jena.rdf.model.ResourceFactory.createProperty;
 import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource;
 import static edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner.bindValues;
 import static edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner.uriValue;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Random;
 import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import com.hp.hpl.jena.ontology.ObjectProperty;
 import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.ontology.OntResource;
 import com.hp.hpl.jena.query.QuerySolution;
 import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
 import com.hp.hpl.jena.rdf.model.Property;
 import com.hp.hpl.jena.rdf.model.RDFNode;
 import com.hp.hpl.jena.rdf.model.ResIterator;
@@ -28,15 +33,15 @@ import com.hp.hpl.jena.vocabulary.RDF;
 
 import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
 import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.AbstractOntModelDecorator;
 import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner;
 import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner.QueryParser;
 
 /**
  * TODO
  */
-public class FauxPropertyDaoJena implements FauxPropertyDao {
+public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao {
 	private static final Log log = LogFactory.getLog(FauxPropertyDaoJena.class);
 
 	// ----------------------------------------------------------------------
@@ -44,41 +49,53 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 	// ----------------------------------------------------------------------
 
 	private static final String APPLICATION_CONTEXT_NS = "http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#";
-	private static final Resource CONFIG_CONTEXT = createResource(APPLICATION_CONTEXT_NS
-			+ "ConfigContext");
-	private static final Property HAS_CONFIGURATION = createProperty(APPLICATION_CONTEXT_NS
-			+ "hasConfiguration");
-	private static final Property CONFIG_CONTEXT_FOR = createProperty(APPLICATION_CONTEXT_NS
-			+ "configContextFor");
-	private static final Property QUALIFIED_BY_RANGE = createProperty(APPLICATION_CONTEXT_NS
-			+ "qualifiedBy");
-	private static final Property QUALIFIED_BY_DOMAIN = createProperty(APPLICATION_CONTEXT_NS
-			+ "qualifiedByDomain");
+	private static OntModel _constModel = ModelFactory
+			.createOntologyModel(OntModelSpec.OWL_DL_MEM);
 
-	private static final Property DISPLAY_NAME = createProperty(APPLICATION_CONTEXT_NS
-			+ "displayName");
-	private static final Property RDFS_LABEL = createProperty(VitroVocabulary.LABEL);
+	private static final Resource CONFIG_CONTEXT = createResource(appContext("ConfigContext"));
+	private static final Resource OBJECT_PROPERTY_DISPLAY_CONFIG = createResource(appContext("ObjectPropertyDisplayConfig"));
+	private static final ObjectProperty HAS_CONFIGURATION = createProperty(appContext("hasConfiguration"));
+	private static final ObjectProperty CONFIG_CONTEXT_FOR = createProperty(appContext("configContextFor"));
 
-	// ----------------------------------------------------------------------
-	// Queries and parsers
-	// ----------------------------------------------------------------------
+	private static final ObjectProperty QUALIFIED_BY_RANGE = createProperty(appContext("qualifiedBy"));
+	private static final ObjectProperty QUALIFIED_BY_DOMAIN = createProperty(appContext("qualifiedByDomain"));
+	private static final ObjectProperty LIST_VIEW_FILE = createProperty(appContext("listViewConfigFile"));
+	private static final ObjectProperty DISPLAY_NAME = createProperty(appContext("displayName"));
+	private static final ObjectProperty PROPERTY_GROUP = createProperty(appContext("propertyGroup"));
+
+	private static final ObjectProperty RDFS_LABEL = createProperty(VitroVocabulary.LABEL);
+
+	private static final String SITE_CONFIG_NAMESPACE = "http://vitro.mannlib.cornell.edu/ns/vitro/siteConfig/";
+
+	private static String appContext(String localName) {
+		return APPLICATION_CONTEXT_NS + localName;
+	}
+
+	private static ObjectProperty createProperty(String uri) {
+		return _constModel.createObjectProperty(uri);
+	}
 
 	// ----------------------------------------------------------------------
 	// The instance
 	// ----------------------------------------------------------------------
 
-	private final LockingOntModelSelector models;
-
 	public FauxPropertyDaoJena(WebappDaoFactoryJena wadf) {
-		this.models = new LockingOntModelSelector(wadf.getOntModelSelector());
+		super(wadf);
+	}
+
+	@Override
+	protected OntModel getOntModel() {
+		return getOntModelSelector().getDisplayModel();
 	}
 
 	@Override
 	public List<FauxProperty> getFauxPropertiesForBaseUri(String uri) {
 		List<FauxProperty> list = new ArrayList<>();
-		try (LockedOntModel displayModel = models.getDisplayModel().read()) {
+
+		getOntModel().enterCriticalSection(Lock.READ);
+		try {
 			if (uri != null) {
-				ResIterator contextResources = displayModel
+				ResIterator contextResources = getOntModel()
 						.listSubjectsWithProperty(CONFIG_CONTEXT_FOR,
 								createResource(uri));
 				for (Resource context : contextResources.toList()) {
@@ -86,7 +103,7 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 						continue;
 					}
 
-					FauxProperty fp = getFauxPropertyFromConfigContextUri(context
+					FauxProperty fp = getFauxPropertyFromContextUri(context
 							.getURI());
 					if (fp == null) {
 						continue;
@@ -95,24 +112,27 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 					list.add(fp);
 				}
 			}
+		} finally {
+			getOntModel().leaveCriticalSection();
 		}
 		return list;
 	}
 
 	@Override
-	public FauxProperty getFauxPropertyFromConfigContextUri(String contextUri) {
-		try (LockedOntModel displayModel = models.getDisplayModel().read()) {
+	public FauxProperty getFauxPropertyFromContextUri(String contextUri) {
+		getOntModel().enterCriticalSection(Lock.READ);
+		try {
 			if (contextUri == null) {
 				return null;
 			}
 
 			Resource context = createResource(contextUri);
-			if (!displayModel.contains(context, RDF.type, CONFIG_CONTEXT)) {
+			if (!getOntModel().contains(context, RDF.type, CONFIG_CONTEXT)) {
 				log.debug("'" + contextUri + "' is not a CONFIG_CONTEXT");
 				return null;
 			}
 
-			String baseUri = getUriValue(displayModel, context,
+			String baseUri = getUriValue(getOntModel(), context,
 					CONFIG_CONTEXT_FOR);
 			if (baseUri == null) {
 				log.debug("'" + contextUri + "' has no value for '"
@@ -120,7 +140,7 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 				return null;
 			}
 
-			String rangeUri = getUriValue(displayModel, context,
+			String rangeUri = getUriValue(getOntModel(), context,
 					QUALIFIED_BY_RANGE);
 			if (rangeUri == null) {
 				log.debug("'" + contextUri + "' has no value for '"
@@ -129,20 +149,23 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 			}
 
 			// domainURI is optional.
-			String domainUri = getUriValue(displayModel, context,
+			String domainUri = getUriValue(getOntModel(), context,
 					QUALIFIED_BY_DOMAIN);
 
 			FauxProperty fp = new FauxProperty(domainUri, baseUri, rangeUri);
 			populateInstance(fp, context);
 			return fp;
+		} finally {
+			getOntModel().leaveCriticalSection();
 		}
 	}
 
 	@Override
 	public FauxProperty getFauxPropertyByUris(String domainUri, String baseUri,
 			String rangeUri) {
-		Set<ConfigContext> contexts = ConfigContext.findByQualifiers(models,
-				domainUri, baseUri, rangeUri);
+		Set<ConfigContext> contexts = ConfigContext.findByQualifiers(
+				getOntModelSelector().getDisplayModel(), domainUri, baseUri,
+				rangeUri);
 		for (ConfigContext context : contexts) {
 			FauxProperty fp = new FauxProperty(domainUri, baseUri, rangeUri);
 			populateInstance(fp, createResource(context.getContextUri()));
@@ -153,19 +176,192 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 		return null;
 	}
 
+	@Override
+	public void insertFauxProperty(FauxProperty fp) {
+		if ((fp.getContextUri() != null) || (fp.getConfigUri() == null)) {
+			throw new IllegalStateException(
+					"ContextUri and ConfigUri must be null on insert: contextUri="
+							+ fp.getContextUri() + ", configUri="
+							+ fp.getConfigUri());
+		}
+
+		Set<ConfigContext> existingcontexts = ConfigContext.findByQualifiers(
+				getOntModelSelector().getDisplayModel(), fp.getDomainURI(),
+				fp.getBaseURI(), fp.getRangeURI());
+		if (!existingcontexts.isEmpty()) {
+			throw new IllegalStateException(
+					"FauxProperty already exists with domainUri="
+							+ fp.getDomainURI() + ", baseUri="
+							+ fp.getBaseURI() + ", rangeUri="
+							+ fp.getRangeURI());
+		}
+
+		try {
+			fp.setContextUri(getUnusedURI());
+			fp.setConfigUri(getUnusedURI());
+		} catch (InsertException e) {
+			throw new RuntimeException(e);
+		}
+
+		getOntModel().enterCriticalSection(Lock.WRITE);
+		try {
+			OntResource context = getOntModel().createOntResource(
+					fp.getContextUri());
+			addPropertyResourceValue(context, RDF.type, CONFIG_CONTEXT);
+			addPropertyResourceURIValue(context, HAS_CONFIGURATION,
+					fp.getConfigUri());
+			addPropertyResourceURIValue(context, CONFIG_CONTEXT_FOR,
+					fp.getBaseURI());
+			addPropertyResourceURIValue(context, QUALIFIED_BY_RANGE,
+					fp.getRangeURI());
+			addPropertyResourceURIValue(context, QUALIFIED_BY_DOMAIN,
+					fp.getDomainURI());
+
+			OntResource config = getOntModel().createOntResource(
+					fp.getConfigUri());
+			addPropertyResourceValue(config, RDF.type,
+					OBJECT_PROPERTY_DISPLAY_CONFIG);
+			addPropertyResourceURIValue(config, PROPERTY_GROUP,
+					fp.getGroupURI());
+			addPropertyStringValue(config, DISPLAY_NAME, fp.getDisplayName(),
+					getOntModel());
+			addPropertyStringValue(config, PUBLIC_DESCRIPTION_ANNOT,
+					fp.getPublicDescription(), getOntModel());
+			addPropertyIntValue(config, DISPLAY_RANK_ANNOT,
+					fp.getDisplayTier(), getOntModel());
+			addPropertyIntValue(config, DISPLAY_LIMIT, fp.getDisplayLimit(),
+					getOntModel());
+			addPropertyBooleanValue(config, PROPERTY_COLLATEBYSUBCLASSANNOT,
+					fp.isCollateBySubclass(), getOntModel());
+			addPropertyBooleanValue(config, PROPERTY_SELECTFROMEXISTINGANNOT,
+					fp.isSelectFromExisting(), getOntModel());
+			addPropertyBooleanValue(config, PROPERTY_OFFERCREATENEWOPTIONANNOT,
+					fp.isOfferCreateNewOption(), getOntModel());
+			addPropertyStringValue(config, PROPERTY_CUSTOMENTRYFORMANNOT,
+					fp.getCustomEntryForm(), getOntModel());
+			addPropertyStringValue(config, LIST_VIEW_FILE,
+					fp.getCustomListView(), getOntModel());
+		} finally {
+			getOntModel().leaveCriticalSection();
+		}
+	}
+
+	@Override
+	public void updateFauxProperty(FauxProperty fp) {
+		getOntModel().enterCriticalSection(Lock.READ);
+		try {
+			if (fp.getContextUri() == null) {
+				throw new IllegalStateException("ContextURI may not be null: "
+						+ fp);
+			}
+			Resource context = createResource(fp.getContextUri());
+
+			if (fp.getConfigUri() == null) {
+				throw new IllegalStateException("ConfigURI may not be null: "
+						+ fp);
+			}
+			Resource config = createResource(fp.getConfigUri());
+
+			if (!getOntModel().contains(context, RDF.type, CONFIG_CONTEXT)) {
+				throw new IllegalStateException("'" + context + "' is not a '"
+						+ CONFIG_CONTEXT + "'");
+			}
+			if (!getOntModel().contains(config, RDF.type,
+					OBJECT_PROPERTY_DISPLAY_CONFIG)) {
+				throw new IllegalStateException("'" + config + "' is not a '"
+						+ OBJECT_PROPERTY_DISPLAY_CONFIG + "'");
+			}
+			if (!getOntModel().contains(context, HAS_CONFIGURATION, config)) {
+				throw new IllegalStateException("'" + config
+						+ "' is not a configuration for '" + context + "'");
+			}
+
+		} finally {
+			getOntModel().leaveCriticalSection();
+		}
+
+		getOntModel().enterCriticalSection(Lock.WRITE);
+		try {
+			OntResource context = getOntModel().createOntResource(
+					fp.getContextUri());
+			updatePropertyResourceURIValue(context, QUALIFIED_BY_RANGE,
+					fp.getRangeURI());
+			updatePropertyResourceURIValue(context, QUALIFIED_BY_DOMAIN,
+					fp.getDomainURI());
+
+			OntResource config = getOntModel().createOntResource(
+					fp.getConfigUri());
+			updatePropertyResourceURIValue(config, PROPERTY_GROUP,
+					fp.getGroupURI());
+			updatePropertyStringValue(config, DISPLAY_NAME, fp.getDisplayName(),
+					getOntModel());
+			updatePropertyStringValue(config, PUBLIC_DESCRIPTION_ANNOT,
+					fp.getPublicDescription(), getOntModel());
+			updatePropertyIntValue(config, DISPLAY_RANK_ANNOT,
+					fp.getDisplayTier(), getOntModel());
+			updatePropertyIntValue(config, DISPLAY_LIMIT, fp.getDisplayLimit(),
+					getOntModel());
+			updatePropertyBooleanValue(config, PROPERTY_COLLATEBYSUBCLASSANNOT,
+					fp.isCollateBySubclass(), getOntModel(), true);
+			updatePropertyBooleanValue(config, PROPERTY_SELECTFROMEXISTINGANNOT,
+					fp.isSelectFromExisting(), getOntModel(), true);
+			updatePropertyBooleanValue(config, PROPERTY_OFFERCREATENEWOPTIONANNOT,
+					fp.isOfferCreateNewOption(), getOntModel(), true);
+			updatePropertyStringValue(config, PROPERTY_CUSTOMENTRYFORMANNOT,
+					fp.getCustomEntryForm(), getOntModel());
+			updatePropertyStringValue(config, LIST_VIEW_FILE,
+					fp.getCustomListView(), getOntModel());
+		} finally {
+			getOntModel().leaveCriticalSection();
+		}
+	}
+
 	@Override
 	public void deleteFauxProperty(FauxProperty fp) {
-		Set<ConfigContext> contexts = ConfigContext.findByQualifiers(models,
-				fp.getDomainURI(), fp.getURI(), fp.getRangeURI());
-		try (LockedOntModel displayModel = models.getDisplayModel().write()) {
+		Set<ConfigContext> contexts = ConfigContext.findByQualifiers(
+				getOntModelSelector().getDisplayModel(), fp.getDomainURI(),
+				fp.getURI(), fp.getRangeURI());
+		getOntModel().enterCriticalSection(Lock.READ);
+		try {
 			for (ConfigContext context : contexts) {
 				Resource configResource = createResource(context.getConfigUri());
-				displayModel.removeAll(configResource, null, null);
-				displayModel.removeAll(null, null, configResource);
-				Resource contextResource = createResource(context.getContextUri());
-				displayModel.removeAll(contextResource, null, null);
-				displayModel.removeAll(null, null, contextResource);
+				getOntModel().removeAll(configResource, null, null);
+				getOntModel().removeAll(null, null, configResource);
+				Resource contextResource = createResource(context
+						.getContextUri());
+				getOntModel().removeAll(contextResource, null, null);
+				getOntModel().removeAll(null, null, contextResource);
 			}
+		} finally {
+			getOntModel().leaveCriticalSection();
+		}
+	}
+
+	private String getUnusedURI() throws InsertException {
+		String errMsg = null;
+
+		String namespace = SITE_CONFIG_NAMESPACE;
+		String uri = null;
+
+		Random random = new Random(System.currentTimeMillis());
+		for (int attempts = 0; attempts < 30; attempts++) {
+			int upperBound = (int) Math.pow(2, attempts + 13);
+			uri = namespace + ("fp" + random.nextInt(upperBound));
+			if (!isUriUsed(uri)) {
+				return uri;
+			}
+		}
+
+		throw new InsertException("Could not create URI for individual: "
+				+ errMsg);
+	}
+
+	private boolean isUriUsed(String uri) {
+		getOntModel().enterCriticalSection(Lock.READ);
+		try {
+			return (getOntModel().getOntResource(uri) != null);
+		} finally {
+			getOntModel().leaveCriticalSection();
 		}
 	}
 
@@ -174,49 +370,94 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 	 * ObjectPropertyDisplayConfig.
 	 */
 	private void populateInstance(FauxProperty fp, Resource context) {
-		// Range label and domain label.
-		try (LockedOntModel tboxModel = models.getTBoxModel().read()) {
-			String rangeLabel = getStringValue(tboxModel,
-					createProperty(fp.getRangeURI()), RDFS_LABEL);
-			if (rangeLabel != null) {
-				fp.setRangeLabel(rangeLabel);
-			}
+		populateLabelsFromTBox(fp);
+		populateFieldsFromDisplayModel(fp, context);
+	}
 
-			String domainLabel = getStringValue(tboxModel,
-					createProperty(fp.getDomainURI()), RDFS_LABEL);
-			if (domainLabel != null) {
-				fp.setDomainLabel(domainLabel);
-			}
+	private void populateLabelsFromTBox(FauxProperty fp) {
+		fp.setRangeLabel(findLabelForClass(fp.getRangeURI()));
+		fp.setDomainLabel(findLabelForClass(fp.getDomainURI()));
+	}
 
+	private String findLabelForClass(String classUri) {
+		if (classUri == null) {
+			return null;
+		} else {
+			OntModel tboxModel = getOntModelSelector().getTBoxModel();
+			tboxModel.enterCriticalSection(Lock.READ);
+			try {
+				return getStringValue(tboxModel, createResource(classUri),
+						RDFS_LABEL);
+			} finally {
+				tboxModel.leaveCriticalSection();
+			}
 		}
+	}
 
-		// Display name.
-		try (LockedOntModel displayModel = models.getDisplayModel().read()) {
-			String configUri = getUriValue(displayModel, context,
+	private void populateFieldsFromDisplayModel(FauxProperty fp,
+			Resource context) {
+		OntResource config = locateConfigurationFromContext(context);
+		if (config != null) {
+			getOntModel().enterCriticalSection(Lock.READ);
+			try {
+				fp.setDisplayName(getPropertyStringValue(config, DISPLAY_NAME));
+				fp.setPublicDescription(getPropertyStringValue(config,
+						PUBLIC_DESCRIPTION_ANNOT));
+				fp.setGroupURI(getSingleResourceURIValue(config, PROPERTY_GROUP));
+				fp.setCustomListView(getPropertyStringValue(config,
+						LIST_VIEW_FILE));
+				fp.setDisplayTier(getPropertyIntValue(config,
+						DISPLAY_RANK_ANNOT));
+				fp.setDisplayLimit(getPropertyIntValue(config, DISPLAY_LIMIT));
+				fp.setCollateBySubclass(getPropertyBooleanValue(config,
+						PROPERTY_COLLATEBYSUBCLASSANNOT));
+				fp.setSelectFromExisting(getPropertyBooleanValue(config,
+						PROPERTY_SELECTFROMEXISTINGANNOT));
+				fp.setOfferCreateNewOption(getPropertyBooleanValue(config,
+						PROPERTY_OFFERCREATENEWOPTIONANNOT));
+				fp.setCustomEntryForm(getPropertyStringValue(config,
+						PROPERTY_CUSTOMENTRYFORMANNOT));
+			} finally {
+				getOntModel().leaveCriticalSection();
+			}
+		}
+	}
+
+	private OntResource locateConfigurationFromContext(Resource context) {
+		getOntModel().enterCriticalSection(Lock.READ);
+		try {
+			String configUri = getUriValue(getOntModel(), context,
 					HAS_CONFIGURATION);
 			if (configUri == null) {
-				return;
-			}
-			Resource config = createResource(configUri);
-
-			String displayName = getStringValue(displayModel, config,
-					DISPLAY_NAME);
-			if (displayName != null) {
-				fp.setPickListName(displayName);
+				return null;
+			} else {
+				return getOntModel().createOntResource(configUri);
 			}
+		} finally {
+			getOntModel().leaveCriticalSection();
 		}
+	}
 
-		// TODO pull all sorts of things from the configuration.
+	private String getSingleResourceURIValue(OntResource config,
+			ObjectProperty prop) {
+		Collection<String> values = getPropertyResourceURIValues(config, prop);
+		if (values.isEmpty()) {
+			return null;
+		} else {
+			return values.iterator().next();
+		}
 	}
 
 	/**
 	 * Returns a single URI that is the object of this subject and property.
 	 * Returns null if no valid statement is found.
+	 * 
+	 * The model should already be locked.
 	 */
-	private String getUriValue(LockedOntModel displayModel, Resource subject,
+	private String getUriValue(OntModel model, Resource subject,
 			Property property) {
-		List<RDFNode> nodeList = displayModel.listObjectsOfProperty(subject,
-				property).toList();
+		List<RDFNode> nodeList = model.listObjectsOfProperty(subject, property)
+				.toList();
 		if (nodeList.isEmpty()) {
 			log.warn("'" + subject.getURI() + "' has no value for '"
 					+ property.getURI() + "'.");
@@ -239,11 +480,13 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 	/**
 	 * Returns a single String value that is the object of this subject and
 	 * property. Returns null if no valid statement is found.
+	 * 
+	 * The model should already be locked.
 	 */
-	private String getStringValue(LockedOntModel displayModel,
-			Resource subject, Property property) {
-		List<RDFNode> nodeList = displayModel.listObjectsOfProperty(subject,
-				property).toList();
+	private String getStringValue(OntModel model, Resource subject,
+			Property property) {
+		List<RDFNode> nodeList = model.listObjectsOfProperty(subject, property)
+				.toList();
 		if (nodeList.isEmpty()) {
 			log.warn("'" + subject.getURI() + "' has no value for '"
 					+ property.getURI() + "'.");
@@ -329,10 +572,10 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 
 	private static class ConfigContext {
 		public static Set<ConfigContext> findByQualifiers(
-				LockingOntModelSelector models, String domainUri,
-				String baseUri, String rangeUri) {
-			try (LockedOntModel displayModel = models.getDisplayModel().read()) {
-
+				OntModel displayModel, String domainUri, String baseUri,
+				String rangeUri) {
+			displayModel.enterCriticalSection(Lock.READ);
+			try {
 				String queryString;
 				if (domainUri == null) {
 					queryString = bindValues(
@@ -351,8 +594,9 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 						domainUri, baseUri, rangeUri);
 				return new SparqlQueryRunner(displayModel).executeSelect(
 						parser, queryString);
+			} finally {
+				displayModel.leaveCriticalSection();
 			}
-
 		}
 
 		private final String contextUri;
@@ -392,59 +636,4 @@ public class FauxPropertyDaoJena implements FauxPropertyDao {
 
 	}
 
-	// ----------------------------------------------------------------------
-	// Helper classes. Are they worth it, just to use try-with-resources?
-	// ----------------------------------------------------------------------
-
-	private static class LockingOntModelSelector {
-		private final OntModelSelector oms;
-
-		public LockingOntModelSelector(OntModelSelector oms) {
-			this.oms = oms;
-		}
-
-		public LockableOntModel getDisplayModel() {
-			return new LockableOntModel(oms.getDisplayModel());
-		}
-
-		public LockableOntModel getTBoxModel() {
-			return new LockableOntModel(oms.getTBoxModel());
-		}
-	}
-
-	private static class LockableOntModel {
-		private final OntModel ontModel;
-
-		public LockableOntModel(OntModel ontModel) {
-			this.ontModel = ontModel;
-		}
-
-		public LockedOntModel read() {
-			ontModel.enterCriticalSection(Lock.READ);
-			return new LockedOntModel(ontModel);
-		}
-
-		public LockedOntModel write() {
-			ontModel.enterCriticalSection(Lock.WRITE);
-			return new LockedOntModel(ontModel);
-		}
-	}
-
-	private static class LockedOntModel extends AbstractOntModelDecorator
-			implements AutoCloseable {
-
-		protected LockedOntModel(OntModel m) {
-			super(m);
-		}
-
-		/**
-		 * Just unlocks the model. Doesn't actually close it, because we may
-		 * want to use it again.
-		 */
-		@Override
-		public void close() {
-			super.leaveCriticalSection();
-		}
-	}
-
 }
diff --git a/webapp/web/templates/edit/specific/fauxProperty_retry.jsp b/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
index 45694b0cc..7110daddd 100644
--- a/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
+++ b/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
@@ -3,14 +3,165 @@
 <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
+<tr class="editformcell">
+    <td valign="top" colspan="2">
+        <b>Base property</b><br/>
+        <input type="text" class="fullWidthInput" name="Base property" value="<form:value name="BaseUri"/>" disabled="disabled" /></br>
+        <i>a specification of this property</i></br>
+    </td>
+    <td valign="top" colspan="2">
+	    <b>Property group</b><br/>
+	    <select name="GroupURI"><form:option name="GroupURI"/></select><br/>
+        <i>for grouping properties on individual pages</i><br/>
+	</td>
+</tr>
+
+<tr class="editformcell">
+    <td style="vertical-align:top;" valign="top" colspan="2">
+        <b>Label for public display</b><br/><br/>
+        <input type="text" class="fullWidthInput" name="DisplayName" value="<form:value name="DisplayName"/>" maxlength="80" />
+        <c:set var="DisplayNameError"><form:error name="DisplayName"/></c:set>
+        <c:if test="${!empty DisplayNameError}">
+            <span class="notice"><c:out value="${DisplayNameError}"/></span>
+        </c:if>
+    </td>
+</tr>
+
 <tr><td colspan="5"><hr class="formDivider"/></td></tr>
+
 <tr class="editformcell">
     <td valign="top" colspan="2">
         <b>Domain class</b><br />
-        <select name="DomainVClassURI"><form:option name="DomainVClassURI"/></select>
+        <select name="DomainURI"><form:option name="DomainURI"/></select>
     </td>
     <td valign="top" colspan="2">
         <b>Range class</b><br />
-        <select name="RangeVClassURI" ><form:option name="RangeVClassURI"/></select>
+        <select name="RangeURI" ><form:option name="RangeURI"/></select>
+        <c:set var="RangeURIError"><form:error name="RangeURI"/></c:set>
+        <c:if test="${!empty RangeURIError}">
+            <span class="notice"><c:out value="${RangeURIError}"/></span>
+        </c:if>
     </td>
 </tr>
+
+<tr><td colspan="5"><hr class="formDivider"/></td></tr>
+
+<tr class="editformcell">
+	<td valign="top" colspan="5">
+		<b>Public Description</b> for front-end users, as it will appear on editing forms<br/>
+	    <textarea class="matchingInput" name="PublicDescription"><form:value name="PublicDescription"/></textarea>
+        <c:set var="PublicDescriptionError"><form:error name="PublicDescription"/></c:set>
+        <c:if test="${!empty PublicDescriptionError}">
+            <span class="notice"><c:out value="${PublicDescriptionError}"/></span>
+        </c:if>
+	</td>
+</tr>
+
+<tr><td colspan="5"><hr class="formDivider"/></td></tr>
+
+<tr class="editformcell">
+    <td valign="top" colspan="2">
+        <b>Display level</b><br />
+        <select name="HiddenFromDisplayBelowRoleLevelUsingRoleUri">
+            <form:option name="HiddenFromDisplayBelowRoleLevelUsingRoleUri"/>
+        </select>
+    </td>
+    <td valign="top" colspan="2">
+        <b>Update level</b><br/>
+        <select name="ProhibitedFromUpdateBelowRoleLevelUsingRoleUri">
+            <form:option name="ProhibitedFromUpdateBelowRoleLevelUsingRoleUri"/>
+        </select>
+    </td>
+</tr>
+
+<tr class="editformcell">
+    <td valign="top" colspan="2">
+        <b>Publish level</b><br />
+        <select name="HiddenFromPublishBelowRoleLevelUsingRoleUri">
+            <form:option name="HiddenFromPublishBelowRoleLevelUsingRoleUri"/>
+        </select>
+    </td>
+</tr>
+
+<tr><td colspan="5"><hr class="formDivider"/></td></tr>
+
+<tr class="editformcell">
+    <td valign="top" colspan="1">
+        <b>Display tier</b> for this property<br/>
+        <input type="text" class="shortInput" name="DisplayTier" value="<form:value name="DisplayTier"/>" /><br/>
+            <i><b>lower</b> numbers display first</i><br/>
+        <c:set var="DisplayTierError"><form:error name="DisplayTier"/></c:set>
+        <c:if test="${!empty DisplayTierError}">
+            <span class="notice"><c:out value="${DisplayTierError}"/></span>
+        </c:if>
+    </td>
+	<td valign="top" colspan="2">
+		<b>Display limit</b> before &quot;more ...&quot; button is displayed<br/>
+		<input type="text" class="shortInput" name="DisplayLimit" value="<form:value name="DisplayLimit"/>"/>
+        <c:set var="DisplayLimitError"><form:error name="DisplayLimit"/></c:set>
+        <c:if test="${!empty DisplayLimitError}">
+            <span class="notice"><c:out value="${DisplayLimitError}"/></span>
+        </c:if>
+	</td>
+    <td valign="top" colspan="2">
+        When displaying related individuals from different classes,<br/>
+        <c:choose>
+            <c:when test="${collateBySubclass}">
+                <input name="CollateBySubclass" type="checkbox" value="TRUE" checked="checked"/>collate by subclass
+            </c:when>
+            <c:otherwise>
+                <input name="CollateBySubclass" type="checkbox" value="TRUE"/>collate by subclass
+            </c:otherwise>            
+        </c:choose>            
+    </td>
+</tr>
+
+<tr><td colspan="5"><hr class="formDivider"/></td></tr>
+
+<tr class="editformcell">
+    <td valign="top" colspan="2">
+    	Select related individuals from existing choices?<br/>
+       	<c:choose>
+            <c:when test="${selectFromExisting}">
+    	       	<input name="SelectFromExisting" type="checkbox" value="TRUE" checked="checked"/>provide selection
+            </c:when>
+            <c:otherwise>
+               	<input name="SelectFromExisting" type="checkbox" value="TRUE"/>provide selection
+            </c:otherwise>
+        </c:choose>
+    </td>
+    <td valign="top" colspan="1">
+    	Allow creating new related individuals?<br/>
+       	<c:choose>
+            <c:when test="${offerCreateNewOption}">
+    	       	<input name="OfferCreateNewOption" type="checkbox" value="TRUE" checked="checked"/>offer create option
+            </c:when>
+            <c:otherwise>
+               	<input name="OfferCreateNewOption" type="checkbox" value="TRUE"/>offer create option
+            </c:otherwise>
+        </c:choose>
+    </td>
+</tr>
+
+<tr><td colspan="5"><hr class="formDivider"/></td></tr>
+
+<tr class="editformcell">
+    <td valign="top" colspan="2">
+        <b>Custom entry form</b><br/>
+        <input type="text" class="fullWidthInput" name="CustomEntryForm" value="<form:value name="CustomEntryForm"/>" />
+            <c:set var="CustomEntryFormError"><form:error name="CustomEntryForm"/></c:set>
+            <c:if test="${!empty CustomEntryFormError}">
+                <span class="notice"><c:out value="${CustomEntryFormError}"/></span>
+            </c:if>
+    </td>
+    <td valign="top" colspan="2">
+        <b>Custom list view</b><br/>
+        <input type="text" class="fullWidthInput" name="CustomListView" value="<form:value name="CustomListView"/>" />
+            <c:set var="CustomListViewError"><form:error name="CustomListView"/></c:set>
+            <c:if test="${!empty CustomListViewError}">
+                <span class="notice"><c:out value="${CustomListViewError}"/></span>
+            </c:if>
+    </td>
+</tr>
+
+<tr><td colspan="5"><hr class="formDivider"/></td></tr>

From ec6f166f541064aabe4ac822660c7b606ef01033 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Wed, 5 Nov 2014 12:59:48 -0500
Subject: [PATCH 09/30] Cleanup. Use the locking model classes.

---
 .../webapp/dao/jena/FauxPropertyDaoJena.java  | 332 +++++++-----------
 .../ConfigurationBeanLoader.java              |   2 +-
 .../configuration/ConfigurationRdfParser.java |   8 +-
 .../vitro/webapp/utils/jena/Critical.java     | 127 +++++--
 4 files changed, 235 insertions(+), 234 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
index c59fbc729..fb90a2471 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
@@ -24,11 +24,8 @@ import com.hp.hpl.jena.ontology.OntResource;
 import com.hp.hpl.jena.query.QuerySolution;
 import com.hp.hpl.jena.query.ResultSet;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
 import com.hp.hpl.jena.rdf.model.ResIterator;
 import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.shared.Lock;
 import com.hp.hpl.jena.vocabulary.RDF;
 
 import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
@@ -37,6 +34,9 @@ import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner;
 import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner.QueryParser;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.Critical.LockableOntModel;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.Critical.LockedOntModel;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.Critical.LockingOntModelSelector;
 
 /**
  * TODO
@@ -79,84 +79,85 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 	// The instance
 	// ----------------------------------------------------------------------
 
+	private final LockingOntModelSelector models;
+
 	public FauxPropertyDaoJena(WebappDaoFactoryJena wadf) {
 		super(wadf);
-	}
-
-	@Override
-	protected OntModel getOntModel() {
-		return getOntModelSelector().getDisplayModel();
+		this.models = new LockingOntModelSelector(wadf.getOntModelSelector());
 	}
 
 	@Override
 	public List<FauxProperty> getFauxPropertiesForBaseUri(String uri) {
-		List<FauxProperty> list = new ArrayList<>();
+		try (LockedOntModel displayModel = models.getDisplayModel().read()) {
+			if (uri == null) {
+				return Collections.emptyList();
+			}
 
-		getOntModel().enterCriticalSection(Lock.READ);
-		try {
-			if (uri != null) {
-				ResIterator contextResources = getOntModel()
-						.listSubjectsWithProperty(CONFIG_CONTEXT_FOR,
-								createResource(uri));
-				for (Resource context : contextResources.toList()) {
-					if (!context.isURIResource()) {
-						continue;
-					}
-
-					FauxProperty fp = getFauxPropertyFromContextUri(context
-							.getURI());
-					if (fp == null) {
-						continue;
-					}
-
-					list.add(fp);
+			List<String> contextUris = new ArrayList<>();
+			ResIterator contextResources = displayModel
+					.listSubjectsWithProperty(CONFIG_CONTEXT_FOR,
+							createResource(uri));
+			for (Resource context : contextResources.toList()) {
+				if (context.isURIResource()) {
+					contextUris.add(context.asResource().getURI());
 				}
 			}
-		} finally {
-			getOntModel().leaveCriticalSection();
+
+			List<FauxProperty> fpList = new ArrayList<>();
+			for (String contextUri : contextUris) {
+				FauxProperty fp = getFauxPropertyFromContextUri(contextUri);
+				if (fp != null) {
+					fpList.add(fp);
+				}
+			}
+			return fpList;
 		}
-		return list;
 	}
 
+	/**
+	 * Returns null if contextUri does not represent a valid CONFIG_CONTEXT.
+	 */
 	@Override
 	public FauxProperty getFauxPropertyFromContextUri(String contextUri) {
-		getOntModel().enterCriticalSection(Lock.READ);
-		try {
+		try (LockedOntModel displayModel = models.getDisplayModel().read()) {
 			if (contextUri == null) {
 				return null;
 			}
 
-			Resource context = createResource(contextUri);
-			if (!getOntModel().contains(context, RDF.type, CONFIG_CONTEXT)) {
+			OntResource context = displayModel.createOntResource(contextUri);
+			if (!displayModel.contains(context, RDF.type, CONFIG_CONTEXT)) {
 				log.debug("'" + contextUri + "' is not a CONFIG_CONTEXT");
 				return null;
 			}
 
-			String baseUri = getUriValue(getOntModel(), context,
+			Collection<String> baseUris = getPropertyResourceURIValues(context,
 					CONFIG_CONTEXT_FOR);
-			if (baseUri == null) {
+			if (baseUris.isEmpty()) {
 				log.debug("'" + contextUri + "' has no value for '"
 						+ CONFIG_CONTEXT_FOR + "'");
 				return null;
 			}
+			String baseUri = baseUris.iterator().next();
 
-			String rangeUri = getUriValue(getOntModel(), context,
-					QUALIFIED_BY_RANGE);
-			if (rangeUri == null) {
+			Collection<String> rangeUris = getPropertyResourceURIValues(
+					context, QUALIFIED_BY_RANGE);
+			if (rangeUris.isEmpty()) {
 				log.debug("'" + contextUri + "' has no value for '"
 						+ QUALIFIED_BY_RANGE + "'");
 				return null;
 			}
+			String rangeUri = rangeUris.iterator().next();
 
 			// domainURI is optional.
-			String domainUri = getUriValue(getOntModel(), context,
-					QUALIFIED_BY_DOMAIN);
+			Collection<String> domainUris = getPropertyResourceURIValues(
+					context, QUALIFIED_BY_DOMAIN);
+			String domainUri = domainUris.isEmpty() ? null : domainUris
+					.iterator().next();
 
 			FauxProperty fp = new FauxProperty(domainUri, baseUri, rangeUri);
-			populateInstance(fp, context);
+			fp.setContextUri(contextUri);
+			populateInstance(fp);
 			return fp;
-		} finally {
-			getOntModel().leaveCriticalSection();
 		}
 	}
 
@@ -164,36 +165,32 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 	public FauxProperty getFauxPropertyByUris(String domainUri, String baseUri,
 			String rangeUri) {
 		Set<ConfigContext> contexts = ConfigContext.findByQualifiers(
-				getOntModelSelector().getDisplayModel(), domainUri, baseUri,
-				rangeUri);
-		for (ConfigContext context : contexts) {
+				models.getDisplayModel(), domainUri, baseUri, rangeUri);
+		if (contexts.isEmpty()) {
+			log.debug("Can't find a FauxProperty for '" + domainUri + "', '"
+					+ baseUri + "', '" + rangeUri + "'");
+			return null;
+		} else {
 			FauxProperty fp = new FauxProperty(domainUri, baseUri, rangeUri);
-			populateInstance(fp, createResource(context.getContextUri()));
+			fp.setContextUri(contexts.iterator().next().getContextUri());
+			populateInstance(fp);
 			return fp;
 		}
-		log.debug("Can't find a FauxProperty for '" + domainUri + "', '"
-				+ baseUri + "', '" + rangeUri + "'");
-		return null;
 	}
 
 	@Override
 	public void insertFauxProperty(FauxProperty fp) {
 		if ((fp.getContextUri() != null) || (fp.getConfigUri() == null)) {
 			throw new IllegalStateException(
-					"ContextUri and ConfigUri must be null on insert: contextUri="
-							+ fp.getContextUri() + ", configUri="
-							+ fp.getConfigUri());
+					"ContextUri and ConfigUri must be null on insert: " + fp);
 		}
 
 		Set<ConfigContext> existingcontexts = ConfigContext.findByQualifiers(
-				getOntModelSelector().getDisplayModel(), fp.getDomainURI(),
-				fp.getBaseURI(), fp.getRangeURI());
+				models.getDisplayModel(), fp.getDomainURI(), fp.getBaseURI(),
+				fp.getRangeURI());
 		if (!existingcontexts.isEmpty()) {
 			throw new IllegalStateException(
-					"FauxProperty already exists with domainUri="
-							+ fp.getDomainURI() + ", baseUri="
-							+ fp.getBaseURI() + ", rangeUri="
-							+ fp.getRangeURI());
+					"FauxProperty with these qualifiers already exists: " + fp);
 		}
 
 		try {
@@ -203,10 +200,9 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 			throw new RuntimeException(e);
 		}
 
-		getOntModel().enterCriticalSection(Lock.WRITE);
-		try {
-			OntResource context = getOntModel().createOntResource(
-					fp.getContextUri());
+		try (LockedOntModel displayModel = models.getDisplayModel().write()) {
+			OntResource context = displayModel.createOntResource(fp
+					.getContextUri());
 			addPropertyResourceValue(context, RDF.type, CONFIG_CONTEXT);
 			addPropertyResourceURIValue(context, HAS_CONFIGURATION,
 					fp.getConfigUri());
@@ -217,39 +213,36 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 			addPropertyResourceURIValue(context, QUALIFIED_BY_DOMAIN,
 					fp.getDomainURI());
 
-			OntResource config = getOntModel().createOntResource(
-					fp.getConfigUri());
+			OntResource config = displayModel.createOntResource(fp
+					.getConfigUri());
 			addPropertyResourceValue(config, RDF.type,
 					OBJECT_PROPERTY_DISPLAY_CONFIG);
 			addPropertyResourceURIValue(config, PROPERTY_GROUP,
 					fp.getGroupURI());
 			addPropertyStringValue(config, DISPLAY_NAME, fp.getDisplayName(),
-					getOntModel());
+					displayModel);
 			addPropertyStringValue(config, PUBLIC_DESCRIPTION_ANNOT,
-					fp.getPublicDescription(), getOntModel());
+					fp.getPublicDescription(), displayModel);
 			addPropertyIntValue(config, DISPLAY_RANK_ANNOT,
-					fp.getDisplayTier(), getOntModel());
+					fp.getDisplayTier(), displayModel);
 			addPropertyIntValue(config, DISPLAY_LIMIT, fp.getDisplayLimit(),
-					getOntModel());
+					displayModel);
 			addPropertyBooleanValue(config, PROPERTY_COLLATEBYSUBCLASSANNOT,
-					fp.isCollateBySubclass(), getOntModel());
+					fp.isCollateBySubclass(), displayModel);
 			addPropertyBooleanValue(config, PROPERTY_SELECTFROMEXISTINGANNOT,
-					fp.isSelectFromExisting(), getOntModel());
+					fp.isSelectFromExisting(), displayModel);
 			addPropertyBooleanValue(config, PROPERTY_OFFERCREATENEWOPTIONANNOT,
-					fp.isOfferCreateNewOption(), getOntModel());
+					fp.isOfferCreateNewOption(), displayModel);
 			addPropertyStringValue(config, PROPERTY_CUSTOMENTRYFORMANNOT,
-					fp.getCustomEntryForm(), getOntModel());
+					fp.getCustomEntryForm(), displayModel);
 			addPropertyStringValue(config, LIST_VIEW_FILE,
-					fp.getCustomListView(), getOntModel());
-		} finally {
-			getOntModel().leaveCriticalSection();
+					fp.getCustomListView(), displayModel);
 		}
 	}
 
 	@Override
 	public void updateFauxProperty(FauxProperty fp) {
-		getOntModel().enterCriticalSection(Lock.READ);
-		try {
+		try (LockedOntModel displayModel = models.getDisplayModel().read()) {
 			if (fp.getContextUri() == null) {
 				throw new IllegalStateException("ContextURI may not be null: "
 						+ fp);
@@ -262,78 +255,71 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 			}
 			Resource config = createResource(fp.getConfigUri());
 
-			if (!getOntModel().contains(context, RDF.type, CONFIG_CONTEXT)) {
+			if (!displayModel.contains(context, RDF.type, CONFIG_CONTEXT)) {
 				throw new IllegalStateException("'" + context + "' is not a '"
 						+ CONFIG_CONTEXT + "'");
 			}
-			if (!getOntModel().contains(config, RDF.type,
+			if (!displayModel.contains(config, RDF.type,
 					OBJECT_PROPERTY_DISPLAY_CONFIG)) {
 				throw new IllegalStateException("'" + config + "' is not a '"
 						+ OBJECT_PROPERTY_DISPLAY_CONFIG + "'");
 			}
-			if (!getOntModel().contains(context, HAS_CONFIGURATION, config)) {
+			if (!displayModel.contains(context, HAS_CONFIGURATION, config)) {
 				throw new IllegalStateException("'" + config
 						+ "' is not a configuration for '" + context + "'");
 			}
-
-		} finally {
-			getOntModel().leaveCriticalSection();
 		}
 
-		getOntModel().enterCriticalSection(Lock.WRITE);
-		try {
-			OntResource context = getOntModel().createOntResource(
-					fp.getContextUri());
+		try (LockedOntModel displayModel = models.getDisplayModel().write()) {
+			OntResource context = displayModel.createOntResource(fp
+					.getContextUri());
 			updatePropertyResourceURIValue(context, QUALIFIED_BY_RANGE,
 					fp.getRangeURI());
 			updatePropertyResourceURIValue(context, QUALIFIED_BY_DOMAIN,
 					fp.getDomainURI());
 
-			OntResource config = getOntModel().createOntResource(
-					fp.getConfigUri());
+			OntResource config = displayModel.createOntResource(fp
+					.getConfigUri());
 			updatePropertyResourceURIValue(config, PROPERTY_GROUP,
 					fp.getGroupURI());
-			updatePropertyStringValue(config, DISPLAY_NAME, fp.getDisplayName(),
-					getOntModel());
+			updatePropertyStringValue(config, DISPLAY_NAME,
+					fp.getDisplayName(), displayModel);
 			updatePropertyStringValue(config, PUBLIC_DESCRIPTION_ANNOT,
-					fp.getPublicDescription(), getOntModel());
+					fp.getPublicDescription(), displayModel);
 			updatePropertyIntValue(config, DISPLAY_RANK_ANNOT,
-					fp.getDisplayTier(), getOntModel());
+					fp.getDisplayTier(), displayModel);
 			updatePropertyIntValue(config, DISPLAY_LIMIT, fp.getDisplayLimit(),
-					getOntModel());
+					displayModel);
 			updatePropertyBooleanValue(config, PROPERTY_COLLATEBYSUBCLASSANNOT,
-					fp.isCollateBySubclass(), getOntModel(), true);
-			updatePropertyBooleanValue(config, PROPERTY_SELECTFROMEXISTINGANNOT,
-					fp.isSelectFromExisting(), getOntModel(), true);
-			updatePropertyBooleanValue(config, PROPERTY_OFFERCREATENEWOPTIONANNOT,
-					fp.isOfferCreateNewOption(), getOntModel(), true);
+					fp.isCollateBySubclass(), displayModel, true);
+			updatePropertyBooleanValue(config,
+					PROPERTY_SELECTFROMEXISTINGANNOT,
+					fp.isSelectFromExisting(), displayModel, true);
+			updatePropertyBooleanValue(config,
+					PROPERTY_OFFERCREATENEWOPTIONANNOT,
+					fp.isOfferCreateNewOption(), displayModel, true);
 			updatePropertyStringValue(config, PROPERTY_CUSTOMENTRYFORMANNOT,
-					fp.getCustomEntryForm(), getOntModel());
+					fp.getCustomEntryForm(), displayModel);
 			updatePropertyStringValue(config, LIST_VIEW_FILE,
-					fp.getCustomListView(), getOntModel());
-		} finally {
-			getOntModel().leaveCriticalSection();
+					fp.getCustomListView(), displayModel);
 		}
 	}
 
 	@Override
 	public void deleteFauxProperty(FauxProperty fp) {
 		Set<ConfigContext> contexts = ConfigContext.findByQualifiers(
-				getOntModelSelector().getDisplayModel(), fp.getDomainURI(),
-				fp.getURI(), fp.getRangeURI());
-		getOntModel().enterCriticalSection(Lock.READ);
-		try {
+				models.getDisplayModel(), fp.getDomainURI(), fp.getURI(),
+				fp.getRangeURI());
+		try (LockedOntModel displayModel = models.getDisplayModel().write()) {
 			for (ConfigContext context : contexts) {
 				Resource configResource = createResource(context.getConfigUri());
-				getOntModel().removeAll(configResource, null, null);
-				getOntModel().removeAll(null, null, configResource);
+				displayModel.removeAll(configResource, null, null);
+				displayModel.removeAll(null, null, configResource);
 				Resource contextResource = createResource(context
 						.getContextUri());
-				getOntModel().removeAll(contextResource, null, null);
-				getOntModel().removeAll(null, null, contextResource);
+				displayModel.removeAll(contextResource, null, null);
+				displayModel.removeAll(null, null, contextResource);
 			}
-		} finally {
-			getOntModel().leaveCriticalSection();
 		}
 	}
 
@@ -357,11 +343,8 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 	}
 
 	private boolean isUriUsed(String uri) {
-		getOntModel().enterCriticalSection(Lock.READ);
-		try {
-			return (getOntModel().getOntResource(uri) != null);
-		} finally {
-			getOntModel().leaveCriticalSection();
+		try (LockedOntModel displayModel = models.getDisplayModel().read()) {
+			return (displayModel.getOntResource(uri) != null);
 		}
 	}
 
@@ -369,9 +352,9 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 	 * Add labels, annotations, and whatever else we can find on the
 	 * ObjectPropertyDisplayConfig.
 	 */
-	private void populateInstance(FauxProperty fp, Resource context) {
+	private void populateInstance(FauxProperty fp) {
 		populateLabelsFromTBox(fp);
-		populateFieldsFromDisplayModel(fp, context);
+		populateFieldsFromDisplayModel(fp);
 	}
 
 	private void populateLabelsFromTBox(FauxProperty fp) {
@@ -383,23 +366,19 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 		if (classUri == null) {
 			return null;
 		} else {
-			OntModel tboxModel = getOntModelSelector().getTBoxModel();
-			tboxModel.enterCriticalSection(Lock.READ);
-			try {
-				return getStringValue(tboxModel, createResource(classUri),
-						RDFS_LABEL);
-			} finally {
-				tboxModel.leaveCriticalSection();
+			try (LockedOntModel tboxModel = models.getTBoxModel().read()) {
+				return getPropertyStringValue(
+						tboxModel.createOntResource(classUri), RDFS_LABEL);
 			}
 		}
 	}
 
-	private void populateFieldsFromDisplayModel(FauxProperty fp,
-			Resource context) {
-		OntResource config = locateConfigurationFromContext(context);
-		if (config != null) {
-			getOntModel().enterCriticalSection(Lock.READ);
-			try {
+	private void populateFieldsFromDisplayModel(FauxProperty fp) {
+		String configUri = locateConfigurationFromContext(fp.getContextUri());
+		fp.setConfigUri(configUri);
+		if (configUri != null) {
+			try (LockedOntModel displayModel = models.getDisplayModel().read()) {
+				OntResource config = displayModel.createOntResource(configUri);
 				fp.setDisplayName(getPropertyStringValue(config, DISPLAY_NAME));
 				fp.setPublicDescription(getPropertyStringValue(config,
 						PUBLIC_DESCRIPTION_ANNOT));
@@ -417,24 +396,20 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 						PROPERTY_OFFERCREATENEWOPTIONANNOT));
 				fp.setCustomEntryForm(getPropertyStringValue(config,
 						PROPERTY_CUSTOMENTRYFORMANNOT));
-			} finally {
-				getOntModel().leaveCriticalSection();
 			}
 		}
 	}
 
-	private OntResource locateConfigurationFromContext(Resource context) {
-		getOntModel().enterCriticalSection(Lock.READ);
-		try {
-			String configUri = getUriValue(getOntModel(), context,
+	private String locateConfigurationFromContext(String contextUri) {
+		try (LockedOntModel displayModel = models.getDisplayModel().read()) {
+			Collection<String> configUris = getPropertyResourceURIValues(
+					displayModel.createOntResource(contextUri),
 					HAS_CONFIGURATION);
-			if (configUri == null) {
+			if (configUris.isEmpty()) {
 				return null;
 			} else {
-				return getOntModel().createOntResource(configUri);
+				return configUris.iterator().next();
 			}
-		} finally {
-			getOntModel().leaveCriticalSection();
 		}
 	}
 
@@ -448,64 +423,6 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 		}
 	}
 
-	/**
-	 * Returns a single URI that is the object of this subject and property.
-	 * Returns null if no valid statement is found.
-	 * 
-	 * The model should already be locked.
-	 */
-	private String getUriValue(OntModel model, Resource subject,
-			Property property) {
-		List<RDFNode> nodeList = model.listObjectsOfProperty(subject, property)
-				.toList();
-		if (nodeList.isEmpty()) {
-			log.warn("'" + subject.getURI() + "' has no value for '"
-					+ property.getURI() + "'.");
-			return null;
-		}
-
-		RDFNode node = nodeList.get(0);
-		if (nodeList.size() > 1) {
-			log.warn("'" + subject.getURI() + "' has " + nodeList.size()
-					+ " values for ''. Using '" + node + "'");
-		}
-		if (!node.isURIResource()) {
-			log.warn("Value of '" + subject.getURI() + property.getURI()
-					+ "' '' is not a URI resource.");
-			return null;
-		}
-		return node.asResource().getURI();
-	}
-
-	/**
-	 * Returns a single String value that is the object of this subject and
-	 * property. Returns null if no valid statement is found.
-	 * 
-	 * The model should already be locked.
-	 */
-	private String getStringValue(OntModel model, Resource subject,
-			Property property) {
-		List<RDFNode> nodeList = model.listObjectsOfProperty(subject, property)
-				.toList();
-		if (nodeList.isEmpty()) {
-			log.warn("'" + subject.getURI() + "' has no value for '"
-					+ property.getURI() + "'.");
-			return null;
-		}
-
-		RDFNode node = nodeList.get(0);
-		if (nodeList.size() > 1) {
-			log.warn("'" + subject.getURI() + "' has " + nodeList.size()
-					+ " values for ''. Using '" + node + "'");
-		}
-		if (!node.isLiteral()) {
-			log.warn("Value of '" + subject.getURI() + property.getURI()
-					+ "' '' is not a Literal.");
-			return null;
-		}
-		return node.asLiteral().getString();
-	}
-
 	// ----------------------------------------------------------------------
 	// ConfigContext
 	// ----------------------------------------------------------------------
@@ -572,10 +489,9 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 
 	private static class ConfigContext {
 		public static Set<ConfigContext> findByQualifiers(
-				OntModel displayModel, String domainUri, String baseUri,
-				String rangeUri) {
-			displayModel.enterCriticalSection(Lock.READ);
-			try {
+				LockableOntModel lockableDisplayModel, String domainUri,
+				String baseUri, String rangeUri) {
+			try (LockedOntModel displayModel = lockableDisplayModel.read()) {
 				String queryString;
 				if (domainUri == null) {
 					queryString = bindValues(
@@ -594,8 +510,6 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 						domainUri, baseUri, rangeUri);
 				return new SparqlQueryRunner(displayModel).executeSelect(
 						parser, queryString);
-			} finally {
-				displayModel.leaveCriticalSection();
 			}
 		}
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java
index df6760e4f..9286527d9 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java
@@ -120,7 +120,7 @@ public class ConfigurationBeanLoader {
 	public <T> Set<T> loadAll(Class<T> resultClass)
 			throws ConfigurationBeanLoaderException {
 		Set<String> uris = new HashSet<>();
-		try (Critical section = Critical.read(model)) {
+		try (Critical.Section section = Critical.Section.read(model)) {
 			List<Resource> resources = model.listResourcesWithProperty(
 					RDF.type, createResource(toJavaUri(resultClass))).toList();
 			for (Resource r : resources) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java
index 507e71319..530dbdd31 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java
@@ -58,7 +58,7 @@ public class ConfigurationRdfParser {
 			throws InvalidConfigurationRdfException {
 		Selector s = new SimpleSelector(createResource(uri), null,
 				(RDFNode) null);
-		try (Critical section = Critical.read(model)) {
+		try (Critical.Section section = Critical.Section.read(model)) {
 			if (model.listStatements(s).toList().isEmpty()) {
 				throw individualDoesNotAppearInModel(uri);
 			}
@@ -70,7 +70,7 @@ public class ConfigurationRdfParser {
 			throws InvalidConfigurationRdfException {
 		Statement s = createStatement(createResource(uri), RDF.type,
 				createResource(toJavaUri(resultClass)));
-		try (Critical section = Critical.read(model)) {
+		try (Critical.Section section = Critical.Section.read(model)) {
 			if (!model.contains(s)) {
 				throw noTypeStatementForResultClass(s);
 			}
@@ -81,7 +81,7 @@ public class ConfigurationRdfParser {
 			throws InvalidConfigurationRdfException {
 		Set<PropertyStatement> set = new HashSet<>();
 
-		try (Critical section = Critical.read(model)) {
+		try (Critical.Section section = Critical.Section.read(model)) {
 			List<Statement> rawStatements = model.listStatements(
 					model.getResource(uri), (Property) null, (RDFNode) null)
 					.toList();
@@ -111,7 +111,7 @@ public class ConfigurationRdfParser {
 			throws InvalidConfigurationRdfException {
 		Set<Class<? extends T>> concreteClasses = new HashSet<>();
 
-		try (Critical section = Critical.read(model)) {
+		try (Critical.Section section = Critical.Section.read(model)) {
 			for (RDFNode node : model.listObjectsOfProperty(
 					createResource(uri), RDF.type).toSet()) {
 				if (!node.isURIResource()) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/Critical.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/Critical.java
index 113645909..c1262b20b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/Critical.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/Critical.java
@@ -5,35 +5,122 @@ package edu.cornell.mannlib.vitro.webapp.utils.jena;
 import static com.hp.hpl.jena.shared.Lock.READ;
 import static com.hp.hpl.jena.shared.Lock.WRITE;
 
+import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.shared.Lock;
+
+import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.AbstractOntModelDecorator;
 
 /**
- * Use this in a try-with-resources block.
- * 
- * <pre>
- * try (Critical section = Critical.read(model)) {
- * }
- * </pre>
+ * AutoCloseable helper classes for using models in a try-with-resources block.
  */
-public class Critical implements AutoCloseable {
-	public static Critical read(Model model) {
-		return new Critical(model, READ);
+public abstract class Critical {
+	/**
+	 * Use this when you have a bare model, and you want to control a critical
+	 * section.
+	 * 
+	 * <pre>
+	 * try (Critical.Section section = Critical.Section.read(model)) {
+	 *     ...
+	 * }
+	 * </pre>
+	 */
+	public static class Section implements AutoCloseable {
+		public static Section read(Model model) {
+			return new Section(model, READ);
+		}
+
+		public static Section write(Model model) {
+			return new Section(model, WRITE);
+		}
+
+		private final Model model;
+
+		private Section(Model model, boolean readLockRequested) {
+			this.model = model;
+			this.model.enterCriticalSection(readLockRequested);
+		}
+
+		@Override
+		public void close() {
+			this.model.leaveCriticalSection();
+		}
 	}
 
-	public static Critical write(Model model) {
-		return new Critical(model, WRITE);
-	}
-	
-	private final Model model;
+	/**
+	 * Use this when you have a bare OntModelSelector. It returns
+	 * LockableOntModels, which can then be locked in a critical section.
+	 * 
+	 * <pre>
+	 * LockingOntModelSelector lockingOms = new LockingOntModelSelector(oms);
+	 * </pre>
+	 */
+	public static class LockingOntModelSelector {
+		private final OntModelSelector oms;
 
-	private Critical(Model model, boolean readLockRequested) {
-		this.model = model;
-		this.model.enterCriticalSection(readLockRequested);
+		public LockingOntModelSelector(OntModelSelector oms) {
+			this.oms = oms;
+		}
+
+		public LockableOntModel getDisplayModel() {
+			return new LockableOntModel(oms.getDisplayModel());
+		}
+
+		public LockableOntModel getTBoxModel() {
+			return new LockableOntModel(oms.getTBoxModel());
+		}
 	}
 
-	@Override
-	public void close() {
-		this.model.leaveCriticalSection();
+	/**
+	 * Returned by the LockingOntModelSelector, or it can be wrapped around a
+	 * bare OntModel.
+	 * 
+	 * <pre>
+	 * try (LockedOntModel m = lockingOms.getDisplayModel.read()) {
+	 *    ...
+	 * }
+	 * </pre>
+	 */
+	public static class LockableOntModel {
+		private final OntModel ontModel;
+
+		public LockableOntModel(OntModel ontModel) {
+			this.ontModel = ontModel;
+		}
+
+		public LockedOntModel read() {
+			ontModel.enterCriticalSection(Lock.READ);
+			return new LockedOntModel(ontModel);
+		}
+
+		public LockedOntModel write() {
+			ontModel.enterCriticalSection(Lock.WRITE);
+			return new LockedOntModel(ontModel);
+		}
+	}
+
+	/**
+	 * A simple OntModel, except that it can only be created by locking a
+	 * LockableOntModel. It is AutoCloseable, but the close method has been
+	 * hijacked to simply release the lock, and not to actually close the
+	 * wrapped model. 
+	 */
+	public static class LockedOntModel extends AbstractOntModelDecorator
+			implements AutoCloseable {
+
+		private LockedOntModel(OntModel m) {
+			super(m);
+		}
+
+		/**
+		 * Just unlocks the model. Doesn't actually close it, because we may
+		 * want to use it again.
+		 */
+		@Override
+		public void close() {
+			super.leaveCriticalSection();
+		}
 	}
 
 }

From daac8c3c4f4fcb8fe0c7844de16f1bc05c9b0850 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Thu, 6 Nov 2014 10:28:40 -0500
Subject: [PATCH 10/30] Populate the new bean from the base property. Handle
 policy restrictions.

---
 .../vitro/webapp/beans/BaseResourceBean.java  |  1 +
 .../vitro/webapp/beans/FauxProperty.java      |  3 +-
 .../edit/FauxPropertyRetryController.java     | 20 +++-
 .../webapp/dao/jena/FauxPropertyDaoJena.java  | 96 +++++++++++++-----
 .../vitro/webapp/dao/jena/JenaBaseDao.java    | 15 +++
 .../ConfigurationBeanLoader.java              | 18 ++--
 .../configuration/ConfigurationRdfParser.java | 41 ++++----
 .../vitro/webapp/utils/jena/Critical.java     | 97 ++++++++++++-------
 .../edit/specific/fauxProperty_retry.jsp      |  2 +-
 9 files changed, 203 insertions(+), 90 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
index 67e02fad8..e782aab44 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
@@ -79,6 +79,7 @@ public class BaseResourceBean implements ResourceBean {
 			return shorthand;
 		}
 		
+		// Never returns null.
 		public static RoleLevel getRoleByUri(String uri2) {
 			if (uri2 == null)
 				return RoleLevel.values()[0];
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
index a7aebf510..67bb52923 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
@@ -214,7 +214,8 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean,
 		return "FauxProperty[domainURI=" + domainURI + ", baseUri=" + getURI()
 				+ ", rangeURI=" + rangeURI + ", rangeLabel=" + rangeLabel
 				+ ", domainLabel=" + domainLabel + ", pickListName="
-				+ getPickListName() + ", groupURI=" + groupURI
+				+ getPickListName() + ", contextUri=" + contextUri
+				+ ", configUri=" + configUri + ", groupURI=" + groupURI
 				+ "publicDescription=" + publicDescription + ", displayTier="
 				+ displayTier + ", displayLimit=" + displayLimit
 				+ ", collateBySubclass=" + collateBySubclass
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
index ad328e240..250f52723 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
@@ -31,12 +31,14 @@ import edu.cornell.mannlib.vedit.validator.impl.RequiredFieldValidator;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionListener;
 import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.Property;
 import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.edit.utils.RoleLevelOptionsSetup;
 import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 
@@ -141,7 +143,7 @@ public class FauxPropertyRetryController extends BaseEditController {
 			String domainUri = req.getParameter("domainUri");
 
 			if (epo.getAction().equals("insert")) {
-				return new FauxProperty(null, baseUri, null);
+				return newFauxProperty(baseUri);
 			}
 
 			FauxProperty bean = fpDao.getFauxPropertyByUris(domainUri, baseUri,
@@ -155,6 +157,22 @@ public class FauxPropertyRetryController extends BaseEditController {
 			return bean;
 		}
 
+		/**
+		 * Create a new FauxProperty object and let it inherit some values from its base property.
+		 */
+		private FauxProperty newFauxProperty(String baseUri) {
+			FauxProperty fp = new FauxProperty(null, baseUri, null);
+			ObjectPropertyDao opDao = wadf.getObjectPropertyDao();
+			ObjectProperty base = opDao.getObjectPropertyByURI(baseUri);
+			fp.setGroupURI(base.getGroupURI());
+			fp.setRangeURI(base.getRangeVClassURI());
+			fp.setDomainURI(base.getDomainVClassURI());
+			fp.setHiddenFromDisplayBelowRoleLevel(base.getHiddenFromDisplayBelowRoleLevel());
+			fp.setHiddenFromPublishBelowRoleLevel(base.getHiddenFromPublishBelowRoleLevel());
+			fp.setProhibitedFromUpdateBelowRoleLevel(base.getProhibitedFromUpdateBelowRoleLevel());
+			return fp;
+		}
+
 		private void setFieldValidators() {
 			epo.getValidatorMap()
 					.put("RangeURI",
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
index fb90a2471..95f7e78f4 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
@@ -180,7 +180,7 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 
 	@Override
 	public void insertFauxProperty(FauxProperty fp) {
-		if ((fp.getContextUri() != null) || (fp.getConfigUri() == null)) {
+		if ((fp.getContextUri() != null) || (fp.getConfigUri() != null)) {
 			throw new IllegalStateException(
 					"ContextUri and ConfigUri must be null on insert: " + fp);
 		}
@@ -193,31 +193,28 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 					"FauxProperty with these qualifiers already exists: " + fp);
 		}
 
-		try {
-			fp.setContextUri(getUnusedURI());
-			fp.setConfigUri(getUnusedURI());
-		} catch (InsertException e) {
-			throw new RuntimeException(e);
-		}
-
 		try (LockedOntModel displayModel = models.getDisplayModel().write()) {
+			fp.setContextUri(getUnusedURI());
+
 			OntResource context = displayModel.createOntResource(fp
 					.getContextUri());
 			addPropertyResourceValue(context, RDF.type, CONFIG_CONTEXT);
-			addPropertyResourceURIValue(context, HAS_CONFIGURATION,
-					fp.getConfigUri());
 			addPropertyResourceURIValue(context, CONFIG_CONTEXT_FOR,
 					fp.getBaseURI());
 			addPropertyResourceURIValue(context, QUALIFIED_BY_RANGE,
 					fp.getRangeURI());
-			addPropertyResourceURIValue(context, QUALIFIED_BY_DOMAIN,
+			addPropertyResourceURINotEmpty(context, QUALIFIED_BY_DOMAIN,
 					fp.getDomainURI());
 
+			fp.setConfigUri(getUnusedURI());
+			addPropertyResourceURIValue(context, HAS_CONFIGURATION,
+					fp.getConfigUri());
+
 			OntResource config = displayModel.createOntResource(fp
 					.getConfigUri());
 			addPropertyResourceValue(config, RDF.type,
 					OBJECT_PROPERTY_DISPLAY_CONFIG);
-			addPropertyResourceURIValue(config, PROPERTY_GROUP,
+			addPropertyResourceURINotEmpty(config, PROPERTY_GROUP,
 					fp.getGroupURI());
 			addPropertyStringValue(config, DISPLAY_NAME, fp.getDisplayName(),
 					displayModel);
@@ -237,6 +234,26 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 					fp.getCustomEntryForm(), displayModel);
 			addPropertyStringValue(config, LIST_VIEW_FILE,
 					fp.getCustomListView(), displayModel);
+
+			updatePropertyResourceURIValue(config,
+					HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT, fp
+							.getHiddenFromDisplayBelowRoleLevel().getURI());
+			updatePropertyResourceURIValue(config,
+					HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT, fp
+							.getHiddenFromPublishBelowRoleLevel().getURI());
+			updatePropertyResourceURIValue(config,
+					PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT, fp
+							.getProhibitedFromUpdateBelowRoleLevel().getURI());
+
+		} catch (InsertException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	private void addPropertyResourceURINotEmpty(OntResource context,
+			ObjectProperty prop, String uri) {
+		if (uri != null && !uri.isEmpty()) {
+			addPropertyResourceURIValue(context, prop, uri);
 		}
 	}
 
@@ -302,6 +319,16 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 					fp.getCustomEntryForm(), displayModel);
 			updatePropertyStringValue(config, LIST_VIEW_FILE,
 					fp.getCustomListView(), displayModel);
+			
+			updatePropertyResourceURIValue(config,
+					HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT, fp
+							.getHiddenFromDisplayBelowRoleLevel().getURI());
+			updatePropertyResourceURIValue(config,
+					HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT, fp
+							.getHiddenFromPublishBelowRoleLevel().getURI());
+			updatePropertyResourceURIValue(config,
+					PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT, fp
+							.getProhibitedFromUpdateBelowRoleLevel().getURI());
 		}
 	}
 
@@ -388,14 +415,24 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 				fp.setDisplayTier(getPropertyIntValue(config,
 						DISPLAY_RANK_ANNOT));
 				fp.setDisplayLimit(getPropertyIntValue(config, DISPLAY_LIMIT));
-				fp.setCollateBySubclass(getPropertyBooleanValue(config,
-						PROPERTY_COLLATEBYSUBCLASSANNOT));
-				fp.setSelectFromExisting(getPropertyBooleanValue(config,
-						PROPERTY_SELECTFROMEXISTINGANNOT));
-				fp.setOfferCreateNewOption(getPropertyBooleanValue(config,
-						PROPERTY_OFFERCREATENEWOPTIONANNOT));
+				fp.setCollateBySubclass(Boolean.TRUE
+						.equals(getPropertyBooleanValue(config,
+								PROPERTY_COLLATEBYSUBCLASSANNOT)));
+				fp.setSelectFromExisting(Boolean.TRUE
+						.equals(getPropertyBooleanValue(config,
+								PROPERTY_SELECTFROMEXISTINGANNOT)));
+				fp.setOfferCreateNewOption(Boolean.TRUE
+						.equals(getPropertyBooleanValue(config,
+								PROPERTY_OFFERCREATENEWOPTIONANNOT)));
 				fp.setCustomEntryForm(getPropertyStringValue(config,
 						PROPERTY_CUSTOMENTRYFORMANNOT));
+				
+				fp.setHiddenFromDisplayBelowRoleLevel(getMostRestrictiveRoleLevel(
+						config, HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT));
+				fp.setHiddenFromPublishBelowRoleLevel(getMostRestrictiveRoleLevel(
+						config, HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT));
+				fp.setProhibitedFromUpdateBelowRoleLevel(getMostRestrictiveRoleLevel(
+						config, PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT));
 			}
 		}
 	}
@@ -444,7 +481,7 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 	private static final String QUERY_LOCATE_CONFIG_CONTEXT_WITH_NO_DOMAIN = "" //
 			+ "PREFIX : <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" //
 			+ "\n" //
-			+ "SELECT DISTINCT ?context \n" //
+			+ "SELECT DISTINCT ?context ?config \n" //
 			+ "WHERE { \n" //
 			+ "    ?context a :ConfigContext ; \n" //
 			+ "        :configContextFor ?baseUri ; \n" //
@@ -493,7 +530,7 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 				String baseUri, String rangeUri) {
 			try (LockedOntModel displayModel = lockableDisplayModel.read()) {
 				String queryString;
-				if (domainUri == null) {
+				if (domainUri == null || domainUri.trim().isEmpty()) {
 					queryString = bindValues(
 							QUERY_LOCATE_CONFIG_CONTEXT_WITH_NO_DOMAIN,
 							uriValue("baseUri", baseUri),
@@ -505,11 +542,19 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 							uriValue("rangeUri", rangeUri),
 							uriValue("domainUri", domainUri));
 				}
+				if (log.isDebugEnabled()) {
+					log.debug("domainUri=" + domainUri + ", baseUri=" + baseUri
+							+ ", rangeUri=" + rangeUri + ", queryString="
+							+ queryString);
+				}
 
 				ParserLocateConfigContext parser = new ParserLocateConfigContext(
 						domainUri, baseUri, rangeUri);
-				return new SparqlQueryRunner(displayModel).executeSelect(
-						parser, queryString);
+				Set<ConfigContext> contexts = new SparqlQueryRunner(
+						displayModel).executeSelect(parser, queryString);
+
+				log.debug("found " + contexts.size() + " contexts: " + contexts);
+				return contexts;
 			}
 		}
 
@@ -548,6 +593,13 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 			return rangeUri;
 		}
 
+		@Override
+		public String toString() {
+			return "ConfigContext[contextUri=" + contextUri + ", configUri="
+					+ configUri + ", domainUri=" + domainUri + ", baseUri="
+					+ baseUri + ", rangeUri=" + rangeUri + "]";
+		}
+
 	}
 
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
index 085c4dc4e..814b80e72 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
@@ -48,6 +48,7 @@ import com.hp.hpl.jena.util.iterator.ClosableIterator;
 import com.hp.hpl.jena.vocabulary.RDF;
 import com.hp.hpl.jena.vocabulary.RDFS;
 
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 
 public class JenaBaseDao extends JenaBaseDaoCon {
@@ -573,6 +574,20 @@ public class JenaBaseDao extends JenaBaseDaoCon {
     	return list;
     }
     
+	protected RoleLevel getMostRestrictiveRoleLevel(Resource res, Property prop) {
+		RoleLevel level = RoleLevel.getRoleByUri(null);
+		for (Statement stmt : res.listProperties(prop).toList()) {
+			if (stmt.getObject().isURIResource()) {
+				RoleLevel roleFromModel = RoleLevel.getRoleByUri(stmt
+						.getObject().as(Resource.class).getURI());
+				if (roleFromModel.compareTo(level) > 0) {
+					level = roleFromModel;
+				}
+			}
+		}
+		return level;
+	}
+    
     /**
      * convenience method for use with functional object properties
      */
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java
index 9286527d9..584797e5b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java
@@ -2,19 +2,21 @@
 
 package edu.cornell.mannlib.vitro.webapp.utils.configuration;
 
+import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource;
+
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import static com.hp.hpl.jena.rdf.model.ResourceFactory.*;
+
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
 import com.hp.hpl.jena.vocabulary.RDF;
 
-import edu.cornell.mannlib.vitro.webapp.utils.jena.Critical;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.Critical.LockableModel;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.Critical.LockedModel;
 
 /**
  * Load one or more Configuration beans from a specified model.
@@ -48,7 +50,7 @@ public class ConfigurationBeanLoader {
 	// ----------------------------------------------------------------------
 
 	/** Must not be null. */
-	private final Model model;
+	private final LockableModel model;
 
 	/**
 	 * May be null, but the loader will be unable to satisfy instances of
@@ -82,7 +84,7 @@ public class ConfigurationBeanLoader {
 			throw new NullPointerException("model may not be null.");
 		}
 
-		this.model = model;
+		this.model = new LockableModel(model);
 		this.req = req;
 		this.ctx = ctx;
 	}
@@ -120,9 +122,9 @@ public class ConfigurationBeanLoader {
 	public <T> Set<T> loadAll(Class<T> resultClass)
 			throws ConfigurationBeanLoaderException {
 		Set<String> uris = new HashSet<>();
-		try (Critical.Section section = Critical.Section.read(model)) {
-			List<Resource> resources = model.listResourcesWithProperty(
-					RDF.type, createResource(toJavaUri(resultClass))).toList();
+		try (LockedModel m = model.read()) {
+			List<Resource> resources = m.listResourcesWithProperty(RDF.type,
+					createResource(toJavaUri(resultClass))).toList();
 			for (Resource r : resources) {
 				if (r.isURIResource()) {
 					uris.add(r.getURI());
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java
index 530dbdd31..88df4d53f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java
@@ -13,7 +13,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.Property;
 import com.hp.hpl.jena.rdf.model.RDFNode;
 import com.hp.hpl.jena.rdf.model.Selector;
@@ -23,15 +22,17 @@ import com.hp.hpl.jena.vocabulary.RDF;
 
 import edu.cornell.mannlib.vitro.webapp.utils.configuration.PropertyType.PropertyStatement;
 import edu.cornell.mannlib.vitro.webapp.utils.configuration.PropertyType.PropertyTypeException;
-import edu.cornell.mannlib.vitro.webapp.utils.jena.Critical;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.Critical.LockableModel;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.Critical.LockedModel;
 
 /**
  * Parse the RDF for a single individual in the model to create a
  * ConfigurationRdf object.
  */
 public class ConfigurationRdfParser {
-	public static <T> ConfigurationRdf<T> parse(Model model, String uri,
-			Class<T> resultClass) throws InvalidConfigurationRdfException {
+	public static <T> ConfigurationRdf<T> parse(LockableModel model,
+			String uri, Class<T> resultClass)
+			throws InvalidConfigurationRdfException {
 		if (model == null) {
 			throw new NullPointerException("model may not be null.");
 		}
@@ -54,36 +55,36 @@ public class ConfigurationRdfParser {
 		return new ConfigurationRdf<T>(concreteClass, properties);
 	}
 
-	private static void confirmExistenceInModel(Model model, String uri)
+	private static void confirmExistenceInModel(LockableModel model, String uri)
 			throws InvalidConfigurationRdfException {
 		Selector s = new SimpleSelector(createResource(uri), null,
 				(RDFNode) null);
-		try (Critical.Section section = Critical.Section.read(model)) {
-			if (model.listStatements(s).toList().isEmpty()) {
+		try (LockedModel m = model.read()) {
+			if (m.listStatements(s).toList().isEmpty()) {
 				throw individualDoesNotAppearInModel(uri);
 			}
 		}
 	}
 
-	private static void confirmEligibilityForResultClass(Model model,
+	private static void confirmEligibilityForResultClass(LockableModel model,
 			String uri, Class<?> resultClass)
 			throws InvalidConfigurationRdfException {
 		Statement s = createStatement(createResource(uri), RDF.type,
 				createResource(toJavaUri(resultClass)));
-		try (Critical.Section section = Critical.Section.read(model)) {
-			if (!model.contains(s)) {
+		try (LockedModel m = model.read()) {
+			if (!m.contains(s)) {
 				throw noTypeStatementForResultClass(s);
 			}
 		}
 	}
 
-	private static Set<PropertyStatement> loadProperties(Model model, String uri)
-			throws InvalidConfigurationRdfException {
+	private static Set<PropertyStatement> loadProperties(LockableModel model,
+			String uri) throws InvalidConfigurationRdfException {
 		Set<PropertyStatement> set = new HashSet<>();
 
-		try (Critical.Section section = Critical.Section.read(model)) {
-			List<Statement> rawStatements = model.listStatements(
-					model.getResource(uri), (Property) null, (RDFNode) null)
+		try (LockedModel m = model.read()) {
+			List<Statement> rawStatements = m.listStatements(
+					m.getResource(uri), (Property) null, (RDFNode) null)
 					.toList();
 			if (rawStatements.isEmpty()) {
 				throw noRdfStatements(uri);
@@ -106,14 +107,14 @@ public class ConfigurationRdfParser {
 		}
 	}
 
-	private static <T> Class<? extends T> determineConcreteClass(Model model,
-			String uri, Class<T> resultClass)
+	private static <T> Class<? extends T> determineConcreteClass(
+			LockableModel model, String uri, Class<T> resultClass)
 			throws InvalidConfigurationRdfException {
 		Set<Class<? extends T>> concreteClasses = new HashSet<>();
 
-		try (Critical.Section section = Critical.Section.read(model)) {
-			for (RDFNode node : model.listObjectsOfProperty(
-					createResource(uri), RDF.type).toSet()) {
+		try (LockedModel m = model.read()) {
+			for (RDFNode node : m.listObjectsOfProperty(createResource(uri),
+					RDF.type).toSet()) {
 				if (!node.isURIResource()) {
 					throw typeMustBeUriResource(node);
 				}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/Critical.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/Critical.java
index c1262b20b..f0d85122a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/Critical.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/Critical.java
@@ -2,52 +2,25 @@
 
 package edu.cornell.mannlib.vitro.webapp.utils.jena;
 
-import static com.hp.hpl.jena.shared.Lock.READ;
-import static com.hp.hpl.jena.shared.Lock.WRITE;
-
 import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.shared.Lock;
 
 import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.AbstractModelDecorator;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.AbstractOntModelDecorator;
 
 /**
  * AutoCloseable helper classes for using models in a try-with-resources block.
+ * 
+ * TODO - create separate classes in criticalsection package
+ * Locked<? extends Model>
+ * LockerFor<? extends Model>
+ * Add to develop.
+ * Remove Critical and convert configurationBeanLoader
+ * Merge to faux.
  */
 public abstract class Critical {
-	/**
-	 * Use this when you have a bare model, and you want to control a critical
-	 * section.
-	 * 
-	 * <pre>
-	 * try (Critical.Section section = Critical.Section.read(model)) {
-	 *     ...
-	 * }
-	 * </pre>
-	 */
-	public static class Section implements AutoCloseable {
-		public static Section read(Model model) {
-			return new Section(model, READ);
-		}
-
-		public static Section write(Model model) {
-			return new Section(model, WRITE);
-		}
-
-		private final Model model;
-
-		private Section(Model model, boolean readLockRequested) {
-			this.model = model;
-			this.model.enterCriticalSection(readLockRequested);
-		}
-
-		@Override
-		public void close() {
-			this.model.leaveCriticalSection();
-		}
-	}
-
 	/**
 	 * Use this when you have a bare OntModelSelector. It returns
 	 * LockableOntModels, which can then be locked in a critical section.
@@ -74,7 +47,7 @@ public abstract class Critical {
 
 	/**
 	 * Returned by the LockingOntModelSelector, or it can be wrapped around a
-	 * bare OntModel.
+	 * bare OntModel. Cannot be used without locking.
 	 * 
 	 * <pre>
 	 * try (LockedOntModel m = lockingOms.getDisplayModel.read()) {
@@ -104,7 +77,7 @@ public abstract class Critical {
 	 * A simple OntModel, except that it can only be created by locking a
 	 * LockableOntModel. It is AutoCloseable, but the close method has been
 	 * hijacked to simply release the lock, and not to actually close the
-	 * wrapped model. 
+	 * wrapped model.
 	 */
 	public static class LockedOntModel extends AbstractOntModelDecorator
 			implements AutoCloseable {
@@ -123,4 +96,54 @@ public abstract class Critical {
 		}
 	}
 
+	/**
+	 * Can be wrapped around a bare OntModel. Cannot be used without locking.
+	 * 
+	 * <pre>
+	 * try (LockedModel m = lockableModel.read()) {
+	 *    ...
+	 * }
+	 * </pre>
+	 */
+	public static class LockableModel {
+		private final Model model;
+
+		public LockableModel(Model model) {
+			this.model = model;
+		}
+
+		public LockedModel read() {
+			model.enterCriticalSection(Lock.READ);
+			return new LockedModel(model);
+		}
+
+		public LockedModel write() {
+			model.enterCriticalSection(Lock.WRITE);
+			return new LockedModel(model);
+		}
+	}
+
+	/**
+	 * A simple Model, except that it can only be created by locking a
+	 * LockableModel. It is AutoCloseable, but the close method has been
+	 * hijacked to simply release the lock, and not to actually close the
+	 * wrapped model.
+	 */
+	public static class LockedModel extends AbstractModelDecorator
+			implements AutoCloseable {
+
+		private LockedModel(Model m) {
+			super(m);
+		}
+
+		/**
+		 * Just unlocks the model. Doesn't actually close it, because we may
+		 * want to use it again.
+		 */
+		@Override
+		public void close() {
+			super.leaveCriticalSection();
+		}
+	}
+
 }
diff --git a/webapp/web/templates/edit/specific/fauxProperty_retry.jsp b/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
index 7110daddd..d8bd7fffe 100644
--- a/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
+++ b/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
@@ -6,7 +6,7 @@
 <tr class="editformcell">
     <td valign="top" colspan="2">
         <b>Base property</b><br/>
-        <input type="text" class="fullWidthInput" name="Base property" value="<form:value name="BaseUri"/>" disabled="disabled" /></br>
+        <input type="text" class="fullWidthInput" name="Base property" value="<form:value name="BaseURI"/>" disabled="disabled" /></br>
         <i>a specification of this property</i></br>
     </td>
     <td valign="top" colspan="2">

From 1439c2195d8bf75668864c6368e42d9c9fdbbf28 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Thu, 6 Nov 2014 13:50:16 -0500
Subject: [PATCH 11/30] tweaks to make the boolean values work.

---
 .../vitro/webapp/beans/FauxProperty.java      | 23 +++++++++++++------
 .../edit/FauxPropertyRetryController.java     | 20 ++++++++++++++++
 .../webapp/dao/jena/FauxPropertyDaoJena.java  | 19 +++++++++++++--
 .../edit/specific/fauxProperty_retry.jsp      |  2 +-
 4 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
index 67bb52923..f5f9c9b3e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
@@ -24,6 +24,7 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean,
 	// May be null. Partial identifier on delete.
 	private String domainURI;
 
+	private String baseLabel;
 	private String rangeLabel;
 	private String domainLabel;
 
@@ -95,6 +96,14 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean,
 		this.rangeURI = rangeURI;
 	}
 
+	public String getBaseLabel() {
+		return (baseLabel == null) ? localName(getBaseURI()) : baseLabel;
+	}
+
+	public void setBaseLabel(String baseLabel) {
+		this.baseLabel = baseLabel;
+	}
+
 	public String getRangeLabel() {
 		return (rangeLabel == null) ? localName(rangeURI) : rangeLabel;
 	}
@@ -212,13 +221,13 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean,
 	@Override
 	public String toString() {
 		return "FauxProperty[domainURI=" + domainURI + ", baseUri=" + getURI()
-				+ ", rangeURI=" + rangeURI + ", rangeLabel=" + rangeLabel
-				+ ", domainLabel=" + domainLabel + ", pickListName="
-				+ getPickListName() + ", contextUri=" + contextUri
-				+ ", configUri=" + configUri + ", groupURI=" + groupURI
-				+ "publicDescription=" + publicDescription + ", displayTier="
-				+ displayTier + ", displayLimit=" + displayLimit
-				+ ", collateBySubclass=" + collateBySubclass
+				+ ", baseLabel=" + baseLabel + ", rangeURI=" + rangeURI
+				+ ", rangeLabel=" + rangeLabel + ", domainLabel=" + domainLabel
+				+ ", pickListName=" + getPickListName() + ", contextUri="
+				+ contextUri + ", configUri=" + configUri + ", groupURI="
+				+ groupURI + "publicDescription=" + publicDescription
+				+ ", displayTier=" + displayTier + ", displayLimit="
+				+ displayLimit + ", collateBySubclass=" + collateBySubclass
 				+ ", selectFromExisting=" + selectFromExisting
 				+ ", offerCreateNewOption=" + offerCreateNewOption
 				+ ", customEntryForm=" + customEntryForm + ", customListView="
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
index 250f52723..3cbc9c1a8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
@@ -127,12 +127,16 @@ public class FauxPropertyRetryController extends BaseEditController {
 			this.baseProperty = req.getUnfilteredWebappDaoFactory()
 					.getObjectPropertyDao()
 					.getObjectPropertyByURI(beanForEditing.getURI());
+			
+			addCheckboxValuesToTheRequest();
 
 			setFieldValidators();
 
 			doABunchOfOtherJunk();
 		}
 
+		
+
 		private String determineAction() {
 			return (req.getParameter("create") == null) ? "update" : "insert";
 		}
@@ -170,9 +174,25 @@ public class FauxPropertyRetryController extends BaseEditController {
 			fp.setHiddenFromDisplayBelowRoleLevel(base.getHiddenFromDisplayBelowRoleLevel());
 			fp.setHiddenFromPublishBelowRoleLevel(base.getHiddenFromPublishBelowRoleLevel());
 			fp.setProhibitedFromUpdateBelowRoleLevel(base.getProhibitedFromUpdateBelowRoleLevel());
+			log.debug("Created new FauxProperty: " + fp);
 			return fp;
 		}
 
+		private void addCheckboxValuesToTheRequest() {
+	        req.setAttribute("selectFromExisting",beanForEditing.isSelectFromExisting());
+	        req.setAttribute("offerCreateNewOption", beanForEditing.isOfferCreateNewOption());
+	        req.setAttribute("collateBySubclass", beanForEditing.isCollateBySubclass());
+	        
+			// checkboxes on HTML forms are pretty annoying : we don't know if
+			// someone *unchecked* a box, so we have to default to false on
+			// updates.
+	        if (beanForEditing.getURI() != null) {
+	            beanForEditing.setSelectFromExisting(false);
+	            beanForEditing.setOfferCreateNewOption(false);
+	            beanForEditing.setCollateBySubclass(false);
+	        }
+		}
+		
 		private void setFieldValidators() {
 			epo.getValidatorMap()
 					.put("RangeURI",
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
index 95f7e78f4..152de4498 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
@@ -86,6 +86,15 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 		this.models = new LockingOntModelSelector(wadf.getOntModelSelector());
 	}
 
+	/**
+	 * Need to override this, so the boolean convenience methods will work off
+	 * the correct model.
+	 */
+	@Override
+	protected OntModel getOntModel() {
+		return getOntModelSelector().getDisplayModel();
+	}
+
 	@Override
 	public List<FauxProperty> getFauxPropertiesForBaseUri(String uri) {
 		try (LockedOntModel displayModel = models.getDisplayModel().read()) {
@@ -110,6 +119,7 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 					fpList.add(fp);
 				}
 			}
+			log.debug("Located " + fpList.size() + " FauxProperties.");
 			return fpList;
 		}
 	}
@@ -157,6 +167,7 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 			FauxProperty fp = new FauxProperty(domainUri, baseUri, rangeUri);
 			fp.setContextUri(contextUri);
 			populateInstance(fp);
+			log.debug("Loaded FauxProperty: " + fp);
 			return fp;
 		}
 	}
@@ -174,6 +185,7 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 			FauxProperty fp = new FauxProperty(domainUri, baseUri, rangeUri);
 			fp.setContextUri(contexts.iterator().next().getContextUri());
 			populateInstance(fp);
+			log.debug("Loaded FauxProperty: " + fp);
 			return fp;
 		}
 	}
@@ -259,6 +271,8 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 
 	@Override
 	public void updateFauxProperty(FauxProperty fp) {
+		log.debug("Updating FauxProperty: " + fp);
+
 		try (LockedOntModel displayModel = models.getDisplayModel().read()) {
 			if (fp.getContextUri() == null) {
 				throw new IllegalStateException("ContextURI may not be null: "
@@ -319,7 +333,7 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 					fp.getCustomEntryForm(), displayModel);
 			updatePropertyStringValue(config, LIST_VIEW_FILE,
 					fp.getCustomListView(), displayModel);
-			
+
 			updatePropertyResourceURIValue(config,
 					HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT, fp
 							.getHiddenFromDisplayBelowRoleLevel().getURI());
@@ -385,6 +399,7 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 	}
 
 	private void populateLabelsFromTBox(FauxProperty fp) {
+		fp.setBaseLabel(findLabelForClass(fp.getBaseURI()));
 		fp.setRangeLabel(findLabelForClass(fp.getRangeURI()));
 		fp.setDomainLabel(findLabelForClass(fp.getDomainURI()));
 	}
@@ -426,7 +441,7 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 								PROPERTY_OFFERCREATENEWOPTIONANNOT)));
 				fp.setCustomEntryForm(getPropertyStringValue(config,
 						PROPERTY_CUSTOMENTRYFORMANNOT));
-				
+
 				fp.setHiddenFromDisplayBelowRoleLevel(getMostRestrictiveRoleLevel(
 						config, HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT));
 				fp.setHiddenFromPublishBelowRoleLevel(getMostRestrictiveRoleLevel(
diff --git a/webapp/web/templates/edit/specific/fauxProperty_retry.jsp b/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
index d8bd7fffe..de8b8af0c 100644
--- a/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
+++ b/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
@@ -6,7 +6,7 @@
 <tr class="editformcell">
     <td valign="top" colspan="2">
         <b>Base property</b><br/>
-        <input type="text" class="fullWidthInput" name="Base property" value="<form:value name="BaseURI"/>" disabled="disabled" /></br>
+        <input type="text" class="fullWidthInput" name="Base property" value="<form:value name="BaseLabel"/>" disabled="disabled" /></br>
         <i>a specification of this property</i></br>
     </td>
     <td valign="top" colspan="2">

From e665b4897164e82f2361d77f852bc3e89bb82425 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Fri, 7 Nov 2014 10:32:33 -0500
Subject: [PATCH 12/30] Add link to verbose panel, handle VCard oddities.

---
 .../edit/FauxPropertyRetryController.java     | 151 +++++++++++-------
 .../mannlib/vitro/webapp/dao/VClassDao.java   |   4 +-
 .../webapp/dao/jena/FauxPropertyDaoJena.java  |  13 ++
 .../individual/PropertyTemplateModel.java     |  43 ++---
 .../freemarker/lib/lib-properties.ftl         |   6 +-
 5 files changed, 135 insertions(+), 82 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
index 3cbc9c1a8..e271dc1ad 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
@@ -10,8 +10,10 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
@@ -127,16 +129,16 @@ public class FauxPropertyRetryController extends BaseEditController {
 			this.baseProperty = req.getUnfilteredWebappDaoFactory()
 					.getObjectPropertyDao()
 					.getObjectPropertyByURI(beanForEditing.getURI());
-			
+
 			addCheckboxValuesToTheRequest();
 
 			setFieldValidators();
+			setListeners();
+			setForwarders();
 
-			doABunchOfOtherJunk();
+			assembleFormObjectAndConnectToEpo();
 		}
 
-		
-
 		private String determineAction() {
 			return (req.getParameter("create") == null) ? "update" : "insert";
 		}
@@ -162,7 +164,8 @@ public class FauxPropertyRetryController extends BaseEditController {
 		}
 
 		/**
-		 * Create a new FauxProperty object and let it inherit some values from its base property.
+		 * Create a new FauxProperty object and let it inherit some values from
+		 * its base property.
 		 */
 		private FauxProperty newFauxProperty(String baseUri) {
 			FauxProperty fp = new FauxProperty(null, baseUri, null);
@@ -171,92 +174,73 @@ public class FauxPropertyRetryController extends BaseEditController {
 			fp.setGroupURI(base.getGroupURI());
 			fp.setRangeURI(base.getRangeVClassURI());
 			fp.setDomainURI(base.getDomainVClassURI());
-			fp.setHiddenFromDisplayBelowRoleLevel(base.getHiddenFromDisplayBelowRoleLevel());
-			fp.setHiddenFromPublishBelowRoleLevel(base.getHiddenFromPublishBelowRoleLevel());
-			fp.setProhibitedFromUpdateBelowRoleLevel(base.getProhibitedFromUpdateBelowRoleLevel());
+			fp.setHiddenFromDisplayBelowRoleLevel(base
+					.getHiddenFromDisplayBelowRoleLevel());
+			fp.setHiddenFromPublishBelowRoleLevel(base
+					.getHiddenFromPublishBelowRoleLevel());
+			fp.setProhibitedFromUpdateBelowRoleLevel(base
+					.getProhibitedFromUpdateBelowRoleLevel());
 			log.debug("Created new FauxProperty: " + fp);
 			return fp;
 		}
 
 		private void addCheckboxValuesToTheRequest() {
-	        req.setAttribute("selectFromExisting",beanForEditing.isSelectFromExisting());
-	        req.setAttribute("offerCreateNewOption", beanForEditing.isOfferCreateNewOption());
-	        req.setAttribute("collateBySubclass", beanForEditing.isCollateBySubclass());
-	        
+			req.setAttribute("selectFromExisting",
+					beanForEditing.isSelectFromExisting());
+			req.setAttribute("offerCreateNewOption",
+					beanForEditing.isOfferCreateNewOption());
+			req.setAttribute("collateBySubclass",
+					beanForEditing.isCollateBySubclass());
+
 			// checkboxes on HTML forms are pretty annoying : we don't know if
 			// someone *unchecked* a box, so we have to default to false on
 			// updates.
-	        if (beanForEditing.getURI() != null) {
-	            beanForEditing.setSelectFromExisting(false);
-	            beanForEditing.setOfferCreateNewOption(false);
-	            beanForEditing.setCollateBySubclass(false);
-	        }
+			if (beanForEditing.getURI() != null) {
+				beanForEditing.setSelectFromExisting(false);
+				beanForEditing.setOfferCreateNewOption(false);
+				beanForEditing.setCollateBySubclass(false);
+			}
 		}
-		
+
 		private void setFieldValidators() {
 			epo.getValidatorMap()
 					.put("RangeURI",
 							Arrays.asList(new Validator[] { new RequiredFieldValidator() }));
 		}
 
-		private void doABunchOfOtherJunk() {
-			// set up any listeners
+		private void setListeners() {
 			epo.setChangeListenerList(Collections
 					.singletonList(new PropertyRestrictionListener(ctx)));
+		}
 
+		private void setForwarders() {
 			// where should the postinsert pageforwarder go?
 			// TODO
 			// make a postdelete pageforwarder that will send us to the control
 			// panel for the base property.
 			// TODO
+		}
 
+		private void assembleFormObjectAndConnectToEpo() {
 			FormObject foo = new FormObject();
 			foo.setErrorMap(epo.getErrMsgMap());
-
 			foo.setOptionLists(new HashMap<>(createOptionsMap()));
-
-			// We will need to set a lot of option lists and stuff.
-			// TODO
-
-			// Put attributes on the request so the JSP can populate the fields.
-			// request.setAttribute("transitive",propertyForEditing.getTransitive());
-			// request.setAttribute("objectIndividualSortPropertyURI",
-			// propertyForEditing.getObjectIndividualSortPropertyURI());
-			// TODO
-
-			// checkboxes are pretty annoying : we don't know if someone
-			// *unchecked*
-			// a box, so we have to default to false on updates.
-			// propertyForEditing.setSymmetric(false);
-			// TODO
-
 			epo.setFormObject(foo);
-
 			FormUtils.populateFormFromBean(beanForEditing, epo.getAction(),
 					foo, epo.getBadValueMap());
 		}
 
 		private Map<String, List<Option>> createOptionsMap() {
 			Map<String, List<Option>> map = new HashMap<>();
-
 			map.put("GroupURI", createClassGroupOptionList());
-			
-			map.put("DomainURI",
-					createRootedVClassOptionList(
-							baseProperty.getDomainVClassURI(),
-							beanForEditing.getDomainURI()));
-			map.put("RangeURI",
-					createRootedVClassOptionList(
-							baseProperty.getRangeVClassURI(),
-							beanForEditing.getRangeURI()));
-			
+			map.put("DomainURI", buildDomainOptionList());
+			map.put("RangeURI", buildRangeOptionList());
 			map.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",
 					RoleLevelOptionsSetup.getDisplayOptionsList(beanForEditing));
 			map.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",
 					RoleLevelOptionsSetup.getUpdateOptionsList(beanForEditing));
 			map.put("HiddenFromPublishBelowRoleLevelUsingRoleUri",
 					RoleLevelOptionsSetup.getPublishOptionsList(beanForEditing));
-
 			return map;
 		}
 
@@ -282,22 +266,73 @@ public class FauxPropertyRetryController extends BaseEditController {
 			}
 		}
 
-		private List<Option> createRootedVClassOptionList(String rootVClassUri,
-				String currentSelection) {
+		private List<Option> buildDomainOptionList() {
 			List<Option> list = new ArrayList<>();
-			list.add(new Option("", "(none specified)"));
-
-			if (rootVClassUri == null) {
+			if (baseProperty.getDomainVClassURI() == null) {
 				list.addAll(FormUtils.makeVClassOptionList(wadf,
-						currentSelection));
+						beanForEditing.getDomainURI()));
 			} else {
 				list.addAll(FormUtils.makeOptionListOfSubVClasses(wadf,
-						rootVClassUri, currentSelection));
+						baseProperty.getDomainVClassURI(),
+						beanForEditing.getDomainURI()));
 			}
-
+			list.add(0, new Option("", "(none specified)"));
 			return list;
 		}
 
+		private List<Option> buildRangeOptionList() {
+			List<Option> list = new ArrayList<>();
+			if (baseProperty.getRangeVClassURI() == null) {
+				list.addAll(FormUtils.makeVClassOptionList(wadf,
+						beanForEditing.getRangeURI()));
+			} else {
+				list.addAll(FormUtils.makeOptionListOfSubVClasses(wadf,
+						baseProperty.getRangeVClassURI(),
+						beanForEditing.getRangeURI()));
+				if (containsVCardKind(list)) {
+					mergeInAllVCardClasses(list);
+				}
+			}
+			list.add(0, new Option("", "(none specified)"));
+			return list;
+		}
+
+		private static final String VCARD_KIND_URI = "http://www.w3.org/2006/vcard/ns#Kind";
+		private static final String VCARD_NAMESPACE = "http://www.w3.org/2006/vcard/ns#";
+
+		private boolean containsVCardKind(List<Option> list) {
+			for (Option option : list) {
+				if (VCARD_KIND_URI.equals(option.getValue())) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Add to the list any class that is in the vCard namespace and is not
+		 * already in the list. Sort the list.
+		 */
+		private void mergeInAllVCardClasses(List<Option> list) {
+			Set<String> existingUrls = new HashSet<>();
+			for (Option option : list) {
+				existingUrls.add(option.getValue());
+			}
+			for (Option option : FormUtils.makeVClassOptionList(wadf,
+					beanForEditing.getRangeURI())) {
+				if (option.getValue().startsWith(VCARD_NAMESPACE)
+						&& !existingUrls.contains(option.getValue())) {
+					list.add(option);
+				}
+			}
+			Collections.sort(list, new Comparator<Option>() {
+				@Override
+				public int compare(Option o1, Option o2) {
+					return o1.getBody().compareTo(o2.getBody());
+				}
+			});
+		}
+
 		private static class OptionsBodyComparator implements
 				Comparator<Option> {
 			private final Collator collator;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/VClassDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/VClassDao.java
index 533b6e6d3..0c4ecce8a 100755
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/VClassDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/VClassDao.java
@@ -91,14 +91,14 @@ public interface VClassDao {
     /**
      * @param vc1
      * @param vc2
-     * @return true if subClassOf(vc1, vc2)
+     * @return true if vc1 subClassOf vc2
      */
     boolean isSubClassOf(VClass vc1, VClass vc2);
     
     /**
      * @param vc1
      * @param vc2
-     * @return true if subClassOf(vc1, vc2)
+     * @return true if vc1 subClassOf vc2
      */
     boolean isSubClassOf(String vclassURI1, String vclassURI2);
     
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
index 152de4498..2ebe030d6 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
@@ -59,6 +59,7 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 
 	private static final ObjectProperty QUALIFIED_BY_RANGE = createProperty(appContext("qualifiedBy"));
 	private static final ObjectProperty QUALIFIED_BY_DOMAIN = createProperty(appContext("qualifiedByDomain"));
+	private static final ObjectProperty QUALIFIED_BY_ROOT = createProperty(appContext("qualifiedByRoot"));
 	private static final ObjectProperty LIST_VIEW_FILE = createProperty(appContext("listViewConfigFile"));
 	private static final ObjectProperty DISPLAY_NAME = createProperty(appContext("displayName"));
 	private static final ObjectProperty PROPERTY_GROUP = createProperty(appContext("propertyGroup"));
@@ -217,6 +218,7 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 					fp.getRangeURI());
 			addPropertyResourceURINotEmpty(context, QUALIFIED_BY_DOMAIN,
 					fp.getDomainURI());
+			storeQualifiedByRoot(context, fp.getRangeURI());
 
 			fp.setConfigUri(getUnusedURI());
 			addPropertyResourceURIValue(context, HAS_CONFIGURATION,
@@ -269,6 +271,16 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 		}
 	}
 
+	private static final String VCARD_KIND_URI = "http://www.w3.org/2006/vcard/ns#Kind";
+	private static final String VCARD_NAMESPACE = "http://www.w3.org/2006/vcard/ns#";
+	private void storeQualifiedByRoot(OntResource context, String rangeURI) {
+		if (rangeURI.startsWith(VCARD_NAMESPACE)) {
+			updatePropertyResourceURIValue(context, QUALIFIED_BY_ROOT, VCARD_KIND_URI);
+		} else {
+			updatePropertyResourceURIValue(context, QUALIFIED_BY_ROOT, null);
+		}
+	}
+
 	@Override
 	public void updateFauxProperty(FauxProperty fp) {
 		log.debug("Updating FauxProperty: " + fp);
@@ -308,6 +320,7 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 					fp.getRangeURI());
 			updatePropertyResourceURIValue(context, QUALIFIED_BY_DOMAIN,
 					fp.getDomainURI());
+			storeQualifiedByRoot(context, fp.getRangeURI());
 
 			OntResource config = displayModel.createOntResource(fp
 					.getConfigUri());
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
index af0176614..e0910761a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
@@ -11,12 +11,14 @@ import org.apache.commons.logging.LogFactory;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
 import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.Property;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
+import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
@@ -101,29 +103,30 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
         String editUrl = UrlBuilder.getUrl(getPropertyEditRoute(), "uri", property.getURI());
         verboseDisplay.put("propertyEditUrl", editUrl);
         
-        if(isFauxProperty(property)) {
-            verboseDisplay.put("fauxProperty", "true");
+        FauxProperty fauxProperty = isFauxProperty(property);
+        if (fauxProperty != null) {
+        	verboseDisplay.put("fauxProperty", assembleFauxPropertyValues(fauxProperty));
         } 
     }
+
+	private FauxProperty isFauxProperty(Property prop) {
+		FauxPropertyDao fpDao = vreq.getUnfilteredWebappDaoFactory().getFauxPropertyDao();
+		return fpDao.getFauxPropertyByUris(prop.getDomainVClassURI(), prop.getURI(), prop.getRangeVClassURI());
+	}
     
-    private boolean isFauxProperty(Property prop) {
-        if(!(prop instanceof ObjectProperty)) {
-            return false;
-        }
-        ObjectPropertyDao opDao = vreq.getWebappDaoFactory().getObjectPropertyDao();
-        ObjectProperty baseProp = opDao.getObjectPropertyByURI(prop.getURI());
-        if(baseProp == null) {
-            return false;
-        }
-        ObjectProperty possibleFaux = (ObjectProperty) prop;
-        if (possibleFaux.getDomainPublic() == null) {
-            return (baseProp.getDomainPublic() != null);            
-        } else {
-            return !possibleFaux.getDomainPublic().equals(baseProp.getDomainPublic());
-        }
-    }
-    
-    protected abstract int getPropertyDisplayTier(Property p);
+	private Map<String, Object> assembleFauxPropertyValues(FauxProperty fp) {
+		Map<String, Object> map = new HashMap<>();
+		String editUrl = UrlBuilder.getUrl("/editForm", 
+				"controller", "FauxProperty", 
+				"baseUri", fp.getBaseURI(), 
+				"domainUri", fp.getDomainURI(), 
+				"rangeUri", fp.getRangeURI());
+		map.put("propertyEditUrl", editUrl);
+		map.put("displayName", fp.getDisplayName());
+		return map;
+	}
+
+	protected abstract int getPropertyDisplayTier(Property p);
     protected abstract Route getPropertyEditRoute();
     
     protected void setName(String name) {
diff --git a/webapp/web/templates/freemarker/lib/lib-properties.ftl b/webapp/web/templates/freemarker/lib/lib-properties.ftl
index cb948b83b..e7390c87a 100644
--- a/webapp/web/templates/freemarker/lib/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/lib/lib-properties.ftl
@@ -231,8 +231,10 @@ name will be used as the label. -->
     <#local verboseDisplay = property.verboseDisplay!>
     <#if verboseDisplay?has_content>       
         <section class="verbosePropertyListing">
-            <#if verboseDisplay.fauxProperty??>
-                 a faux property of
+            <#if verboseDisplay.fauxProperty?has_content>
+                 <a class="propertyLink" href="${verboseDisplay.fauxProperty.propertyEditUrl}" title="${i18n().name}">
+                 ${verboseDisplay.fauxProperty.displayName}
+                 </a>, a faux property of
             </#if>
             <a class="propertyLink" href="${verboseDisplay.propertyEditUrl}" title="${i18n().name}">${verboseDisplay.localName}</a> 
             (<span>${property.type?lower_case}</span> property);

From 9ce4b1e27587099cd7c0c55781dfd49efb07b354 Mon Sep 17 00:00:00 2001
From: Tim Worrall <tlw72@cornell.edu>
Date: Tue, 18 Nov 2014 10:10:22 -0500
Subject: [PATCH 13/30] some very minor jsp cleanup

---
 .../templates/edit/specific/fauxProperty_retry.jsp  | 13 ++++++-------
 .../web/templates/edit/specific/property_retry.jsp  |  7 +++----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/webapp/web/templates/edit/specific/fauxProperty_retry.jsp b/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
index de8b8af0c..74dbca746 100644
--- a/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
+++ b/webapp/web/templates/edit/specific/fauxProperty_retry.jsp
@@ -18,7 +18,7 @@
 
 <tr class="editformcell">
     <td style="vertical-align:top;" valign="top" colspan="2">
-        <b>Label for public display</b><br/><br/>
+        <br /><b>Label for public display</b><br/>
         <input type="text" class="fullWidthInput" name="DisplayName" value="<form:value name="DisplayName"/>" maxlength="80" />
         <c:set var="DisplayNameError"><form:error name="DisplayName"/></c:set>
         <c:if test="${!empty DisplayNameError}">
@@ -66,15 +66,12 @@
             <form:option name="HiddenFromDisplayBelowRoleLevelUsingRoleUri"/>
         </select>
     </td>
-    <td valign="top" colspan="2">
+    <td valign="top" colspan="1">
         <b>Update level</b><br/>
         <select name="ProhibitedFromUpdateBelowRoleLevelUsingRoleUri">
             <form:option name="ProhibitedFromUpdateBelowRoleLevelUsingRoleUri"/>
         </select>
     </td>
-</tr>
-
-<tr class="editformcell">
     <td valign="top" colspan="2">
         <b>Publish level</b><br />
         <select name="HiddenFromPublishBelowRoleLevelUsingRoleUri">
@@ -146,7 +143,7 @@
 <tr><td colspan="5"><hr class="formDivider"/></td></tr>
 
 <tr class="editformcell">
-    <td valign="top" colspan="2">
+    <td valign="top" colspan="5">
         <b>Custom entry form</b><br/>
         <input type="text" class="fullWidthInput" name="CustomEntryForm" value="<form:value name="CustomEntryForm"/>" />
             <c:set var="CustomEntryFormError"><form:error name="CustomEntryForm"/></c:set>
@@ -154,7 +151,9 @@
                 <span class="notice"><c:out value="${CustomEntryFormError}"/></span>
             </c:if>
     </td>
-    <td valign="top" colspan="2">
+</tr>
+<tr class="editformcell">
+	    <td valign="top" colspan="5">
         <b>Custom list view</b><br/>
         <input type="text" class="fullWidthInput" name="CustomListView" value="<form:value name="CustomListView"/>" />
             <c:set var="CustomListViewError"><form:error name="CustomListView"/></c:set>
diff --git a/webapp/web/templates/edit/specific/property_retry.jsp b/webapp/web/templates/edit/specific/property_retry.jsp
index 57e4ca2fe..b264bf52b 100644
--- a/webapp/web/templates/edit/specific/property_retry.jsp
+++ b/webapp/web/templates/edit/specific/property_retry.jsp
@@ -18,7 +18,7 @@
 <tr><td colspan="5"><hr class="formDivider"/></td></tr>
 <tr class="editformcell">
 	<td style="vertical-align:top;" valign="top" colspan="1">
-		<b>Ontology</b><br/><br/>
+		<b>Ontology</b><br/>
         <c:choose>
         	<c:when test="${_action eq 'update'}">
 				<select name="Namespace" disabled="disabled"><form:option name="Namespace"/></select><br/>
@@ -30,8 +30,7 @@
 		</c:choose>
 	</td>
 	<td style="vertical-align:top;" valign="top" colspan="2">
-		<b>Internal name*</b><br/>
-	    (RDF local name)<br/>
+		<b>Internal name*</b> (RDF local name)<br/>
         <c:choose>
         	<c:when test="${_action eq 'update'}">
         	    <input type="text" class="fullWidthInput" disabled="disabled" name="LocalName" value="<form:value name='LocalName'/>" /><br/>
@@ -49,7 +48,7 @@
         </c:if>
 	</td>
     <td style="vertical-align:top;" valign="top" colspan="2">
-        <b>Label for public display</b><br/><br/>
+        <b>Label for public display</b><br/>
         <input type="text" class="fullWidthInput" name="DomainPublic" value="<form:value name="DomainPublic"/>" maxlength="80" />
         <c:set var="DomainPublicError"><form:error name="DomainPublic"/></c:set>
         <c:if test="${!empty DomainPublicError}">

From dfb9b7517ecf6b5f72ae45b18b950c4cb0f5f821 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Wed, 19 Nov 2014 12:13:19 -0500
Subject: [PATCH 14/30] VIVO-774 When merging property lists, distinguish faux
 property from its base.

Merging list of populated properties with all possible properties,
   we don't want to consider two properties equivalent just on the basis of base URI and label (domainPublic)
Why was this previously considered to be a good thing?
---
 .../individual/GroupedPropertyList.java       | 79 ++-----------------
 1 file changed, 6 insertions(+), 73 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
index fa2f3c0ec..013f6afcc 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
@@ -20,10 +20,10 @@ import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.Property;
 import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
 import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao.FullPropertyKey;
 import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
 import edu.cornell.mannlib.vitro.webapp.dao.PropertyInstanceDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
@@ -42,7 +42,6 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
  */
 public class GroupedPropertyList extends BaseTemplateModel {
 
-    private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(GroupedPropertyList.class);
     private static final int MAX_GROUP_DISPLAY_RANK = 99;
 
@@ -247,16 +246,9 @@ public class GroupedPropertyList extends BaseTemplateModel {
                     }
                     boolean addToList = true;
                     for(ObjectProperty op : populatedObjectPropertyList) {
-                        RedundancyReason reason = redundant(op, piOp); 
-                        if(reason != null) {
-                            addToList = false;
-                            if (reason == RedundancyReason.LABEL_AND_URI_MATCH 
-                                    && moreRestrictiveRange(piOp, op, wadf)) {
-                                op.setRangeVClassURI(piOp.getRangeVClassURI());
-                                op.setRangeVClass(piOp.getRangeVClass());
-                            }
-                            break;
-                        } 
+                    	if (redundant(op, piOp)) {
+                    		addToList = false;
+                    	}
                     }
                     if(addToList) {
                         propertyList.add(piOp);         
@@ -281,67 +273,8 @@ public class GroupedPropertyList extends BaseTemplateModel {
         return propertyList;
     }
     
-    private enum RedundancyReason {
-         LABEL_AND_URI_MATCH, LABEL_URI_DOMAIN_AND_RANGE_MATCH   
-    }
-    
-    private boolean moreRestrictiveRange(ObjectProperty piOp, ObjectProperty op, 
-            WebappDaoFactory wadf) {
-        if(piOp.getRangeVClassURI() == null) {
-            return false;
-        } else if (op.getRangeVClassURI() == null) {
-            return (piOp.getRangeVClassURI() != null);
-        } else {
-        	//Check and see if the range vclass exists for the possible piOp and populated op properties,
-        	//because for populated properties, if the range class is a union,
-        	//blank nodes will be broken and the code should instead use the existing or piOp range class uri
-        	VClass piOpRangeClass = wadf.getVClassDao().getVClassByURI(piOp.getRangeVClassURI());
-        	VClass opRangeClass = wadf.getVClassDao().getVClassByURI(op.getRangeVClassURI());
-        	//if the possible range class exists but the populated one does not, then return true to allow the possible
-        	//class to be utilized
-        	if(piOpRangeClass != null && opRangeClass == null) return true;
-            return (wadf.getVClassDao().isSubClassOf(
-                    piOp.getRangeVClassURI(), op.getRangeVClassURI()));
-        }
-    }
-    
-    private RedundancyReason redundant(ObjectProperty op, ObjectProperty op2) {
-        if (op2.getURI() == null) {
-            return null;
-        }
-        boolean uriMatches = (op.getURI() != null 
-                && op.getURI().equals(op2.getURI()));
-        boolean domainMatches = false;
-        boolean rangeMatches = false;
-        boolean labelMatches = false;
-        if(op.getDomainPublic() == null) {
-            if(op2.getDomainPublic() == null) {
-                labelMatches = true;
-            }
-        } else if (op.getDomainPublic().equals(op2.getDomainPublic())) {
-            labelMatches = true;
-        }
-        if(uriMatches && labelMatches) {
-            return RedundancyReason.LABEL_AND_URI_MATCH;
-        }
-        if(op.getDomainVClassURI() == null) {
-            if(op2.getDomainVClassURI() == null) {
-                domainMatches = true;   
-            }
-        } else if (op.getDomainVClassURI().equals(op2.getDomainVClassURI())) {
-            domainMatches = true;
-        }
-        if(op.getRangeVClassURI() == null) {
-            if (op2.getRangeVClassURI() == null) {
-                rangeMatches = true;
-            }
-        } else if (op.getRangeVClassURI().equals(op2.getRangeVClassURI())) {
-            rangeMatches = true;
-        }
-        if (uriMatches && domainMatches && rangeMatches) {
-            return RedundancyReason.LABEL_URI_DOMAIN_AND_RANGE_MATCH;
-        }
-        return null;
+    private boolean redundant(ObjectProperty op, ObjectProperty op2) {
+    	return new FullPropertyKey(op).equals(new FullPropertyKey(op2));
     }
 
     private void addObjectPropertyToPropertyList(String propertyUri, String domainUri, String rangeUri,

From 474b0abb4470d1b05bf885fc1dba0de87f61d8c6 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Wed, 19 Nov 2014 15:55:56 -0500
Subject: [PATCH 15/30] VIVO-774 Fix display of unpopulated properties

Unpopulated properties with no domain URI were not recognized as faux properties
Use the faux property display name instead of the base property name.
---
 .../vitro/webapp/dao/jena/FauxPropertyDaoJena.java  | 13 +++++++++----
 .../individual/DataPropertyTemplateModel.java       |  3 +--
 .../individual/ObjectPropertyTemplateModel.java     |  4 +---
 .../individual/PropertyTemplateModel.java           | 12 +++---------
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
index 6b3a4a50d..dfed53060 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java
@@ -26,6 +26,7 @@ import com.hp.hpl.jena.query.ResultSet;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
 import com.hp.hpl.jena.rdf.model.ResIterator;
 import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.vocabulary.OWL;
 import com.hp.hpl.jena.vocabulary.RDF;
 
 import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
@@ -273,9 +274,11 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 
 	private static final String VCARD_KIND_URI = "http://www.w3.org/2006/vcard/ns#Kind";
 	private static final String VCARD_NAMESPACE = "http://www.w3.org/2006/vcard/ns#";
+
 	private void storeQualifiedByRoot(OntResource context, String rangeURI) {
 		if (rangeURI.startsWith(VCARD_NAMESPACE)) {
-			updatePropertyResourceURIValue(context, QUALIFIED_BY_ROOT, VCARD_KIND_URI);
+			updatePropertyResourceURIValue(context, QUALIFIED_BY_ROOT,
+					VCARD_KIND_URI);
 		} else {
 			updatePropertyResourceURIValue(context, QUALIFIED_BY_ROOT, null);
 		}
@@ -504,8 +507,6 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 			+ "        :hasConfiguration ?config . \n" //
 			+ "} \n"; //
 
-	// TODO Add a filter that will reject solutions that include
-	// qualifiedByDomain
 	private static final String QUERY_LOCATE_CONFIG_CONTEXT_WITH_NO_DOMAIN = "" //
 			+ "PREFIX : <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" //
 			+ "\n" //
@@ -515,6 +516,9 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 			+ "        :configContextFor ?baseUri ; \n" //
 			+ "        :qualifiedBy ?rangeUri ; \n" //
 			+ "        :hasConfiguration ?config . \n" //
+			+ "     FILTER NOT EXISTS { \n" //
+			+ "        ?context :qualifiedByDomain ?domainUri \n" //
+			+ "     } \n" //
 			+ "} \n"; //
 
 	private static class ParserLocateConfigContext extends
@@ -558,7 +562,8 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 				String baseUri, String rangeUri) {
 			try (LockedOntModel displayModel = lockableDisplayModel.read()) {
 				String queryString;
-				if (domainUri == null || domainUri.trim().isEmpty()) {
+				if (domainUri == null || domainUri.trim().isEmpty()
+						|| domainUri.equals(OWL.Thing.getURI())) {
 					queryString = bindValues(
 							QUERY_LOCATE_CONFIG_CONTEXT_WITH_NO_DOMAIN,
 							uriValue("baseUri", baseUri),
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java
index de644d77c..9cba71164 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java
@@ -69,8 +69,7 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
     DataPropertyTemplateModel(DataProperty dp, Individual subject, VitroRequest vreq, 
             boolean editing, List<DataProperty> populatedDataPropertyList) {
         
-        super(dp, subject, vreq);
-        setName(dp.getPublicName());
+        super(dp, subject, vreq, dp.getPublicName());
 
         // Get the config for this data property
         try {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
index 9401dd50e..ceb2358f3 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
@@ -86,8 +86,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
             boolean editing)
         throws InvalidConfigurationException {
         
-        super(op, subject, vreq); 
-        setName(op.getDomainPublic());
+        super(op, subject, vreq, op.getDomainPublic());
         
         sortDirection = op.getDomainEntitySortDirection();
         domainUri = op.getDomainVClassURI();
@@ -232,7 +231,6 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
     public static ObjectPropertyTemplateModel getObjectPropertyTemplateModel(ObjectProperty op, 
             Individual subject, VitroRequest vreq, boolean editing, 
             List<ObjectProperty> populatedObjectPropertyList) {
-        
         if (op.getCollateBySubclass()) {
             try {
                 return new CollatedObjectPropertyTemplateModel(op, subject, vreq, editing, populatedObjectPropertyList);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
index e0910761a..dca3943b5 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
@@ -13,13 +13,11 @@ import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
 import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
 import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.Property;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
 import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
-import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
 
@@ -42,15 +40,14 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
     protected String addUrl;
     
     private String name;
-
-
        
-    PropertyTemplateModel(Property property, Individual subject, VitroRequest vreq) {
+    PropertyTemplateModel(Property property, Individual subject, VitroRequest vreq, String name) {
         this.vreq = vreq;
         subjectUri = subject.getURI(); 
         this.property = property;
         propertyUri = property.getURI();
         localName = property.getLocalName();
+        this.name = name;
         setVerboseDisplayValues(property);
         addUrl = "";
         
@@ -106,6 +103,7 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
         FauxProperty fauxProperty = isFauxProperty(property);
         if (fauxProperty != null) {
         	verboseDisplay.put("fauxProperty", assembleFauxPropertyValues(fauxProperty));
+        	this.name = fauxProperty.getDisplayName();
         } 
     }
 
@@ -129,10 +127,6 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
 	protected abstract int getPropertyDisplayTier(Property p);
     protected abstract Route getPropertyEditRoute();
     
-    protected void setName(String name) {
-        this.name = name;
-    }
-    
     public String toString() {
         return String.format("%s on %s",
                              propertyUri != null ? propertyUri : "null Prop URI",

From e79ace9d55a727b9559c362ca519c3e75dcdc6c6 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Wed, 19 Nov 2014 17:03:13 -0500
Subject: [PATCH 16/30] VIVO-774 Show correct property name

Also, pre-populate the custom entry generator if the base property has one.
---
 .../edit/FauxPropertyRetryController.java           |  1 +
 .../individual/PropertyTemplateModel.java           | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
index e271dc1ad..9c6cdfd3a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
@@ -180,6 +180,7 @@ public class FauxPropertyRetryController extends BaseEditController {
 					.getHiddenFromPublishBelowRoleLevel());
 			fp.setProhibitedFromUpdateBelowRoleLevel(base
 					.getProhibitedFromUpdateBelowRoleLevel());
+			fp.setCustomEntryForm(base.getCustomEntryForm());
 			log.debug("Created new FauxProperty: " + fp);
 			return fp;
 		}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
index dca3943b5..d8a0186fd 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
@@ -40,6 +40,7 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
     protected String addUrl;
     
     private String name;
+    private FauxProperty fauxProperty;
        
     PropertyTemplateModel(Property property, Individual subject, VitroRequest vreq, String name) {
         this.vreq = vreq;
@@ -48,12 +49,14 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
         propertyUri = property.getURI();
         localName = property.getLocalName();
         this.name = name;
-        setVerboseDisplayValues(property);
         addUrl = "";
         
-        // Do in subclass constructor. The label has not been set on the property, and the
-        // means of getting the label differs between object and data properties.
-        // this.name = property.getLabel();
+        fauxProperty = isFauxProperty(property);
+        if (fauxProperty != null) {
+        	this.name = fauxProperty.getDisplayName();
+        } 
+
+        setVerboseDisplayValues(property);
     }
     
     protected void setVerboseDisplayValues(Property property) {  
@@ -100,10 +103,8 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
         String editUrl = UrlBuilder.getUrl(getPropertyEditRoute(), "uri", property.getURI());
         verboseDisplay.put("propertyEditUrl", editUrl);
         
-        FauxProperty fauxProperty = isFauxProperty(property);
         if (fauxProperty != null) {
         	verboseDisplay.put("fauxProperty", assembleFauxPropertyValues(fauxProperty));
-        	this.name = fauxProperty.getDisplayName();
         } 
     }
 

From 6e212e28897ebf97129fcc06d0c774f3eb437f23 Mon Sep 17 00:00:00 2001
From: Tim Worrall <tlw72@cornell.edu>
Date: Thu, 20 Nov 2014 10:57:46 -0500
Subject: [PATCH 17/30] VIVO-724: minor clean up of verbose property display.

---
 webapp/web/templates/freemarker/lib/lib-properties.ftl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/web/templates/freemarker/lib/lib-properties.ftl b/webapp/web/templates/freemarker/lib/lib-properties.ftl
index e7390c87a..3515cf16c 100644
--- a/webapp/web/templates/freemarker/lib/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/lib/lib-properties.ftl
@@ -233,14 +233,14 @@ name will be used as the label. -->
         <section class="verbosePropertyListing">
             <#if verboseDisplay.fauxProperty?has_content>
                  <a class="propertyLink" href="${verboseDisplay.fauxProperty.propertyEditUrl}" title="${i18n().name}">
-                 ${verboseDisplay.fauxProperty.displayName}
-                 </a>, a faux property of
+                 ${verboseDisplay.fauxProperty.displayName}</a>
+                 is a faux property of
             </#if>
             <a class="propertyLink" href="${verboseDisplay.propertyEditUrl}" title="${i18n().name}">${verboseDisplay.localName}</a> 
             (<span>${property.type?lower_case}</span> property);
-            order in group: <span>${verboseDisplay.displayRank};</span> 
-            display level: <span>${verboseDisplay.displayLevel};</span>
-            update level: <span>${verboseDisplay.updateLevel};</span>
+            order in group: <span>${verboseDisplay.displayRank}</span>;
+            display level: <span>${verboseDisplay.displayLevel}</span>;
+            update level: <span>${verboseDisplay.updateLevel}</span>;
             publish level: <span>${verboseDisplay.publishLevel}</span>
         </section>
     </#if>

From b8cb95d252ccd32b114a5a5920bf901d91a4669d Mon Sep 17 00:00:00 2001
From: Tim Worrall <tlw72@cornell.edu>
Date: Fri, 5 Dec 2014 16:57:09 -0500
Subject: [PATCH 18/30] VIVO-922: updates for new faux listing functionality.
 New controller, template and js file, updated web.xml and site admin page,
 and updates to the all.properties

---
 .../languages/es_GO/i18n/all_es_GO.properties |   8 +-
 .../freemarker/BaseSiteAdminController.java   |   1 +
 .../ListFauxPropertiesController.java         | 233 ++++++++++++++++++
 webapp/web/WEB-INF/web.xml                    |   9 +
 webapp/web/i18n/all.properties                |   8 +-
 .../siteAdmin/fauxPropertiesListingUtils.js   |  19 ++
 .../siteAdmin-fauxPropertiesList.ftl          | 123 +++++++++
 .../siteAdmin/siteAdmin-ontologyEditor.ftl    |   1 +
 8 files changed, 400 insertions(+), 2 deletions(-)
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java
 create mode 100644 webapp/web/js/siteAdmin/fauxPropertiesListingUtils.js
 create mode 100644 webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl

diff --git a/webapp/languages/es_GO/i18n/all_es_GO.properties b/webapp/languages/es_GO/i18n/all_es_GO.properties
index fb56a2344..6acd5e2a5 100644
--- a/webapp/languages/es_GO/i18n/all_es_GO.properties
+++ b/webapp/languages/es_GO/i18n/all_es_GO.properties
@@ -874,4 +874,10 @@ view_labels_for = Ver Etiquetas de
 select_an_existing_document = Seleccione un documento existente
 
 datetime_year_required = Intervalos de fecha / hora deben empezar por un año. Ingrese una Fecha de inicio, un fin de año o los dos.
-select_a_language = Seleccione un idioma
\ No newline at end of file
+select_a_language = Seleccione un idioma
+
+base_property_capitalized = Base propiedad
+faux_property_capitalized = Faux propiedad
+faux_property_listing = Lista de faux propiedades
+faux_property_by_base = Faux propiedades por base propriedad
+faux_property_alpha = Faux propiedades en orden alfabético
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
index 5bcdbc53e..16362f70f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
@@ -187,6 +187,7 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
             urls.put("classHierarchy", UrlBuilder.getUrl("/showClassHierarchy"));
             urls.put("classGroups", UrlBuilder.getUrl("/listGroups"));
             urls.put("dataPropertyHierarchy", UrlBuilder.getUrl("/showDataPropertyHierarchy"));
+            urls.put("fauxPropertyList", UrlBuilder.getUrl("/listFauxProperties"));
             urls.put("propertyGroups", UrlBuilder.getUrl("/listPropertyGroups"));            
             urls.put("objectPropertyHierarchy", UrlBuilder.getUrl("/showObjectPropertyHierarchy", new ParamMap("iffRoot", "true")));
             map.put("urls", urls);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java
new file mode 100644
index 000000000..f2303bfcb
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java
@@ -0,0 +1,233 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import net.sf.json.util.JSONUtils;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
+import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
+import edu.cornell.mannlib.vitro.webapp.web.URLEncoder;
+
+public class ListFauxPropertiesController extends FreemarkerHttpServlet {
+
+	private static final Log log = LogFactory.getLog(ListFauxPropertiesController.class.getName());
+	
+    private static final String TEMPLATE_NAME = "siteAdmin-fauxPropertiesList.ftl";
+
+    private ObjectPropertyDao opDao = null;
+    private PropertyGroupDao pgDao = null;
+    private FauxPropertyDao fpDao = null;
+	private String notFoundMessage = "";
+	
+    @Override
+	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
+		return SimplePermission.EDIT_ONTOLOGY.ACTION;
+	}
+    
+    @Override
+    protected ResponseValues processRequest(VitroRequest vreq) {
+
+        Map<String, Object> body = new HashMap<String, Object>();
+        try {
+
+            String displayOption = "";
+            
+            if ( vreq.getParameter("displayOption") != null ) {
+                displayOption = vreq.getParameter("displayOption");
+            }
+            else {
+                displayOption = "listing";
+            }
+            body.put("displayOption", displayOption);
+            
+            if ( displayOption.equals("listing") ) {
+                body.put("pageTitle", "Faux Property Listing");
+            }
+            else {
+                body.put("pageTitle", "Faux Properties by Base Property");
+            }
+                        
+            opDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getObjectPropertyDao();
+			fpDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getFauxPropertyDao();
+			pgDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getPropertyGroupDao();
+
+			List<ObjectProperty> objectProps = null;
+            objectProps = opDao.getRootObjectProperties();
+
+			Map<String, Object> allFauxProps = new TreeMap<String, Object>();
+			// get the faux depending on the display option 
+			if ( displayOption.equals("listing") ) {
+                allFauxProps = getFauxPropertyList(objectProps);
+            }
+			else {
+				allFauxProps = getFauxByBaseList(objectProps);
+			}
+			
+			log.debug(allFauxProps.toString());
+
+			if ( notFoundMessage.length() == 0 ) {
+				body.put("message", notFoundMessage);
+			}
+			else {
+            	body.put("fauxProps", allFauxProps);
+			}
+                    
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+        return new TemplateResponseValues(TEMPLATE_NAME, body);
+
+    }
+
+	private TreeMap<String, Object> getFauxPropertyList(List<ObjectProperty> objectProps) {
+		List<FauxProperty> fauxProps = null;
+		TreeMap<String, Object> theFauxProps = new TreeMap<String, Object>();
+        if ( objectProps != null ) {	
+            Iterator<ObjectProperty> opIt = objectProps.iterator();
+            if ( !opIt.hasNext()) {
+                notFoundMessage = "No object properties found."; 
+            } 
+			else {
+                while (opIt.hasNext()) {
+					
+                    ObjectProperty op = opIt.next();
+					String baseURI = op.getURI();
+                    fauxProps = fpDao.getFauxPropertiesForBaseUri(baseURI);
+
+					if ( fauxProps != null ) {
+						Iterator<FauxProperty> fpIt = fauxProps.iterator();
+						if ( !fpIt.hasNext()) {
+							notFoundMessage = "No faux properties found."; 
+						}
+						else {
+							while (fpIt.hasNext()) {
+								// No point in getting these unless we have a faux property
+								String baseLabel = getDisplayLabel(op) == null ? "(no name)" : getDisplayLabel(op);
+								String baseLocalName = op.getLocalNameWithPrefix();
+								baseLabel = baseLabel.substring(0,baseLabel.indexOf("("));
+								baseLabel += "(" + baseLocalName + ")";
+								// get the info we need from the faux property
+								FauxProperty fp = fpIt.next();
+								String fauxLabel = fp.getDisplayName();
+								String rangeLabel = fp.getRangeLabel();
+								String rangeURI = fp.getRangeURI();
+								String domainLabel = fp.getDomainLabel();
+								String domainURI = fp.getDomainURI();
+								String groupURI = fp.getGroupURI();
+								// FauxProperty only gets groupURI but we want the label
+								PropertyGroup pGroup = pgDao.getGroupByURI(groupURI);
+								String groupLabel = ( pGroup == null ) ? "unspecified" : pGroup.getName();
+								// store all the strings in a hash with the faux property label as the key
+								Map<String, Object> tmpHash = new HashMap<String, Object>();
+								tmpHash.put("base", baseLabel);
+								tmpHash.put("baseURI", baseURI);
+								tmpHash.put("group", groupLabel);
+								tmpHash.put("range", rangeLabel);
+								tmpHash.put("rangeURI", rangeURI);
+								tmpHash.put("domain", domainLabel);
+								tmpHash.put("domainURI", domainURI);
+								// add the faux and its details to the treemap	
+								theFauxProps.put(fauxLabel, tmpHash);
+							} 
+						} 
+					}
+            	}	
+            }
+        }
+        return theFauxProps;
+	}
+
+	private TreeMap<String, Object> getFauxByBaseList(List<ObjectProperty> objectProps) {
+		List<FauxProperty> fauxProps = null;
+		TreeMap<String, Object> fauxByBaseProps = new TreeMap<String, Object>();
+        if ( objectProps != null ) {	
+            Iterator<ObjectProperty> opIt = objectProps.iterator();
+            if ( !opIt.hasNext()) {
+                notFoundMessage = "No object properties found."; 
+            } 
+			else {
+                while (opIt.hasNext()) {
+					TreeMap<String, Object> fauxForGivenBase = new TreeMap<String, Object>();
+                    ObjectProperty op = opIt.next();
+					String baseURI = op.getURI();
+                    fauxProps = fpDao.getFauxPropertiesForBaseUri(baseURI);
+
+					if ( fauxProps != null ) {
+						Iterator<FauxProperty> fpIt = fauxProps.iterator();
+						if ( !fpIt.hasNext()) {
+							notFoundMessage = "No faux properties found."; 
+						}
+						else {
+							String baseLabel = getDisplayLabel(op) == null ? "(no name)" : getDisplayLabel(op);
+							String baseLocalName = op.getLocalNameWithPrefix();
+							baseLabel = baseLabel.substring(0,baseLabel.indexOf("("));
+							baseLabel += "(" + baseLocalName + ")" + "|" + baseURI;
+							while (fpIt.hasNext()) {
+								// get the info we need from the faux property
+								FauxProperty fp = fpIt.next();
+								String fauxLabel = fp.getDisplayName();
+								String rangeLabel = fp.getRangeLabel();
+								String rangeURI = fp.getRangeURI();
+								String domainLabel = fp.getDomainLabel();
+								String domainURI = fp.getDomainURI();
+								String groupURI = fp.getGroupURI();
+								// FauxProperty only gets groupURI but we want the label
+								PropertyGroup pGroup = pgDao.getGroupByURI(groupURI);
+								String groupLabel = ( pGroup == null ) ? "unspecified" : pGroup.getName();
+								// store all the strings in a hash with the faux property label as the key
+								Map<String, Object> tmpHash = new HashMap<String, Object>();
+								tmpHash.put("baseURI", baseURI);
+								tmpHash.put("group", groupLabel);
+								tmpHash.put("range", rangeLabel);
+								tmpHash.put("rangeURI", rangeURI);
+								tmpHash.put("domain", domainLabel);
+								tmpHash.put("domainURI", domainURI);
+								// add the faux and its details to the treemap	
+								fauxForGivenBase.put(fauxLabel, tmpHash);
+							}
+							 fauxByBaseProps.put(baseLabel, fauxForGivenBase);
+						} 
+					}
+            	}	
+            }
+        }
+        return fauxByBaseProps;
+	}
+
+    /*
+     * should never be null
+     */
+    public static String getDisplayLabel(ObjectProperty op) {
+        String displayLabel = op.getPickListName();
+    	displayLabel = (displayLabel != null && displayLabel.length() > 0)  
+			? displayLabel 
+			: op.getLocalName();
+		return (displayLabel != null) ? displayLabel : "[object property]" ;
+    }
+
+}
\ No newline at end of file
diff --git a/webapp/web/WEB-INF/web.xml b/webapp/web/WEB-INF/web.xml
index b13c3fa0e..6c8a7db6b 100644
--- a/webapp/web/WEB-INF/web.xml
+++ b/webapp/web/WEB-INF/web.xml
@@ -762,6 +762,15 @@
     <url-pattern>/showDataPropertyHierarchy</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>ListPropertyWebappsController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListPropertyWebappsController</servlet-class>
diff --git a/webapp/web/i18n/all.properties b/webapp/web/i18n/all.properties
index 3f7c0ef3c..ae220a033 100644
--- a/webapp/web/i18n/all.properties
+++ b/webapp/web/i18n/all.properties
@@ -887,4 +887,10 @@ view_labels_for = View Labels for
 select_an_existing_document = Select an existing document
 
 datetime_year_required = Date/time intervals must begin with a year. Enter either a Start Year, an End Year or both.
-select_a_language = Select a language
\ No newline at end of file
+select_a_language = Select a language
+
+base_property_capitalized = Base Property
+faux_property_capitalized = Faux Property
+faux_property_listing = Faux Property Listing
+faux_property_by_base = faux properties by base property
+faux_property_alpha = faux properties alphabetically
\ No newline at end of file
diff --git a/webapp/web/js/siteAdmin/fauxPropertiesListingUtils.js b/webapp/web/js/siteAdmin/fauxPropertiesListingUtils.js
new file mode 100644
index 000000000..61ee8cfe3
--- /dev/null
+++ b/webapp/web/js/siteAdmin/fauxPropertiesListingUtils.js
@@ -0,0 +1,19 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+  
+    var fauxPropertiesListingUtils = {
+    onLoad: function() {
+		this.initObjects();
+        this.bindEventListeners();
+    },
+
+    initObjects: function() { 
+		this.select = $('select#displayOption');
+        this.theForm = $('form#fauxListing');
+    },
+
+    bindEventListeners: function() {
+        this.select.change(function() {
+        	fauxPropertiesListingUtils.theForm.submit();
+        });
+	}
+}
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl
new file mode 100644
index 000000000..748197437
--- /dev/null
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl
@@ -0,0 +1,123 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- 
+        Used to display both the object and data property hierarchies, though there are
+        separate controllers for those. Also used to display lists of "all" object and 
+        data properties, though there are separate controllers for those, too.
+ -->
+ <#if propertyType??>
+     <#assign propType = propertyType>
+<#else>
+    <#assign propType = "group">
+</#if>
+
+
+<section role="region">
+  <h2>${pageTitle!}</h2>
+  <#if message?has_content>
+	<p>${message}</p>
+  <#else>
+  <#if !displayOption?has_content>
+        <#assign displayOption = "listing">
+  </#if>
+  <form name="fauxListingForm" id="fauxListing" action="listFauxProperties" method="post" role="classHierarchy">
+    <label id="displayOptionLabel" class="inline">${i18n().display_options}</label>
+    <select id="displayOption" name="displayOption">
+      <option value="listing" <#if displayOption == "listing">selected</#if> >faux properties alphabetically</option>
+      <option value="byBase" <#if displayOption == "byBase">selected</#if> >faux properties by base property</option>
+    </select>
+  </form>
+  <section id="container" style="margin-top:10px">
+  <#if displayOption == "listing" >
+    <#assign keys = fauxProps?keys/>
+    <#list keys as key>
+      <#assign ks = fauxProps[key] />
+      <section id="classContainer1">
+      <div>
+        <a href='editForm?controller=FauxProperty&baseUri=${ks["baseURI"]?url!}&<#if ks["domainURI"]?has_content>domainUri=${ks["domainURI"]?url}&</#if>rangeUri=${ks["rangeURI"]?url!}'>${key}</a>
+      </div>
+      <table id="classHierarchy1" class="classHierarchy">
+        <tbody>
+          <tr>
+            <td class="classDetail">${i18n().base_property_capitalized}:</td>
+	        <td><a href='propertyEdit?uri=${ks["baseURI"]?url!}'>${ks["base"]!}</a></td>
+	      </tr>
+	      <tr>
+            <td class="classDetail">${i18n().group_capitalized}:</td>
+	        <td>${ks["group"]?capitalize}</td>
+	      </tr>
+	      <tr>
+            <td class="classDetail">${i18n().domain_class}:</td>
+            <td>
+              ${ks["domain"]!}
+              <span class="rangeClass">${i18n().range_class}:</span>
+		      ${ks["range"]!}
+            </td>
+          </tr>
+        </tbody>
+      </table>
+      </section>	
+    </#list>
+  <#else>
+	<#assign keys = fauxProps?keys />
+	<#list keys as key>
+      <#assign fauxList = fauxProps[key] />
+      <section id="classContainer1">
+		<#assign baseLabel = key?substring(0,key?index_of("|")) />
+		<#assign baseUri = key?substring(key?index_of("|")+1) />
+        <div>
+          <a href='propertyEdit?uri=${baseUri?url}'>${baseLabel}</a>
+        </div>
+	    <#assign keysTwo = fauxList?keys />
+		<#assign firstLoop = true />
+	    <#list keysTwo as k2>
+	      <#assign faux = fauxList[k2] />
+        <table id="classHierarchy1" class="classHierarchy" <#if !firstLoop >style="margin-top:-16px"</#if>>
+          <tbody>
+              <tr>
+                <td class="classDetail">${i18n().faux_property_capitalized}:</td>
+	            <td><a href='editForm?controller=FauxProperty&baseUri=${faux["baseURI"]?url!}&<#if faux["domainURI"]?has_content>domainUri=${faux["domainURI"]?url}&</#if>rangeUri=${faux["rangeURI"]?url!}'>${k2}</a></td>
+	          </tr>
+	          <tr>
+                <td class="classDetail">${i18n().group_capitalized}:</td>
+	            <td>${faux["group"]?capitalize}
+   	            </td>
+	          </tr>
+	          <tr>
+                <td class="classDetail">${i18n().domain_class}:</td>
+                <td>
+                  ${faux["domain"]!}
+                  <span class="rangeClass">${i18n().range_class}:</span>
+		          ${faux["range"]!}
+                </td>
+              </tr>
+		    </tbody>
+		  </table>
+		  <#assign firstLoop = false />
+      </#list>
+      </section>	
+	</#list>
+  </#if> 
+  </section>
+  </#if>
+</section>
+
+<script language="javascript" type="text/javascript" >
+    var i18nStrings = {
+        '',
+    };
+</script>
+
+
+<script language="javascript" type="text/javascript" >
+$(document).ready(function() {
+    fauxPropertiesListingUtils.onLoad();
+});    
+</script>
+
+
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/classHierarchy.css" />')}
+
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/siteAdmin/fauxPropertiesListingUtils.js"></script>')}
+              
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
index 946861559..7db60e3be 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
@@ -33,6 +33,7 @@
         <ul role="navigation">
             <li role="listitem"><a href="${ontologyEditor.urls.objectPropertyHierarchy}" title="${i18n().object_property_hierarchy}">${i18n().object_property_hierarchy}</a></li>
             <li role="listitem"><a href="${ontologyEditor.urls.dataPropertyHierarchy}" title="${i18n().data_property_hierarchy}">${i18n().data_property_hierarchy}</a></li>
+            <li role="listitem"><a href="${ontologyEditor.urls.fauxPropertyList}" title="${i18n().data_property_hierarchy}">${i18n().faux_property_listing}</a></li>
             <li role="listitem"><a href="${ontologyEditor.urls.propertyGroups}" title="${i18n().property_groups}">${i18n().property_groups}</a></li>
         </ul>
         

From 4b71c1d6bb163ca704d81b0dd69523ef4483bfd0 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Mon, 8 Dec 2014 10:54:07 -0500
Subject: [PATCH 19/30] VIVO-778 Refactor the connections to the TBox reasoner.

Replace PelletListener with a TBoxReasonerModule in the Application.
   The reasoner will be accessible only through here, not as a context attribute or through the WebappDaoFactory.
Split out the initialization of the TBox reasoner from SimpleReasonerSetup.
Break out the filtering of TBox changes into a ConfiguredReasonerListener.
Refactor the threading logic into a BasicTBoxReasonerDriver.
   Add a factory for creating VitroBackgroundThreads in an Executor.
Isolate the actual reasoner into a TBoxReasoner implementation. In this case, PelletTBoxReasoner.
Combine the consistency flag, error flag, explanation, and running status into one TBoxReasonerStatus object.
---
 webapp/config/log4j.properties                |   1 -
 .../webapp/application/ApplicationImpl.java   |  48 ++
 .../freemarker/BaseSiteAdminController.java   |  34 +-
 .../controller/jena/JenaAdminActions.java     |   7 +-
 .../webapp/dao/jena/DataPropertyDaoJena.java  |   9 +-
 .../vitro/webapp/dao/jena/JenaBaseDao.java    |   5 +-
 .../webapp/dao/jena/WebappDaoFactoryJena.java |  15 -
 .../ObjectPropertyStatementPattern.java       |  52 --
 ...ObjectPropertyStatementPatternFactory.java |  26 -
 .../dao/jena/pellet/PelletListener.java       | 732 ------------------
 .../fields/IndividualsViaVClassOptions.java   |  19 +-
 .../vitro/webapp/modules/Application.java     |   3 +
 .../tboxreasoner/TBoxReasonerModule.java      |  29 +
 .../tboxreasoner/TBoxReasonerStatus.java      |  29 +
 .../webapp/servlet/setup/FileGraphSetup.java  |   7 -
 .../servlet/setup/SimpleReasonerSetup.java    |  67 +-
 .../servlet/setup/UpdateKnowledgeBase.java    |   6 +-
 .../ConfiguredReasonerListener.java           | 349 +++++++++
 .../tboxreasoner/InferenceModelUpdater.java   | 119 +++
 .../tboxreasoner/PatternListBuilder.java      |  81 ++
 .../ReasonerConfiguration.java                |  84 +-
 .../ReasonerStatementPattern.java             |  94 +++
 .../webapp/tboxreasoner/TBoxChanges.java      |  83 ++
 .../webapp/tboxreasoner/TBoxReasoner.java     |  87 +++
 .../tboxreasoner/TBoxReasonerDriver.java      |  17 +
 .../impl/BasicTBoxReasonerDriver.java         | 253 ++++++
 .../impl/pellet/PelletTBoxReasoner.java       | 114 +++
 .../impl/pellet/PelletTBoxReasonerModule.java | 102 +++
 .../utils/threads/VitroBackgroundThread.java  |  23 +
 .../vitro/webapp/modules/ApplicationStub.java |   8 +
 .../WEB-INF/resources/startup_listeners.txt   |   1 +
 .../siteAdmin/siteAdmin-ontologyEditor.ftl    |   8 +-
 32 files changed, 1526 insertions(+), 986 deletions(-)
 delete mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/ObjectPropertyStatementPattern.java
 delete mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/ObjectPropertyStatementPatternFactory.java
 delete mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/PelletListener.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/modules/tboxreasoner/TBoxReasonerModule.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/modules/tboxreasoner/TBoxReasonerStatus.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ConfiguredReasonerListener.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/InferenceModelUpdater.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/PatternListBuilder.java
 rename webapp/src/edu/cornell/mannlib/vitro/webapp/{dao/jena/pellet => tboxreasoner}/ReasonerConfiguration.java (52%)
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerStatementPattern.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxChanges.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasoner.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasonerDriver.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/BasicTBoxReasonerDriver.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/pellet/PelletTBoxReasoner.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/pellet/PelletTBoxReasonerModule.java

diff --git a/webapp/config/log4j.properties b/webapp/config/log4j.properties
index 13c54f2c9..241df5716 100644
--- a/webapp/config/log4j.properties
+++ b/webapp/config/log4j.properties
@@ -35,7 +35,6 @@ log4j.rootLogger=INFO, AllAppender
 
 # These classes are too chatty to display INFO messages.
 log4j.logger.edu.cornell.mannlib.vitro.webapp.startup.StartupStatus=WARN
-log4j.logger.edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener=WARN
 log4j.logger.edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase=DEBUG
 
 # Spring as a whole is too chatty to display INFO messages.
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/application/ApplicationImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/application/ApplicationImpl.java
index 544340e00..45842830f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/application/ApplicationImpl.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/application/ApplicationImpl.java
@@ -16,6 +16,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.ComponentStartupStatus;
 import edu.cornell.mannlib.vitro.webapp.modules.fileStorage.FileStorage;
 import edu.cornell.mannlib.vitro.webapp.modules.imageProcessor.ImageProcessor;
 import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngine;
+import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerModule;
 import edu.cornell.mannlib.vitro.webapp.modules.tripleSource.ConfigurationTripleSource;
 import edu.cornell.mannlib.vitro.webapp.modules.tripleSource.ContentTripleSource;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
@@ -41,6 +42,7 @@ public class ApplicationImpl implements Application {
 	private FileStorage fileStorage;
 	private ContentTripleSource contentTripleSource;
 	private ConfigurationTripleSource configurationTripleSource;
+	private TBoxReasonerModule tboxReasonerModule;
 
 	public void setServletContext(ServletContext ctx) {
 		this.ctx = ctx;
@@ -140,6 +142,22 @@ public class ApplicationImpl implements Application {
 		}
 	}
 
+	@Override
+	public TBoxReasonerModule getTBoxReasonerModule() {
+		return tboxReasonerModule;
+	}
+
+	@Property(uri = "http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationSetup#hasTBoxReasonerModule")
+	public void setTBoxReasonerModule(TBoxReasonerModule module) {
+		if (tboxReasonerModule == null) {
+			tboxReasonerModule = module;
+		} else {
+			throw new IllegalStateException(
+					"Configuration includes multiple intances of TBoxReasonerModule: "
+							+ tboxReasonerModule + ", and " + module);
+		}
+	}
+
 	@Validation
 	public void validate() throws Exception {
 		if (searchEngine == null) {
@@ -162,6 +180,10 @@ public class ApplicationImpl implements Application {
 			throw new IllegalStateException(
 					"Configuration did not include a ConfigurationTripleSource.");
 		}
+		if (tboxReasonerModule == null) {
+			throw new IllegalStateException(
+					"Configuration did not include a TBoxReasonerModule.");
+		}
 	}
 
 	@Override
@@ -244,4 +266,30 @@ public class ApplicationImpl implements Application {
 		}
 	}
 
+	// ----------------------------------------------------------------------
+	// Setup the reasoners.
+	//
+	// This must happen after the FileGraphSetup.
+	// ----------------------------------------------------------------------
+
+	public static class ReasonersSetup implements ServletContextListener {
+		@Override
+		public void contextInitialized(ServletContextEvent sce) {
+			ServletContext ctx = sce.getServletContext();
+			Application app = ApplicationUtils.instance();
+			StartupStatus ss = StartupStatus.getBean(ctx);
+			ComponentStartupStatus css = new ComponentStartupStatusImpl(this,
+					ss);
+
+			TBoxReasonerModule tboxReasoner = app.getTBoxReasonerModule();
+			tboxReasoner.startup(app, css);
+			ss.info(this, "Started the TBoxReasonerModule: " + tboxReasoner);
+		}
+
+		@Override
+		public void contextDestroyed(ServletContextEvent sce) {
+			Application app = ApplicationUtils.instance();
+			app.getTBoxReasonerModule().shutdown(app);
+		}
+	}
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
index 5bcdbc53e..450a9cb7b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
@@ -15,6 +15,7 @@ import org.apache.commons.logging.LogFactory;
 
 import edu.cornell.mannlib.vedit.beans.Option;
 import edu.cornell.mannlib.vedit.util.FormUtils;
+import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
@@ -24,7 +25,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMa
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener;
+import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerStatus;
 import edu.cornell.mannlib.vitro.webapp.search.controller.IndexController;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
@@ -159,26 +160,23 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
  
         if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.EDIT_ONTOLOGY.ACTION)) {
             
-            String pelletError = null;
-            String pelletExplanation = null;
-            Object plObj = getServletContext().getAttribute("pelletListener");
-            if ( (plObj != null) && (plObj instanceof PelletListener) ) {
-                PelletListener pelletListener = (PelletListener) plObj;
-                if (!pelletListener.isConsistent()) {
-                    pelletError = "INCONSISTENT ONTOLOGY: reasoning halted.";
-                    pelletExplanation = pelletListener.getExplanation();
-                } else if ( pelletListener.isInErrorState() ) {
-                    pelletError = "An error occurred during reasoning. Reasoning has been halted. See error log for details.";
-                }
+            String error = null;
+            String explanation = null;
+            TBoxReasonerStatus status = ApplicationUtils.instance().getTBoxReasonerModule().getStatus();
+            if (!status.isConsistent()) {
+                error = "INCONSISTENT ONTOLOGY: reasoning halted.";
+                explanation = status.getExplanation();
+            } else if ( status.isInErrorState() ) {
+                error = "An error occurred during reasoning. Reasoning has been halted. See error log for details.";
             }
     
-            if (pelletError != null) {
-                Map<String, String> pellet = new HashMap<String, String>();
-                pellet.put("error", pelletError);
-                if (pelletExplanation != null) {
-                    pellet.put("explanation", pelletExplanation);
+            if (error != null) {
+                Map<String, String> tboxReasonerStatus = new HashMap<String, String>();
+                tboxReasonerStatus.put("error", error);
+                if (explanation != null) {
+                    tboxReasonerStatus.put("explanation", explanation);
                 }
-                map.put("pellet", pellet);
+                map.put("tboxReasonerStatus", tboxReasonerStatus);
             }
                     
             Map<String, String> urls = new HashMap<String, String>();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java
index 08b007fef..65e164714 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java
@@ -44,10 +44,12 @@ import com.hp.hpl.jena.vocabulary.RDF;
 import com.hp.hpl.jena.vocabulary.RDFS;
 
 import edu.cornell.mannlib.vedit.controller.BaseEditController;
+import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerModule;
 
 public class JenaAdminActions extends BaseEditController {
 	
@@ -190,9 +192,8 @@ public class JenaAdminActions extends BaseEditController {
 	}
 
     private void printRestrictions() {
-    	OntModel memoryModel = (OntModel) getServletContext().getAttribute("pelletOntModel");
-    	for (Restriction rest : memoryModel.listRestrictions().toList() ) {
-    		//System.out.println();
+    	TBoxReasonerModule reasoner = ApplicationUtils.instance().getTBoxReasonerModule();
+    	for (Restriction rest : reasoner.listRestrictions() ) {
     		if (rest.isAllValuesFromRestriction()) {
     			log.trace("All values from: ");
     			AllValuesFromRestriction avfr = rest.asAllValuesFromRestriction();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
index 1e0d7a384..5afeca4d8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
@@ -41,6 +41,7 @@ import com.hp.hpl.jena.vocabulary.OWL;
 import com.hp.hpl.jena.vocabulary.RDF;
 import com.hp.hpl.jena.vocabulary.RDFS;
 
+import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils;
 import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean;
 import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
@@ -51,7 +52,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener;
+import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerStatus;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 
 public class DataPropertyDaoJena extends PropertyDaoJena implements
@@ -357,10 +358,8 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
     }
 
     protected boolean reasoningAvailable() {
-    	PelletListener pl = getWebappDaoFactory().getPelletListener();
-    	return !(
-    			( pl == null || !pl.isConsistent() || pl.isInErrorState() )
-    	);
+    	TBoxReasonerStatus status = ApplicationUtils.instance().getTBoxReasonerModule().getStatus();
+    	return status.isConsistent() && !status.isInErrorState();
     }
     
     private String getRequiredDatatypeURI(Individual individual, DataProperty dataprop, List<String> vclassURIs) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
index 085c4dc4e..ab3890d12 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
@@ -18,7 +18,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jena.iri.IRI;
 import org.apache.jena.iri.IRIFactory;
-import org.mindswap.pellet.jena.vocabulary.SWRL;
 
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
 import com.hp.hpl.jena.graph.Node;
@@ -55,6 +54,8 @@ public class JenaBaseDao extends JenaBaseDaoCon {
 	public static final boolean KEEP_ONLY_IF_TRUE = true; //used for updatePropertyBooleanValue()
     public static final boolean KEEP_ONLY_IF_FALSE = false; //used for updatePropertyBooleanValue()
     
+    private static final String SWRL_IMP = "http://www.w3.org/2003/11/swrl#Imp";
+    
     protected static final Log log = LogFactory.getLog(JenaBaseDao.class.getName());
     
     /* ******************* static constants ****************** */
@@ -1090,7 +1091,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
     }
     
     public void removeRulesMentioningResource(Resource res, OntModel ontModel) {
-    	Iterator<Resource> impIt = ontModel.listSubjectsWithProperty(RDF.type, SWRL.Imp);
+    	Iterator<Resource> impIt = ontModel.listSubjectsWithProperty(RDF.type, SWRL_IMP);
     	while (impIt.hasNext()) {
     		Resource imp = impIt.next();
     		boolean removeMe = false;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
index a74cada20..4114c7fbd 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
@@ -47,7 +47,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryConfig;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceModel;
@@ -70,8 +69,6 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
     
     protected WebappDaoFactoryConfig config;
     
-    protected PelletListener pelletListener;
-
     protected String userURI;
 	
 	private Map<String,String> properties = new HashMap<String,String>();
@@ -238,18 +235,6 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
     	return config.getNonUserNamespaces();
     }
     
-    /**
-     * This enables the WebappDaoFactory to check the status of a reasoner.
-     * This will likely be refactored in future releases.
-     */
-    public void setPelletListener(PelletListener pl) {
-    	this.pelletListener = pl;
-    }
-    
-    public PelletListener getPelletListener() {
-    	return this.pelletListener;
-    }
-    
     @Override
 	public List<String> getCommentsForResource(String resourceURI) {
     	List<String> commentList = new LinkedList<String>();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/ObjectPropertyStatementPattern.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/ObjectPropertyStatementPattern.java
deleted file mode 100644
index 001ecee14..000000000
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/ObjectPropertyStatementPattern.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.dao.jena.pellet;
-
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-
-public class ObjectPropertyStatementPattern {
-
-	private Resource subject = null;
-	private Property predicate = null;
-	private Resource object = null;
-	
-	public ObjectPropertyStatementPattern(Resource subject, Property predicate, Resource object) {
-		this.subject = subject;
-		this.predicate = predicate;
-		this.object = object;
-	}
-	
-	public Resource getSubject() {
-		return this.subject;
-	}
-	public Property getPredicate() {
-		return this.predicate;
-	}
-	public Resource getObject() {
-		return this.object;
-	}
-	
-	public boolean matches(ObjectPropertyStatementPattern p2) {
-		boolean sMatch = false;
-		boolean pMatch = false;
-		boolean oMatch = false;
-		if (this.getSubject() == null || p2.getSubject()==null) {
-			sMatch = true; // (this.getSubject() == null && p2.getSubject() == null);
-		} else {
-			sMatch = (this.getSubject().equals(p2.getSubject()));
-		}
-		if (this.getPredicate() == null || p2.getPredicate()==null) {
-			pMatch = true; // (this.getPredicate() == null && p2.getPredicate() == null);
-		} else {
-			pMatch = (this.getPredicate().equals(p2.getPredicate()));
-		}
-		if (this.getObject() == null || p2.getObject()==null) {
-			oMatch = true ; // (this.getObject() == null && p2.getObject() == null);
-		} else {
-			oMatch = (this.getObject().equals(p2.getObject()));
-		}
-		return (sMatch && pMatch && oMatch);
-	}
-	
-}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/ObjectPropertyStatementPatternFactory.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/ObjectPropertyStatementPatternFactory.java
deleted file mode 100644
index 57fb8f900..000000000
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/ObjectPropertyStatementPatternFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.dao.jena.pellet;
-
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-
-public class ObjectPropertyStatementPatternFactory {
-
-	//private static Set<ObjectPropertyStatementPattern> patternSet = new HashSet<ObjectPropertyStatementPattern>();
-	
-	public static ObjectPropertyStatementPattern getPattern(Resource subject, Property predicate, Resource object) {
-		//for (Iterator<ObjectPropertyStatementPattern> i = patternSet.iterator(); i.hasNext(); ) {
-		//	ObjectPropertyStatementPattern pat = i.next();
-		//	if ( ( (pat.getSubject()==null && subject==null) || (pat.getSubject().equals(subject)) )
-		//	     && ( (pat.getPredicate()==null && predicate==null) || (pat.getPredicate().equals(predicate)) ) 
-		//	     && ( (pat.getObject()==null && object==null) || (pat.getObject().equals(object)) ) ) {
-		//		return pat;
-		//	} 		
-		//}
-		ObjectPropertyStatementPattern newPat = new ObjectPropertyStatementPattern(subject,predicate,object);
-		//patternSet.add(newPat);
-		return newPat;
-	}
-	
-}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/PelletListener.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/PelletListener.java
deleted file mode 100644
index 47634ddba..000000000
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/PelletListener.java
+++ /dev/null
@@ -1,732 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.dao.jena.pellet;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.mindswap.pellet.exceptions.InconsistentOntologyException;
-import org.mindswap.pellet.jena.PelletInfGraph;
-import org.mindswap.pellet.jena.PelletReasonerFactory;
-
-import com.hp.hpl.jena.ontology.DatatypeProperty;
-import com.hp.hpl.jena.ontology.ObjectProperty;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelChangedListener;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.shared.Lock;
-import com.hp.hpl.jena.util.iterator.ClosableIterator;
-import com.hp.hpl.jena.vocabulary.OWL;
-import com.hp.hpl.jena.vocabulary.RDF;
-import com.hp.hpl.jena.vocabulary.RDFS;
-
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
-
-public class PelletListener implements ModelChangedListener {
-
-	private static final Log log = LogFactory.getLog(PelletListener.class.getName());
-	private boolean isReasoning = false;
-	private boolean isSynchronizing = false;
-	private boolean dirty = false;
-	
-	private OntModel pelletModel;
-	private OntModel fullModel;
-	private OntModel mainModel;
-	private Model inferenceModel;
-	private ReasonerConfiguration reasonerConfiguration;
-	private Set<ObjectPropertyStatementPattern> inferenceDrivingPatternAllowSet;
-	private Set<ObjectPropertyStatementPattern> inferenceDrivingPatternDenySet;
-	private Set<ObjectPropertyStatementPattern> inferenceReceivingPatternAllowSet;
-	
-	private Map<Property,List<ObjectPropertyStatementPattern>> inferenceDrivingPatternMap;
-	
-	private Model additionModel;
-	private Model removalModel;
-	
-	private Model deletedObjectProperties;
-	private Model deletedDataProperties;
-	
-	private boolean pipeOpen;
-	
-	private boolean isConsistent = true;
-	private boolean inErrorState = false;
-	private String explanation = "";
-	
-	public boolean isConsistent() {
-		return this.isConsistent;
-	}
-	
-	public String getExplanation() {
-		return this.explanation;
-	}
-	
-	public boolean isInErrorState() {
-		return this.inErrorState;
-	}
-	
-	public boolean isReasoning() {
-		return this.isReasoning;
-	}
-	
-	public void closePipe() {
-		pipeOpen = false;
-	}
-	
-	public void openPipe() {
-		pipeOpen = true;
-	}
-		
-	public synchronized boolean checkAndStartReasoning(){
-	    if( this.isReasoning )
-	        return false;
-	    else{
-	        this.isReasoning = true;
-	        return true;
-	    }
-	}	
-	
-	public synchronized void endReasoning() {
-		this.isReasoning = false;
-	}
-	
-	public boolean isDirty() {
-		return this.dirty;
-	}
-	
-	public void setDirty(boolean dirt) {
-		this.dirty = dirt;
-	}
-	
-	private int inferenceRounds = 0;
-	
-	private boolean foreground = false;
-	private static final boolean FOREGROUND = true;
-	private static final boolean BACKGROUND = false;
-	private static final boolean DONT_SKIP_INITIAL_REASONING = false;
-	
-	public PelletListener(OntModel fullModel, OntModel model, Model inferenceModel, ReasonerConfiguration reasonerConfiguration) {
-	    this(fullModel, model, inferenceModel, reasonerConfiguration, BACKGROUND);	
-	}
-	
-	public PelletListener(OntModel fullModel, OntModel model, Model inferenceModel, ReasonerConfiguration reasonerConfiguration, boolean foreground) {
-		this(fullModel, model, inferenceModel, reasonerConfiguration, foreground, DONT_SKIP_INITIAL_REASONING);
-	}	
-		
-	public PelletListener(OntModel fullModel, OntModel model, Model inferenceModel, ReasonerConfiguration reasonerConfiguration, boolean foreground, boolean skipReasoningUponInitialization) {
-		this.pelletModel = ModelFactory.createOntologyModel(reasonerConfiguration.getOntModelSpec());
-		this.fullModel = fullModel;
-		this.mainModel = model;
-		this.inferenceModel = inferenceModel;
-		if (this.inferenceModel == null) {
-			log.trace("Inference model is null");
-		}
-		this.reasonerConfiguration = reasonerConfiguration;
-		this.inferenceDrivingPatternAllowSet = reasonerConfiguration.getInferenceDrivingPatternAllowSet();
-		this.inferenceDrivingPatternDenySet = reasonerConfiguration.getInferenceDrivingPatternDenySet();
-		this.inferenceReceivingPatternAllowSet = reasonerConfiguration.getInferenceReceivingPatternAllowSet();
-        
-		if (this.inferenceDrivingPatternAllowSet != null) {
-			this.inferenceDrivingPatternMap = new HashMap<Property,List<ObjectPropertyStatementPattern>>();
-			for (Iterator<ObjectPropertyStatementPattern> i = inferenceDrivingPatternAllowSet.iterator(); i.hasNext();) {
-				ObjectPropertyStatementPattern pat = i.next();
-				Property p = pat.getPredicate();
-				List<ObjectPropertyStatementPattern> patList = inferenceDrivingPatternMap.get(p);
-				if (patList == null) {
-					patList = new LinkedList<ObjectPropertyStatementPattern>();
-					patList.add(pat);
-					inferenceDrivingPatternMap.put(p, patList);
-				} else {
-					patList.add(pat);
-				}
-			}
-		}
-		this.pipeOpen = true;
-		this.additionModel = ModelFactory.createDefaultModel();
-		this.removalModel = ModelFactory.createDefaultModel();
-		this.deletedObjectProperties = ModelFactory.createDefaultModel();
-		this.deletedDataProperties = ModelFactory.createDefaultModel();
-		this.mainModel.enterCriticalSection(Lock.READ);
-    	try {
-    	    for (ObjectPropertyStatementPattern pat : this.inferenceDrivingPatternAllowSet) {
-    	        addedStatements(mainModel.listStatements((Resource) null, pat.getPredicate(), (RDFNode) null));    
-    	    }
-        	if (!skipReasoningUponInitialization) {
-        		this.foreground = foreground;
-        		notifyEvent(null,new EditEvent(null,false));
-        	} else if (inferenceModel.size() == 0){
-        		foreground = true;
-        		notifyEvent(null,new EditEvent(null,false));
-        		this.foreground = foreground;
-        	}
-        } finally {
-        	this.mainModel.leaveCriticalSection();
-        }
-        
-		this.fullModel.getBaseModel().register(this);
-        this.mainModel.getBaseModel().register(this);
-	}
-	
-	private class InferenceGetter implements Runnable {
-		
-		private PelletListener pelletListener;
-		
-		public InferenceGetter(PelletListener pelletListener) {
-			this.pelletListener = pelletListener;
-		}
-		
-		public void run() {
-			while (pelletListener.isDirty()) {
-				//pipeOpen = false;
-				try {
-					pelletListener.setDirty(false);
-					inferenceRounds++;
-					log.info("Getting new inferences");
-					long startTime = System.currentTimeMillis();
-					LinkedList<ObjectPropertyStatementPattern> irpl = new LinkedList<ObjectPropertyStatementPattern>();
-					
-					if (inferenceReceivingPatternAllowSet != null) {
-						irpl.addAll(inferenceReceivingPatternAllowSet);
-					} else {
-						irpl.add(ObjectPropertyStatementPatternFactory.getPattern(null,null,null));
-					}
-					
-					if (reasonerConfiguration.getQueryForAllObjectProperties()) {	
-							pelletModel.enterCriticalSection(Lock.READ);
-							try {
-								ClosableIterator closeIt = pelletModel.listObjectProperties();
-								try {
-									for (Iterator objPropIt = closeIt; objPropIt.hasNext();) {
-										ObjectProperty objProp = (ObjectProperty) objPropIt.next();
-										if ( !("http://www.w3.org/2002/07/owl#".equals(objProp.getNameSpace())) ) {
-											irpl.add(ObjectPropertyStatementPatternFactory.getPattern(null,objProp,null));
-										}
-									}
-								} finally {
-									closeIt.close();
-								}
-							} finally {
-								pelletModel.leaveCriticalSection();
-							}
-							deletedObjectProperties.enterCriticalSection(Lock.WRITE);
-							try {
-								ClosableIterator sit = deletedObjectProperties.listSubjects();
-								try {
-									while (sit.hasNext()) {
-										Resource subj = (Resource) sit.next();
-										irpl.add(ObjectPropertyStatementPatternFactory.getPattern(null,ResourceFactory.createProperty(subj.getURI()),null));
-									}
-								} finally {
-									sit.close();
-								}
-								deletedObjectProperties.removeAll();
-							} finally {
-								deletedObjectProperties.leaveCriticalSection();
-							}
-					}
-					
-					if (reasonerConfiguration.getQueryForAllDatatypeProperties()) {	
-						pelletModel.enterCriticalSection(Lock.READ);
-						try {
-							ClosableIterator closeIt = pelletModel.listDatatypeProperties();
-							try {
-								for (Iterator dataPropIt = closeIt; dataPropIt.hasNext();) {
-									DatatypeProperty dataProp = (DatatypeProperty) dataPropIt.next();
-									if ( !("http://www.w3.org/2002/07/owl#".equals(dataProp.getNameSpace())) ) {
-										// TODO: THIS WILL WORK, BUT NEED TO GENERALIZE THE PATTERN CLASSES 
-										irpl.add(ObjectPropertyStatementPatternFactory.getPattern(null,dataProp,null));
-									}
-								}
-							} finally {
-								closeIt.close();
-							}
-						} finally {
-							pelletModel.leaveCriticalSection();
-						}
-						deletedDataProperties.enterCriticalSection(Lock.WRITE);
-						try {
-							ClosableIterator sit = deletedDataProperties.listSubjects();
-							try {
-								while (sit.hasNext()) {
-									Resource subj = (Resource) sit.next();
-									irpl.add(ObjectPropertyStatementPatternFactory.getPattern(null,ResourceFactory.createProperty(subj.getURI()),null));
-								}
-							} finally {
-								sit.close();
-							}
-							deletedDataProperties.removeAll();
-						} finally {
-							deletedDataProperties.leaveCriticalSection();
-						}
-					}
-						
-					int addCount = 0;
-					int retractCount = 0;
-				
-					// force new reasoner (disabled)
-					if (false && !reasonerConfiguration.isIncrementalReasoningEnabled()) {
-						Model baseModel = pelletModel.getBaseModel();
-						pelletModel = ModelFactory.createOntologyModel(PelletReasonerFactory.THE_SPEC);
-						pelletModel.getDocumentManager().setProcessImports(false);
-						pelletModel.add(baseModel);
-					}
-					
-					pelletModel.enterCriticalSection(Lock.WRITE);
-					try {	
-						pelletModel.rebind();
-						pelletModel.prepare();
-					} finally {
-						pelletModel.leaveCriticalSection();
-					} 
-					
-					 for (Iterator<ObjectPropertyStatementPattern> patIt = irpl.iterator(); patIt.hasNext(); ) {
-				        	ObjectPropertyStatementPattern pat = patIt.next();
-
-				        	if (log.isDebugEnabled()) {
-				        		String subjStr = (pat.getSubject() != null) ? pat.getSubject().getURI() : "*";
-				        		String predStr = (pat.getPredicate() != null) ? pat.getPredicate().getURI() : "*";
-				        		String objStr = (pat.getObject() != null) ? pat.getObject().getURI() : "*";
-								log.debug("Querying for "+subjStr+" : "+predStr+" : "+objStr);
-							}
-				        	
-				        	Model tempModel = ModelFactory.createDefaultModel();
-				        	
-				        	pelletModel.enterCriticalSection(Lock.READ); 
-				        	try {
-				        		
-					        	ClosableIterator ci = pelletModel.listStatements(pat.getSubject(),pat.getPredicate(),pat.getObject());
-						        try {	
-							        for (ClosableIterator i=ci; i.hasNext();) {
-							        	Statement stmt = (Statement) i.next();
-							        	
-							        	boolean reject = false;
-						        		
-						        		// this next part is only needed if we're using Jena's OWL reasoner instead of actually using Pellet
-						        		try {
-						        			if ( ( ((Resource)stmt.getObject()).equals(RDFS.Resource) ) ) {
-						        				reject = true;
-						        			} else if ( ( stmt.getSubject().equals(OWL.Nothing) ) )  {
-												reject = true; 
-											}  else if ( ( stmt.getObject().equals(OWL.Nothing) ) )  {
-												reject = true;
-											}
-						        		} catch (Exception e) {}
-						        		
-						        		if (!reject) {
-						        			tempModel.add(stmt);
-						        		
-						        			boolean fullModelContainsStatement = false;
-						        			fullModel.enterCriticalSection(Lock.READ);
-						        			try {
-						        				fullModelContainsStatement = fullModel.contains(stmt);
-						        			} finally {
-						        				fullModel.leaveCriticalSection();
-						        			}
-						        			
-								        	if (!fullModelContainsStatement) {
-								        		// in theory we should be able to lock only the inference model, but I'm not sure yet if Jena propagates the locking upward
-								        		fullModel.enterCriticalSection(Lock.WRITE);
-								        		closePipe();
-								        		try {
-								        			inferenceModel.add(stmt);
-								        			addCount++;
-								        		} finally {
-								        			openPipe();
-								        			fullModel.leaveCriticalSection();
-								        		}
-								        	}
-							        	
-						        		}
-							        }   
-						        } finally {
-						        	ci.close();
-						        }
-				        	} finally {
-				        		pelletModel.leaveCriticalSection();
-				        	}
-				        	
-				        	// now we see what's in the inference model that isn't in the temp model and remove it
-				        	
-							try {
-								Queue<Statement> localRemovalQueue = new LinkedList<Statement>();
-									inferenceModel.enterCriticalSection(Lock.READ);
-									try {
-										ClosableIterator ci = inferenceModel.listStatements(pat.getSubject(),pat.getPredicate(),pat.getObject());
-										try {
-									        for (ClosableIterator i=ci; i.hasNext();) {
-									        	Statement stmt = (Statement) i.next();
-									        	if (!tempModel.contains(stmt)) {
-									        		localRemovalQueue.add(stmt);
-									        	}
-									        }    
-										} finally {
-											ci.close();
-										}
-									} finally {
-										inferenceModel.leaveCriticalSection();
-									}
-						        for (Iterator<Statement> i = localRemovalQueue.iterator(); i.hasNext(); ) {
-						        	fullModel.enterCriticalSection(Lock.WRITE);
-						        	closePipe();
-						        	try {
-						        		retractCount++;
-						        		inferenceModel.remove(i.next());
-						        	} finally {
-						        		openPipe();
-						        		fullModel.leaveCriticalSection();
-						        	}
-						        }
-						        
-						        localRemovalQueue.clear();
-						    } catch (Exception e) {
-								log.error("Error getting inferences", e);
-						    } 
-						    tempModel = null;
-				        }
-					 this.pelletListener.isConsistent = true;
-					 this.pelletListener.inErrorState = false;
-					 this.pelletListener.explanation = "";
-					 if (log.isDebugEnabled()) {
-						 log.info("Added "+addCount+" statements entailed by assertions");					 
-						 log.info("Retracted "+retractCount+" statements no longer entailed by assertions");						 
-						 log.info("Done getting new inferences: "+(System.currentTimeMillis()-startTime)/1000+" seconds");
-					 }
-				} catch (InconsistentOntologyException ioe) {
-					this.pelletListener.isConsistent = false;
-					String explanation = ((PelletInfGraph)pelletModel.getGraph()).getKB().getExplanation();
-					this.pelletListener.explanation = explanation;
-					log.error(ioe);
-					log.error(explanation);
-				} catch (Exception e) {
-					this.pelletListener.inErrorState = true;
-					log.error("Exception during inference", e);
-				} finally {
-					pelletListener.endReasoning();
-				}
-			}
-		}
-			
-	}
-	
-	private void getInferences() {
-		this.setDirty(true);
-		if ( this.checkAndStartReasoning() ){
-			if (foreground) {
-				(new InferenceGetter(this)).run();
-			} else {
-				new Thread(new InferenceGetter(this), "PelletListener.InferenceGetter").start();
-			}
-		}
-	}
-	
-	// TODO: These next two methods are really ugly; I need to refactor them to remove redundancy.
-	
-	private void tryAdd(Statement stmt) {
-		boolean sendToPellet = false;
-		if ( pipeOpen && reasonerConfiguration.getReasonOnAllDatatypePropertyStatements() && stmt.getObject().isLiteral() ) {
-			sendToPellet = true;
-		} else 
-		if ( pipeOpen && hasCardinalityPredicate(stmt) ) { // see comment on this method
-			sendToPellet = true;
-		} else 
-		if ( (stmt.getObject().isResource()) && !((stmt.getPredicate().getURI().indexOf(VitroVocabulary.vitroURI)==0)) ) {
-			if (pipeOpen) {
-				sendToPellet = false;
-				boolean denied = false;
-				ObjectPropertyStatementPattern stPat = ObjectPropertyStatementPatternFactory.getPattern(stmt.getSubject(), stmt.getPredicate(), (Resource) stmt.getObject());
-				if (inferenceDrivingPatternDenySet != null) {
-					for (Iterator<ObjectPropertyStatementPattern> i = inferenceDrivingPatternDenySet.iterator(); i.hasNext(); ){
-						ObjectPropertyStatementPattern pat = i.next();
-						if (pat.matches(stPat)) {
-							denied = true;
-							break;
-						}
-					}
-				}
-				if (!denied) {
-	 				if (inferenceDrivingPatternAllowSet==null) {
-						sendToPellet = true;
-					} else {
-						// TODO: O(1) implementation of this
-						List<ObjectPropertyStatementPattern> patList = this.inferenceDrivingPatternMap.get(stmt.getPredicate());
-						if (patList != null) {
-							for (Iterator<ObjectPropertyStatementPattern> i = patList.iterator(); i.hasNext(); ){
-								ObjectPropertyStatementPattern pat = i.next();
-								if (pat.matches(stPat)) {
-									sendToPellet = true;
-									break;
-								}
-							}
-						}
-					}
-				}
-				
-			}
-		}	
-		if (sendToPellet) {
-			//long startTime = System.currentTimeMillis();
-			String valueStr = (stmt.getObject().isResource()) ? ((Resource)stmt.getObject()).getLocalName() : ((Literal)stmt.getObject()).getLexicalForm();
-			if ( log.isDebugEnabled() ) {
-				log.debug( "Adding to Pellet: " + renderStatement( stmt ) );
-			}
-			additionModel.enterCriticalSection(Lock.WRITE);
-			try {
-				additionModel.add(stmt);
-			} finally {
-				additionModel.leaveCriticalSection();
-			}
-		} else {
-			if ( log.isDebugEnabled() ) {
-				log.debug( "Not adding to Pellet: " + renderStatement( stmt ) );
-			}
-		}
-	}
-	
-	
-	private void tryRemove(Statement stmt) {
-		boolean removeFromPellet = false;
-		if ( pipeOpen && reasonerConfiguration.getReasonOnAllDatatypePropertyStatements() && stmt.getObject().isLiteral() ) {
-			removeFromPellet = true;
-		} else
-		if ( pipeOpen && hasCardinalityPredicate(stmt) ) { // see comment on this method
-			removeFromPellet = true;
-		} else
-		if ( stmt.getObject().isResource() ) {
-			if (pipeOpen) {
-				if (reasonerConfiguration.getQueryForAllObjectProperties() && stmt.getPredicate().equals(RDF.type) && stmt.getObject().equals(OWL.ObjectProperty)) {
-					deletedObjectProperties.enterCriticalSection(Lock.WRITE);
-					try {
-						deletedObjectProperties.add(stmt);
-					} finally {
-						deletedObjectProperties.leaveCriticalSection();
-					}
-				}
-				if (reasonerConfiguration.getQueryForAllDatatypeProperties() && stmt.getPredicate().equals(RDF.type) && stmt.getObject().equals(OWL.DatatypeProperty)) {
-					deletedDataProperties.enterCriticalSection(Lock.WRITE);
-					try{
-						deletedDataProperties.add(stmt);
-					} finally {
-						deletedDataProperties.leaveCriticalSection();
-					}
-				}
-				removeFromPellet = false;
-				boolean denied = false;
-				ObjectPropertyStatementPattern stPat = ObjectPropertyStatementPatternFactory.getPattern(stmt.getSubject(), stmt.getPredicate(), (Resource) stmt.getObject());
-				if (inferenceDrivingPatternDenySet != null) {
-					for (Iterator<ObjectPropertyStatementPattern> i = inferenceDrivingPatternDenySet.iterator(); i.hasNext(); ){
-						ObjectPropertyStatementPattern pat = i.next();
-						if (pat.matches(stPat)) {
-							denied = true;
-							break;
-						}
-					}
-				}
-				if (!denied) {
-					if (inferenceDrivingPatternAllowSet==null) {
-						removeFromPellet = true;
-					} else {
-						// TODO: O(1) implementation of this
-						List<ObjectPropertyStatementPattern> patList = this.inferenceDrivingPatternMap.get(stmt.getPredicate());
-						if (patList != null) {
-							for (Iterator<ObjectPropertyStatementPattern> i = patList.iterator(); i.hasNext(); ){
-								ObjectPropertyStatementPattern pat = i.next();
-								if (pat.matches(stPat)) {
-									removeFromPellet = true;
-									break;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		if (removeFromPellet) {
-			String valueStr = (stmt.getObject().isResource()) ? ((Resource)stmt.getObject()).getLocalName() : ((Literal)stmt.getObject()).getLexicalForm();
-			log.info("Removing from Pellet: "+stmt.getSubject().getLocalName()+" "+stmt.getPredicate().getLocalName()+" "+valueStr);
-			removalModel.enterCriticalSection(Lock.WRITE);
-			try {
-				removalModel.add(stmt);
-			} finally {
-				removalModel.leaveCriticalSection();
-			}
-		}
-	}
-	
-	// The pattern matching stuff needs to get reworked.
-	// It originally assumed that only resources would be in object
-	// position, but cardinality axioms will have e.g. nonNegativeIntegers.
-	// This is a temporary workaround: all cardinality statements will
-	// be exposed to Pellet, regardless of configuration patterns.
-	private boolean hasCardinalityPredicate(Statement stmt) {
-		return (
-			stmt.getPredicate().equals(OWL.cardinality) ||
-			stmt.getPredicate().equals(OWL.minCardinality) ||
-			stmt.getPredicate().equals(OWL.maxCardinality) 
-		) ;
-	}
-	
-	
-	public void addedStatement(Statement arg0) {
-		tryAdd(arg0);
- 	}
-
-	
-	public void addedStatements(Statement[] arg0) {
-		for (int i=0; i<arg0.length; i++) {
-			tryAdd(arg0[i]);
-		}
-	}
-
-	
-	public void addedStatements( List arg0 ) {
-		for ( Iterator i = arg0.iterator(); i.hasNext(); ) {
-			tryAdd( (Statement) i.next() );
-		}
-
-	}
-
-	
-	public void addedStatements(StmtIterator arg0) {
-		for (Iterator i = arg0; i.hasNext(); ) {
-			tryAdd( (Statement) i.next() );
-		}
-
-	}
-
-	
-	public void addedStatements(Model arg0) {
-		for (Iterator i = arg0.listStatements(); i.hasNext(); ) {
-			tryAdd( (Statement) i.next() );
-		}
-
-	}
-
-	
-	public void notifyEvent(Model arg0, Object arg1) {
-		if (arg1 instanceof EditEvent) {
-			EditEvent ee = (EditEvent) arg1;
-			if (!ee.getBegin()) {
-				if ( (additionModel.size() > 0) || (removalModel.size()>0) ) {
-					if (!isSynchronizing) {
-						if (foreground) {
-                            log.debug("Running Pellet in foreground.");
-							(new PelletSynchronizer()).run();
-						} else {
-                            log.debug("Running Pellet in background.");
-							new Thread(new PelletSynchronizer(), "PelletListener.PelletSynchronizer").start();
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private class PelletSynchronizer implements Runnable {
-		public void run() {
-			try {
-				isSynchronizing = true;
-				while (removalModel.size()>0 || additionModel.size()>0) {
-					Model tempModel = ModelFactory.createDefaultModel();
-					removalModel.enterCriticalSection(Lock.WRITE);
-					try {
-						tempModel.add(removalModel);
-						removalModel.removeAll();
-					} finally {
-						removalModel.leaveCriticalSection();
-					}
-					pelletModel.enterCriticalSection(Lock.WRITE); 
-					try {
-						pelletModel.remove(tempModel);
-					} finally {
-						pelletModel.leaveCriticalSection();
-					}
-					tempModel.removeAll();
-					additionModel.enterCriticalSection(Lock.WRITE);
-					try {
-						tempModel.add(additionModel);
-						additionModel.removeAll();
-					} finally {
-						additionModel.leaveCriticalSection();
-					}
-					pelletModel.enterCriticalSection(Lock.WRITE);
-					try {
-						pelletModel.add(tempModel);
-					} finally {
-						pelletModel.leaveCriticalSection();
-					}
-					tempModel = null;
-					
-					getInferences();
-					
-				}
-			} finally {
-				isSynchronizing = false;
-			}
-		}
-	}
- 	
-	public void removedStatement(Statement arg0) {
-		tryRemove(arg0);
-	}
-
-	
-	public void removedStatements(Statement[] arg0) {
-		for (int i=0; i<arg0.length; i++) {
-			tryRemove(arg0[i]);
-		}
-	}
-
-	
-	public void removedStatements(List arg0) {
-		for (Iterator i = arg0.iterator(); i.hasNext(); ) {
-			tryRemove( (Statement) i.next());
-		}
-	}
-
-	
-	public void removedStatements(StmtIterator arg0) {
-		for (Iterator i = arg0; i.hasNext();) {
-			tryRemove( (Statement) i.next());
-		}
-	}
-
-	
-	public void removedStatements(Model arg0) {
-		for (Iterator i = arg0.listStatements(); i.hasNext();) {
-			tryRemove( (Statement) i.next());
-		}
-	}
-	
-	public OntModel getPelletModel() {
-		return this.pelletModel;
-	}
-
-	private String renderStatement(Statement stmt) {
-		String subjStr = (stmt.getSubject().getURI() != null) ? stmt.getSubject().getURI() : stmt.getSubject().getId().toString();
-		String predStr = stmt.getPredicate().getURI();
-		String objStr = "";
-		RDFNode obj = stmt.getObject();
-		if (obj.isLiteral()) {
-			objStr = "\""+(((Literal)obj).getLexicalForm());
-		} else {
-			objStr = (((Resource)stmt.getObject()).getURI() != null) ? ((Resource)stmt.getObject()).getURI() : ((Resource)stmt.getObject()).getId().toString();
-		}
-		return (subjStr+" : "+predStr+" : "+objStr);
-	}
-
-}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java
index 741624e5a..a245f9a59 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java
@@ -8,12 +8,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerStatus;
 
 public class IndividualsViaVClassOptions implements FieldOptions {
 
@@ -101,20 +101,13 @@ public class IndividualsViaVClassOptions implements FieldOptions {
         return individualMap;        
     }
     
-    protected boolean isReasoningAvailable( WebappDaoFactory wDaoFact){
-        boolean inferenceAvailable = false;
-        if (wDaoFact instanceof WebappDaoFactoryJena) {
-            PelletListener pl = ((WebappDaoFactoryJena) wDaoFact).getPelletListener();
-            if (pl != null && pl.isConsistent() && !pl.isInErrorState()
-                    && !pl.isReasoning()) {
-                inferenceAvailable = true;
-            }
-        }
-        return inferenceAvailable;
+    protected boolean isReasoningAvailable(){
+    	TBoxReasonerStatus status = ApplicationUtils.instance().getTBoxReasonerModule().getStatus();
+    	return status.isConsistent() && !status.isInErrorState();
     }
     
     protected Map<String, Individual> addWhenMissingInference( String classUri , WebappDaoFactory wDaoFact ){
-        boolean inferenceAvailable = isReasoningAvailable(wDaoFact);    
+        boolean inferenceAvailable = isReasoningAvailable();    
         Map<String,Individual> individualMap = new HashMap<String,Individual>();
         if ( !inferenceAvailable ) {
             for (String subclassURI : wDaoFact.getVClassDao().getAllSubClassURIs(classUri)) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/modules/Application.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/modules/Application.java
index 2708634f3..7d875f707 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/modules/Application.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/modules/Application.java
@@ -8,6 +8,7 @@ import edu.cornell.mannlib.vitro.webapp.application.VitroHomeDirectory;
 import edu.cornell.mannlib.vitro.webapp.modules.fileStorage.FileStorage;
 import edu.cornell.mannlib.vitro.webapp.modules.imageProcessor.ImageProcessor;
 import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngine;
+import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerModule;
 import edu.cornell.mannlib.vitro.webapp.modules.tripleSource.ConfigurationTripleSource;
 import edu.cornell.mannlib.vitro.webapp.modules.tripleSource.ContentTripleSource;
 
@@ -29,6 +30,8 @@ public interface Application {
 	
 	ConfigurationTripleSource getConfigurationTripleSource();
 	
+	TBoxReasonerModule getTBoxReasonerModule();
+	
 	void shutdown();
 
 	public interface Component {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/modules/tboxreasoner/TBoxReasonerModule.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/modules/tboxreasoner/TBoxReasonerModule.java
new file mode 100644
index 000000000..3110d9960
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/modules/tboxreasoner/TBoxReasonerModule.java
@@ -0,0 +1,29 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner;
+
+import java.util.List;
+
+import com.hp.hpl.jena.ontology.Restriction;
+
+import edu.cornell.mannlib.vitro.webapp.modules.Application;
+
+/**
+ * A wrapper around the TBox reasoner
+ */
+public interface TBoxReasonerModule extends Application.Module {
+	/**
+	 * What is the TBox reasoner doing now?
+	 */
+	TBoxReasonerStatus getStatus();
+
+	/**
+	 * What restrictions are currently in the reasoner's internal model?
+	 */
+	List<Restriction> listRestrictions();
+
+	/**
+	 * Wait until the TBox reasoner becomes quiet.
+	 */
+	void waitForTBoxReasoning();
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/modules/tboxreasoner/TBoxReasonerStatus.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/modules/tboxreasoner/TBoxReasonerStatus.java
new file mode 100644
index 000000000..d799ff8f9
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/modules/tboxreasoner/TBoxReasonerStatus.java
@@ -0,0 +1,29 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner;
+
+/**
+ * What is the current state of the TBox reasoner?
+ */
+public interface TBoxReasonerStatus {
+	/**
+	 * Is reasoning in progress based on changes to the TBox?
+	 */
+	boolean isReasoning();
+	
+	/**
+	 * Is the TBox free of inconsistency?
+	 */
+	boolean isConsistent();
+
+	/**
+	 * Did the reasoner fail in its most recent attempt?
+	 */
+	boolean isInErrorState();
+
+	/**
+	 * A description of the error state, or an empty string (never null).
+	 */
+	String getExplanation();
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
index 4fbd5d8c2..8e4cc757c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
@@ -97,13 +97,6 @@ public class FileGraphSetup implements ServletContextListener {
             OntDocumentManager.getInstance().setProcessImports(false);
         }
 
-        /*
-        if (isUpdateRequired(ctx))  {
-            log.info("mostSpecificType will be computed because a knowledge base migration was performed." );
-            SimpleReasonerSetup.setMSTComputeRequired(ctx);
-        } else 
-        */
-        
         if ( (aboxChanged || tboxChanged) && !isUpdateRequired(ctx)) {
             log.info("a full recompute of the Abox will be performed because" +
                     " the filegraph abox(s) and/or tbox(s) have changed or are being read for the first time." );
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java
index 08d3b5cc3..3422eccff 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java
@@ -21,12 +21,7 @@ import org.apache.commons.logging.LogFactory;
 import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.query.Dataset;
 import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.vocabulary.OWL;
 
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.ReasonerConfiguration;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
@@ -51,41 +46,10 @@ public class SimpleReasonerSetup implements ServletContextListener {
     	ServletContext ctx = sce.getServletContext();
         
         try {    
-            // set up Pellet reasoning for the TBox    
         	OntModel tboxAssertionsModel = ModelAccess.on(ctx).getOntModel(ModelNames.TBOX_ASSERTIONS);
         	OntModel tboxInferencesModel = ModelAccess.on(ctx).getOntModel(ModelNames.TBOX_INFERENCES);
         	OntModel tboxUnionModel = ModelAccess.on(ctx).getOntModel(ModelNames.TBOX_UNION);
-        	log.debug("tboxAssertionsModel=" + tboxAssertionsModel);
-        	log.debug("tboxInferencesModel=" + tboxInferencesModel);
-        	log.debug("tboxUnionModel=" + tboxUnionModel);
 
-			WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory();
-            
-            if (!tboxAssertionsModel.getProfile().NAMESPACE().equals(OWL.NAMESPACE.getNameSpace())) {        
-                log.error("Not connecting Pellet reasoner - the TBox assertions model is not an OWL model");
-                return;
-            }
-            
-            // Set various Pellet options for incremental consistency checking, etc.
-            //PelletOptions.DL_SAFE_RULES = true;
-            //PelletOptions.USE_COMPLETION_QUEUE = true;
-            //PelletOptions.USE_TRACING = true;
-            //PelletOptions.TRACK_BRANCH_EFFECTS = true;
-            //PelletOptions.USE_INCREMENTAL_CONSISTENCY = true;
-            //PelletOptions.USE_INCREMENTAL_DELETION = true;
-             
-            PelletListener pelletListener = new PelletListener(tboxUnionModel,tboxAssertionsModel,tboxInferencesModel,ReasonerConfiguration.DEFAULT);
-            sce.getServletContext().setAttribute("pelletListener",pelletListener);
-            sce.getServletContext().setAttribute("pelletOntModel", pelletListener.getPelletModel());
-            
-            if (wadf instanceof WebappDaoFactoryJena) {
-                ((WebappDaoFactoryJena) wadf).setPelletListener(pelletListener);
-            }
-            
-            log.info("Pellet reasoner connected for the TBox");
-     
-            waitForTBoxReasoning(sce); 
-            
             // set up simple reasoning for the ABox
                                 
             RDFService rdfService = ModelAccess.on(ctx).getRDFService();            
@@ -139,23 +103,6 @@ public class SimpleReasonerSetup implements ServletContextListener {
         }        
     }
     
-    public static void waitForTBoxReasoning(ServletContextEvent sce) 
-        throws InterruptedException {
-        PelletListener pelletListener = (PelletListener) sce.getServletContext().getAttribute("pelletListener");
-        if (pelletListener == null) {
-            return ;
-        }
-        int sleeps = 0;
-        // sleep at least once to make sure the TBox reasoning gets started
-        while ((0 == sleeps) || ((sleeps < 1000) && pelletListener.isReasoning())) {
-            if (((sleeps - 1) % 10) == 0) { // print message at 10 second intervals
-                log.info("Waiting for initial TBox reasoning to complete");
-            }
-            Thread.sleep(1000);   
-            sleeps++;
-        }
-    }
-    
     @Override
     public void contextDestroyed(ServletContextEvent sce) {
         log.info("received contextDestroyed notification");
@@ -209,17 +156,6 @@ public class SimpleReasonerSetup implements ServletContextListener {
         return (RecomputeMode) ctx.getAttribute(RECOMPUTE_REQUIRED_ATTR);
     }
   
-    private static final String MSTCOMPUTE_REQUIRED_ATTR = 
-        SimpleReasonerSetup.class.getName() + ".MSTComputeRequired";
-
-    public static void setMSTComputeRequired(ServletContext ctx) {
-        ctx.setAttribute(MSTCOMPUTE_REQUIRED_ATTR, true);
-    }
-    
-    private static boolean isMSTComputeRequired(ServletContext ctx) {
-        return (ctx.getAttribute(MSTCOMPUTE_REQUIRED_ATTR) != null);
-    }
-        
     /**
      * Read the names of the plugin classes classes.
      * 
@@ -278,7 +214,8 @@ public class SimpleReasonerSetup implements ServletContextListener {
             this.simpleReasoner = simpleReasoner;
         }
 
-        public void run() {
+        @Override
+		public void run() {
             simpleReasoner.recompute();
         }
     }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
index d7931035e..3419300d6 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
@@ -89,7 +89,11 @@ public class UpdateKnowledgeBase implements ServletContextListener {
 			putReportingPathsIntoSettings(ctx, settings);
 			putNonReportingPathsIntoSettings(ctx, settings);
 
-            SimpleReasonerSetup.waitForTBoxReasoning(sce); 
+			try {
+				ApplicationUtils.instance().getTBoxReasonerModule().waitForTBoxReasoning();
+			} catch (Exception e) {
+				// Should mean that the reasoner is not even started yet.
+			}
 			
 			WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory();
 			settings.setDefaultNamespace(wadf.getDefaultNamespace());
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ConfiguredReasonerListener.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ConfiguredReasonerListener.java
new file mode 100644
index 000000000..8ce096af4
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ConfiguredReasonerListener.java
@@ -0,0 +1,349 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.tboxreasoner;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelChangedListener;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+import com.hp.hpl.jena.vocabulary.OWL;
+import com.hp.hpl.jena.vocabulary.RDF;
+
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
+
+/**
+ * Listens for changes on a model. When a change is announced, it is checked for
+ * worthiness. If worthy, it is added to a change set.
+ * 
+ * When an ending EditEvent is received, the current change set is passed along
+ * to the reasoner driver, and a new change set is begun.
+ * 
+ * Among the criteria for deciding on worthiness is the driving pattern set. In
+ * the constructor, a map is made from this set, to reduce the number of tests
+ * made against each statement. I don't know whether this optimization is
+ * justified.
+ * 
+ * It is possible to "suspend" the listener, so it will ignore any changes. This
+ * is useful when the reasoner itself makes changes to the models, so those
+ * changes do not trigger additional reasoning.
+ */
+public class ConfiguredReasonerListener implements ModelChangedListener {
+	private static final Log log = LogFactory
+			.getLog(ConfiguredReasonerListener.class);
+
+	private final ReasonerConfiguration reasonerConfiguration;
+	private final TBoxReasonerDriver reasonerDriver;
+
+	private final DrivingPatternMap drivingPatternMap;
+
+	private final AtomicReference<TBoxChanges> changeSet;
+	private final AtomicBoolean suspended;
+
+	public ConfiguredReasonerListener(
+			ReasonerConfiguration reasonerConfiguration,
+			TBoxReasonerDriver reasonerDriver) {
+		this.reasonerConfiguration = reasonerConfiguration;
+		this.reasonerDriver = reasonerDriver;
+
+		this.drivingPatternMap = new DrivingPatternMap(
+				reasonerConfiguration.getInferenceDrivingPatternAllowSet());
+
+		this.changeSet = new AtomicReference<>(new TBoxChanges());
+		this.suspended = new AtomicBoolean();
+	}
+
+	public Suspension suspend() {
+		if (!suspended.compareAndSet(false, true)) {
+			throw new IllegalStateException("Listener is already suspended.");
+		}
+		return new Suspension();
+	}
+
+	public class Suspension implements AutoCloseable {
+		@Override
+		public void close() {
+			boolean wasSuspended = suspended.compareAndSet(true, false);
+			if (!wasSuspended) {
+				log.warn("Listener was already not suspended.");
+			}
+		}
+	}
+
+	/**
+	 * Lists of patterns, mapped by their predicates.
+	 */
+	public class DrivingPatternMap extends
+			HashMap<Property, List<ReasonerStatementPattern>> {
+
+		public DrivingPatternMap(Set<ReasonerStatementPattern> patternSet) {
+			if (patternSet != null) {
+				for (ReasonerStatementPattern pat : patternSet) {
+					Property p = pat.getPredicate();
+					if (!containsKey(p)) {
+						put(p, new LinkedList<ReasonerStatementPattern>());
+					}
+					get(p).add(pat);
+				}
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// Implement the ModelChangedListener methods. Delegate to the methods that
+	// check criteria.
+	// ----------------------------------------------------------------------
+
+	@Override
+	public void addedStatement(Statement s) {
+		tryAdd(s);
+	}
+
+	@Override
+	public void addedStatements(Statement[] statements) {
+		for (Statement stmt : statements) {
+			tryAdd(stmt);
+		}
+	}
+
+	@Override
+	public void addedStatements(List<Statement> statements) {
+		for (Statement stmt : statements) {
+			tryAdd(stmt);
+		}
+	}
+
+	@Override
+	public void addedStatements(StmtIterator statements) {
+		for (Statement stmt : statements.toList()) {
+			tryAdd(stmt);
+		}
+	}
+
+	@Override
+	public void addedStatements(Model m) {
+		for (Statement stmt : m.listStatements().toList()) {
+			tryAdd(stmt);
+		}
+	}
+
+	@Override
+	public void removedStatement(Statement s) {
+		tryRemove(s);
+	}
+
+	@Override
+	public void removedStatements(Statement[] statements) {
+		for (Statement stmt : statements) {
+			tryRemove(stmt);
+		}
+	}
+
+	@Override
+	public void removedStatements(List<Statement> statements) {
+		for (Statement stmt : statements) {
+			tryRemove(stmt);
+		}
+	}
+
+	@Override
+	public void removedStatements(StmtIterator statements) {
+		for (Statement stmt : statements.toList()) {
+			tryRemove(stmt);
+		}
+	}
+
+	@Override
+	public void removedStatements(Model m) {
+		for (Statement stmt : m.listStatements().toList()) {
+			tryRemove(stmt);
+		}
+	}
+
+	@Override
+	public void notifyEvent(Model m, Object event) {
+		if (event instanceof EditEvent) {
+			EditEvent ee = (EditEvent) event;
+			if (!ee.getBegin()) {
+				TBoxChanges changes = changeSet.getAndSet(new TBoxChanges());
+				this.reasonerDriver.runSynchronizer(changes);
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// Check the criteria to determine whether each addition or removal should
+	// be passed to the reasoner.
+	//
+	// When the listener is suspended, nothing is passed on.
+	// ----------------------------------------------------------------------
+
+	public void tryAdd(Statement stmt) {
+		if (suspended.get()) {
+			return;
+		}
+
+		if (isDataProperty(stmt)) {
+			if (reasonOnAllDataProperties() || hasCardinalityPredicate(stmt)) {
+				addIt(stmt);
+				return;
+			} else {
+				return;
+			}
+		}
+
+		if (predicateIsInVitroNamespace(stmt)
+				|| statementMatchesDenyPattern(stmt)) {
+			return;
+		}
+
+		if (thereAreNoDrivingPatterns() || statementMatchesDrivingPattern(stmt)) {
+			addIt(stmt);
+			return;
+		}
+	}
+
+	public void tryRemove(Statement stmt) {
+		if (suspended.get()) {
+			return;
+		}
+
+		if (isDataProperty(stmt)) {
+			if (reasonOnAllDataProperties() || hasCardinalityPredicate(stmt)) {
+				removeIt(stmt);
+				return;
+			} else {
+				return;
+			}
+		}
+
+		if (actOnObjectPropertyDeclarations() && declaresObjectProperty(stmt)) {
+			deleteObjectProperty(stmt);
+			return;
+		}
+
+		if (actOnDataPropertyDeclarations() && declaresDataProperty(stmt)) {
+			deleteDataProperty(stmt);
+			return;
+		}
+
+		if (statementMatchesDenyPattern(stmt)) {
+			return;
+		}
+
+		if (thereAreNoDrivingPatterns() || statementMatchesDrivingPattern(stmt)) {
+			removeIt(stmt);
+			return;
+		}
+	}
+
+	private boolean isDataProperty(Statement stmt) {
+		return stmt.getObject().isLiteral();
+	}
+
+	private boolean reasonOnAllDataProperties() {
+		return reasonerConfiguration.getReasonOnAllDatatypePropertyStatements();
+	}
+
+	private boolean predicateIsInVitroNamespace(Statement stmt) {
+		return stmt.getPredicate().getURI().indexOf(VitroVocabulary.vitroURI) == 0;
+	}
+
+	private boolean statementMatchesDenyPattern(Statement stmt) {
+		Set<ReasonerStatementPattern> denyPatterns = reasonerConfiguration.inferenceDrivingPatternDenySet;
+		if (denyPatterns == null) {
+			return false;
+		}
+
+		ReasonerStatementPattern stPat = ReasonerStatementPattern
+				.objectPattern(stmt);
+
+		for (ReasonerStatementPattern pat : denyPatterns) {
+			if (pat.matches(stPat)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private boolean thereAreNoDrivingPatterns() {
+		return reasonerConfiguration.inferenceDrivingPatternAllowSet == null;
+	}
+
+	private boolean statementMatchesDrivingPattern(Statement stmt) {
+		List<ReasonerStatementPattern> drivePatterns = drivingPatternMap
+				.get(stmt.getPredicate());
+		if (drivePatterns == null) {
+			return false;
+		}
+
+		ReasonerStatementPattern stPat = ReasonerStatementPattern
+				.objectPattern(stmt);
+
+		for (ReasonerStatementPattern pat : drivePatterns) {
+			if (pat.matches(stPat)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private boolean actOnObjectPropertyDeclarations() {
+		return reasonerConfiguration.getQueryForAllObjectProperties();
+	}
+
+	private boolean declaresObjectProperty(Statement stmt) {
+		return stmt.getPredicate().equals(RDF.type)
+				&& stmt.getObject().equals(OWL.ObjectProperty);
+	}
+
+	private boolean actOnDataPropertyDeclarations() {
+		return reasonerConfiguration.getQueryForAllDatatypeProperties();
+	}
+
+	private boolean declaresDataProperty(Statement stmt) {
+		return stmt.getPredicate().equals(RDF.type)
+				&& stmt.getObject().equals(OWL.DatatypeProperty);
+	}
+
+	private void addIt(Statement stmt) {
+		changeSet.get().addStatement(stmt);
+	}
+
+	private void removeIt(Statement stmt) {
+		changeSet.get().removeStatement(stmt);
+	}
+
+	private void deleteObjectProperty(Statement stmt) {
+		changeSet.get().deleteObjectProperty(stmt);
+	}
+
+	private void deleteDataProperty(Statement stmt) {
+		changeSet.get().deleteDataProperty(stmt);
+	}
+
+	// The pattern matching stuff needs to get reworked.
+	// It originally assumed that only resources would be in object
+	// position, but cardinality axioms will have e.g. nonNegativeIntegers.
+	// This is a temporary workaround: all cardinality statements will
+	// be exposed to Pellet, regardless of configuration patterns.
+	private boolean hasCardinalityPredicate(Statement stmt) {
+		return (stmt.getPredicate().equals(OWL.cardinality)
+				|| stmt.getPredicate().equals(OWL.minCardinality) || stmt
+				.getPredicate().equals(OWL.maxCardinality));
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/InferenceModelUpdater.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/InferenceModelUpdater.java
new file mode 100644
index 000000000..1fcfaaabe
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/InferenceModelUpdater.java
@@ -0,0 +1,119 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.tboxreasoner;
+
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Statement;
+
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.ConfiguredReasonerListener;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.ConfiguredReasonerListener.Suspension;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.ReasonerStatementPattern;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.TBoxReasoner;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection.LockableModel;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection.LockableOntModel;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection.LockedModel;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection.LockedOntModel;
+
+/**
+ * A tool that will adjust the inferences model to match the reasoner model,
+ * after applying the proper filters to both.
+ */
+public class InferenceModelUpdater {
+	private static final Log log = LogFactory
+			.getLog(InferenceModelUpdater.class);
+
+	private final TBoxReasoner reasoner;
+	private final LockableModel lockableInferencesModel;
+	private final LockableOntModel lockableFullModel;
+	private final ConfiguredReasonerListener listener;
+
+	private int addCount;
+	private int retractCount;
+
+	public int getAddCount() {
+		return addCount;
+	}
+
+	public int getRetractCount() {
+		return retractCount;
+	}
+
+	public InferenceModelUpdater(TBoxReasoner reasoner,
+			LockableModel lockableInferencesModel,
+			LockableOntModel lockableFullModel,
+			ConfiguredReasonerListener listener) {
+		this.reasoner = reasoner;
+		this.lockableInferencesModel = lockableInferencesModel;
+		this.lockableFullModel = lockableFullModel;
+		this.listener = listener;
+	}
+
+	/**
+	 * Synchronize the inferences model with the reasoner model, with this
+	 * proviso:
+	 * 
+	 * If a statement exists anywhere in the full TBox, don't bother adding it
+	 * to the inferences model.
+	 */
+	public void update(List<ReasonerStatementPattern> patternList) {
+		List<Statement> filteredReasonerModel = reasoner
+				.filterResults(patternList);
+		addNewInferences(filteredReasonerModel);
+		removeOldInferences(filterInferencesModel(patternList),
+				filteredReasonerModel);
+		log.debug("Added: " + addCount + ", Retracted: " + retractCount);
+	}
+
+	private void addNewInferences(List<Statement> filteredReasonerModel) {
+		for (Statement stmt : filteredReasonerModel) {
+			if (!fullModelContainsStatement(stmt)) {
+				try (LockedModel inferenceModel = lockableInferencesModel
+						.write(); Suspension susp = listener.suspend()) {
+					inferenceModel.add(stmt);
+					addCount++;
+				}
+			}
+		}
+	}
+
+	private boolean fullModelContainsStatement(Statement stmt) {
+		try (LockedOntModel fullModel = lockableFullModel.read()) {
+			return fullModel.contains(stmt);
+		}
+	}
+
+	private Model filterInferencesModel(
+			List<ReasonerStatementPattern> patternList) {
+		Model filtered = ModelFactory.createDefaultModel();
+		try (LockedModel inferencesModel = lockableInferencesModel.read()) {
+			for (ReasonerStatementPattern pattern : patternList) {
+				filtered.add(pattern.matchStatementsFromModel(inferencesModel));
+			}
+		}
+		log.debug("Filtered inferences model: " + filtered.size());
+		return filtered;
+	}
+
+	private void removeOldInferences(Model filteredInferencesModel,
+			List<Statement> filteredReasonerStatements) {
+		Model filteredReasonerModel = ModelFactory.createDefaultModel();
+		filteredReasonerModel.add(filteredReasonerStatements);
+
+		for (Statement stmt : filteredInferencesModel.listStatements().toList()) {
+			if (!filteredReasonerModel.contains(stmt)) {
+				try (LockedModel inferenceModel = lockableInferencesModel
+						.write(); Suspension susp = listener.suspend()) {
+					retractCount++;
+					inferenceModel.remove(stmt);
+				}
+			}
+		}
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/PatternListBuilder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/PatternListBuilder.java
new file mode 100644
index 000000000..97574caaf
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/PatternListBuilder.java
@@ -0,0 +1,81 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.tboxreasoner;
+
+import static com.hp.hpl.jena.rdf.model.ResourceFactory.createProperty;
+
+import java.util.LinkedList;
+import java.util.Set;
+
+import com.hp.hpl.jena.ontology.DatatypeProperty;
+import com.hp.hpl.jena.ontology.ObjectProperty;
+
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.ReasonerConfiguration;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.ReasonerStatementPattern;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.TBoxChanges;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.TBoxReasoner;
+
+/**
+ * The list of patterns for filtering the models will include:
+ * 
+ * All patterns specified by the ReasonerConfiguration,
+ * 
+ * One pattern for each deleted property, to match the use of that property as a
+ * predicate.
+ */
+public class PatternListBuilder {
+	private static final String OWL_NS = "http://www.w3.org/2002/07/owl#";
+
+	private final ReasonerConfiguration reasonerConfiguration;
+	private final TBoxReasoner reasoner;
+	private final TBoxChanges changes;
+
+	public PatternListBuilder(ReasonerConfiguration reasonerConfiguration,
+			TBoxReasoner reasoner, TBoxChanges changes) {
+		this.reasonerConfiguration = reasonerConfiguration;
+		this.reasoner = reasoner;
+		this.changes = changes;
+	}
+
+	public LinkedList<ReasonerStatementPattern> build() {
+		LinkedList<ReasonerStatementPattern> patterns = new LinkedList<>();
+
+		Set<ReasonerStatementPattern> allowSet = reasonerConfiguration
+				.getInferenceReceivingPatternAllowSet();
+		if (allowSet != null) {
+			patterns.addAll(allowSet);
+		} else {
+			patterns.add(ReasonerStatementPattern.ANY_OBJECT_PROPERTY);
+		}
+
+		if (reasonerConfiguration.getQueryForAllObjectProperties()) {
+			for (ObjectProperty objProp : reasoner.listObjectProperties()) {
+				if (!(OWL_NS.equals(objProp.getNameSpace()))) {
+					patterns.add(ReasonerStatementPattern
+							.objectPattern(objProp));
+				}
+			}
+
+			for (String uri : changes.getDeletedObjectPropertyUris()) {
+				patterns.add(ReasonerStatementPattern
+						.objectPattern(createProperty(uri)));
+			}
+		}
+
+		if (reasonerConfiguration.getQueryForAllDatatypeProperties()) {
+			for (DatatypeProperty dataProp : reasoner.listDatatypeProperties()) {
+				if (!(OWL_NS.equals(dataProp.getNameSpace()))) {
+					// TODO: THIS WILL WORK, BUT NEED TO GENERALIZE THE
+					// PATTERN CLASSES
+					patterns.add(ReasonerStatementPattern
+							.objectPattern(dataProp));
+				}
+			}
+			for (String uri : changes.getDeletedDataPropertyUris()) {
+				patterns.add(ReasonerStatementPattern
+						.objectPattern(createProperty(uri)));
+			}
+		}
+		return patterns;
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/ReasonerConfiguration.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerConfiguration.java
similarity index 52%
rename from webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/ReasonerConfiguration.java
rename to webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerConfiguration.java
index 970c14e4d..8f6889ba2 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/ReasonerConfiguration.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerConfiguration.java
@@ -1,22 +1,22 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.dao.jena.pellet;
+package edu.cornell.mannlib.vitro.webapp.tboxreasoner;
 
 import java.util.HashSet;
 import java.util.Set;
 
+import org.mindswap.pellet.jena.PelletReasonerFactory;
+
 import com.hp.hpl.jena.ontology.OntModelSpec;
 import com.hp.hpl.jena.vocabulary.OWL;
 import com.hp.hpl.jena.vocabulary.RDF;
 import com.hp.hpl.jena.vocabulary.RDFS;
 
-import org.mindswap.pellet.jena.PelletReasonerFactory;
-
 public class ReasonerConfiguration {
 	
-	public Set<ObjectPropertyStatementPattern> inferenceDrivingPatternAllowSet;
-	public Set<ObjectPropertyStatementPattern> inferenceDrivingPatternDenySet;
-	public Set<ObjectPropertyStatementPattern> inferenceReceivingPatternAllowSet;
+	public Set<ReasonerStatementPattern> inferenceDrivingPatternAllowSet;
+	public Set<ReasonerStatementPattern> inferenceDrivingPatternDenySet;
+	public Set<ReasonerStatementPattern> inferenceReceivingPatternAllowSet;
 	
 	private boolean queryForAllObjectProperties = false;
 	private boolean incrementalReasoningEnabled = true;
@@ -58,34 +58,34 @@ public class ReasonerConfiguration {
 		
 		//ask the reasoner only to classify, realize, and infer disjointWith statements (based on a somewhat incomplete information)
 		DEFAULT = new ReasonerConfiguration();
-		HashSet<ObjectPropertyStatementPattern> defaultInferenceDrivingPatternAllowSet = new HashSet<ObjectPropertyStatementPattern>();
-		defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,RDF.type,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,RDFS.subClassOf,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,RDFS.subPropertyOf,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.equivalentClass,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.unionOf,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.intersectionOf,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.complementOf,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.oneOf,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.onProperty,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.someValuesFrom,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.allValuesFrom,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.hasValue,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.minCardinality,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.maxCardinality,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.cardinality,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,RDF.first,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,RDF.rest,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.disjointWith,null));
-        defaultInferenceDrivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.inverseOf,null));
+		HashSet<ReasonerStatementPattern> defaultInferenceDrivingPatternAllowSet = new HashSet<>();
+		defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(RDF.type));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(RDFS.subClassOf));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(RDFS.subPropertyOf));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.equivalentClass));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.unionOf));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.intersectionOf));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.complementOf));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.oneOf));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.onProperty));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.someValuesFrom));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.allValuesFrom));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.hasValue));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.minCardinality));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.maxCardinality));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.cardinality));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(RDF.first));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(RDF.rest));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.disjointWith));
+        defaultInferenceDrivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.inverseOf));
         DEFAULT.setInferenceDrivingPatternAllowSet(defaultInferenceDrivingPatternAllowSet);
-        Set<ObjectPropertyStatementPattern> defaultInferenceReceivingPatternAllowSet = new HashSet<ObjectPropertyStatementPattern>();
-        defaultInferenceReceivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,RDF.type,null));
-        defaultInferenceReceivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,RDFS.subClassOf,null));
-        defaultInferenceReceivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,RDFS.subPropertyOf,null));
-        defaultInferenceReceivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.equivalentClass,null));
-        defaultInferenceReceivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.disjointWith,null));
-        defaultInferenceReceivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null,OWL.inverseOf,null));
+        Set<ReasonerStatementPattern> defaultInferenceReceivingPatternAllowSet = new HashSet<>();
+        defaultInferenceReceivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(RDF.type));
+        defaultInferenceReceivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(RDFS.subClassOf));
+        defaultInferenceReceivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(RDFS.subPropertyOf));
+        defaultInferenceReceivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.equivalentClass));
+        defaultInferenceReceivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.disjointWith));
+        defaultInferenceReceivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.inverseOf));
         DEFAULT.setInferenceReceivingPatternAllowSet(defaultInferenceReceivingPatternAllowSet);
         DEFAULT.setQueryForAllObjectProperties(false);
 
@@ -107,36 +107,36 @@ public class ReasonerConfiguration {
 		COMPLETE.setQueryForAllObjectProperties(true); 
 		COMPLETE.setReasonOnAllDatatypePropertyStatements(true); 
 		COMPLETE.setQueryForAllDatatypeProperties(true); 
-		Set<ObjectPropertyStatementPattern> completeInferenceReceivingPatternAllowSet = new HashSet<ObjectPropertyStatementPattern>(); 
+		Set<ReasonerStatementPattern> completeInferenceReceivingPatternAllowSet = new HashSet<>(); 
 		completeInferenceReceivingPatternAllowSet.addAll(defaultInferenceReceivingPatternAllowSet);
-		completeInferenceReceivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null, OWL.sameAs, null));
+		completeInferenceReceivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.sameAs));
 		// getting NPEs inside Pellet with differentFrom on 2.0.0-rc7 
-        //completeInferenceReceivingPatternAllowSet.add(ObjectPropertyStatementPatternFactory.getPattern(null, OWL.differentFrom, null));
+        //completeInferenceReceivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern( OWL.differentFrom, null));
         COMPLETE.setInferenceReceivingPatternAllowSet(completeInferenceReceivingPatternAllowSet);
         
 	}
 	
-	public Set<ObjectPropertyStatementPattern> getInferenceDrivingPatternAllowSet() {
+	public Set<ReasonerStatementPattern> getInferenceDrivingPatternAllowSet() {
 		return this.inferenceDrivingPatternAllowSet;
 	}
 	
-	public void setInferenceDrivingPatternAllowSet(Set<ObjectPropertyStatementPattern> patternSet) {
+	public void setInferenceDrivingPatternAllowSet(Set<ReasonerStatementPattern> patternSet) {
 		this.inferenceDrivingPatternAllowSet = patternSet;
 	}
 	
-	public Set<ObjectPropertyStatementPattern> getInferenceDrivingPatternDenySet() {
+	public Set<ReasonerStatementPattern> getInferenceDrivingPatternDenySet() {
 		return this.inferenceDrivingPatternDenySet;
 	}
 	
-	public void setInferenceDrivingPatternDenySet(Set<ObjectPropertyStatementPattern> patternSet) {
+	public void setInferenceDrivingPatternDenySet(Set<ReasonerStatementPattern> patternSet) {
 		this.inferenceDrivingPatternDenySet = patternSet;
 	}
 	
-	public Set<ObjectPropertyStatementPattern> getInferenceReceivingPatternAllowSet() {
+	public Set<ReasonerStatementPattern> getInferenceReceivingPatternAllowSet() {
 		return this.inferenceReceivingPatternAllowSet;
 	}
 	
-	public void setInferenceReceivingPatternAllowSet(Set<ObjectPropertyStatementPattern> patternSet) {
+	public void setInferenceReceivingPatternAllowSet(Set<ReasonerStatementPattern> patternSet) {
 		this.inferenceReceivingPatternAllowSet = patternSet;
 	}
 	
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerStatementPattern.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerStatementPattern.java
new file mode 100644
index 000000000..e1c1c627e
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerStatementPattern.java
@@ -0,0 +1,94 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.tboxreasoner;
+
+import java.util.List;
+
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.shared.Lock;
+
+/**
+ * For now, this only models Object Properties.
+ * 
+ * It should be easy to add Data Property patterns by making this abstract and
+ * creating two concrete subclasses.
+ */
+public class ReasonerStatementPattern {
+	public static final ReasonerStatementPattern ANY_OBJECT_PROPERTY = new ReasonerStatementPattern(
+			null, null, null);
+
+	public static ReasonerStatementPattern objectPattern(Property predicate) {
+		return new ReasonerStatementPattern(null, predicate, null);
+	}
+
+	public static ReasonerStatementPattern objectPattern(Statement stmt) {
+		if (!stmt.getObject().isResource()) {
+			throw new IllegalArgumentException(
+					"Object of stmt must be a resource.");
+		}
+		return new ReasonerStatementPattern(stmt.getSubject(),
+				stmt.getPredicate(), stmt.getObject().asResource());
+	}
+
+	/**
+	 * Any or all of these may be null, which acts as a wild card.
+	 */
+	private final Resource subject;
+	private final Property predicate;
+	private final Resource object;
+	private final String toString;
+
+	private ReasonerStatementPattern(Resource subject, Property predicate,
+			Resource object) {
+		this.subject = subject;
+		this.predicate = predicate;
+		this.object = object;
+		this.toString = buildToString();
+	}
+
+	public Property getPredicate() {
+		return predicate;
+	}
+
+	/**
+	 * All fields must match, either by being equal, or by being a wild card.
+	 */
+	public boolean matches(ReasonerStatementPattern that) {
+		boolean sMatch = this.subject == null || that.subject == null
+				|| this.subject.equals(that.subject);
+		boolean pMatch = this.predicate == null || that.predicate == null
+				|| this.predicate.equals(that.predicate);
+		boolean oMatch = this.object == null || that.object == null
+				|| this.object.equals(that.object);
+		return sMatch && pMatch && oMatch;
+	}
+
+	/**
+	 * Get a list of statements from this model that match this pattern.
+	 */
+	public List<Statement> matchStatementsFromModel(Model m) {
+		m.enterCriticalSection(Lock.READ);
+		try {
+			return m.listStatements(subject, predicate, object).toList();
+		} finally {
+			m.leaveCriticalSection();
+		}
+	}
+
+	public String buildToString() {
+		return "ReasonerStatementPattern[subject="
+				+ (subject == null ? "*" : subject.toString()) + ", predicate="
+				+ (predicate == null ? "*" : predicate.toString())
+				+ ", object=" + (object == null ? "*" : object.toString())
+				+ "]";
+	}
+
+	@Override
+	public String toString() {
+		return toString;
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxChanges.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxChanges.java
new file mode 100644
index 000000000..efe79d917
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxChanges.java
@@ -0,0 +1,83 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.tboxreasoner;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.Statement;
+
+/**
+ * Accumulate changes to the TBox as they arrive. Then make them available to
+ * the TBox reasoner.
+ */
+public class TBoxChanges {
+	private final List<Statement> addedStatements = Collections
+			.synchronizedList(new ArrayList<Statement>());
+
+	private final List<Statement> removedStatements = Collections
+			.synchronizedList(new ArrayList<Statement>());
+
+	private final List<String> deletedDataPropertyUris = Collections
+			.synchronizedList(new ArrayList<String>());
+
+	private final List<String> deletedObjectPropertyUris = Collections
+			.synchronizedList(new ArrayList<String>());
+
+	// ----------------------------------------------------------------------
+	// These methods are called when populating the changeSet. They must be
+	// thread-safe.
+	// ----------------------------------------------------------------------
+
+	public void addStatement(Statement stmt) {
+		addedStatements.add(stmt);
+	}
+
+	public void removeStatement(Statement stmt) {
+		removedStatements.remove(stmt);
+	}
+
+	public void deleteDataProperty(Statement stmt) {
+		Resource subject = stmt.getSubject();
+		if (subject.isURIResource()) {
+			deletedDataPropertyUris.add(subject.getURI());
+		}
+	}
+
+	public void deleteObjectProperty(Statement stmt) {
+		Resource subject = stmt.getSubject();
+		if (subject.isURIResource()) {
+			deletedObjectPropertyUris.add(subject.getURI());
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// These methods are called when processing the changeSet. By that time, it
+	// is owned and accessed by a single thread.
+	// ----------------------------------------------------------------------
+
+	public boolean isEmpty() {
+		return addedStatements.isEmpty() && removedStatements.isEmpty()
+				&& deletedDataPropertyUris.isEmpty()
+				&& deletedObjectPropertyUris.isEmpty();
+	}
+
+	public List<Statement> getAddedStatements() {
+		return addedStatements;
+	}
+
+	public List<Statement> getRemovedStatements() {
+		return removedStatements;
+	}
+
+	public List<String> getDeletedDataPropertyUris() {
+		return deletedDataPropertyUris;
+	}
+
+	public List<String> getDeletedObjectPropertyUris() {
+		return deletedObjectPropertyUris;
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasoner.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasoner.java
new file mode 100644
index 000000000..5839193ca
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasoner.java
@@ -0,0 +1,87 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.tboxreasoner;
+
+import java.util.List;
+
+import com.hp.hpl.jena.ontology.DatatypeProperty;
+import com.hp.hpl.jena.ontology.ObjectProperty;
+import com.hp.hpl.jena.ontology.Restriction;
+import com.hp.hpl.jena.rdf.model.Statement;
+
+/**
+ * The functionality of a TBox reasoner.
+ * 
+ * The reasoner will maintain its own TBox model. It will receive updates to
+ * that model and perform reasoning on it. It will answer queries about the
+ * contents of the model, when reasoning is complete.
+ */
+public interface TBoxReasoner {
+
+	/**
+	 * Add the additions and remove the removals.
+	 */
+	void updateReasonerModel(TBoxChanges changes);
+
+	/**
+	 * Chew on it and create the inferences. Report status.
+	 */
+	Status performReasoning();
+
+	/**
+	 * List all of the ObjectProperties from the reasoner model, after updating
+	 * and reasoning.
+	 */
+	List<ObjectProperty> listObjectProperties();
+
+	/**
+	 * List all of the DatatypeProperties from the reasoner model, after
+	 * updating and reasoning.
+	 */
+	List<DatatypeProperty> listDatatypeProperties();
+
+	/**
+	 * List all of the restrictions in the reasoner model, after updating and
+	 * reasoning.
+	 */
+	List<Restriction> listRestrictions();
+	
+	/**
+	 * List all of the statements that satisfy any of these patterns, after
+	 * updating and reasoning.
+	 */
+	List<Statement> filterResults(List<ReasonerStatementPattern> patternList);
+	
+	public static class Status {
+		public static final Status SUCCESS = new Status(true, false, "");
+		public static final Status ERROR = new Status(true, true, "");
+		
+		public static final Status inconsistent(String explanation) {
+			return new Status(false, false, explanation);
+		}
+
+		private final boolean consistent;
+		private final boolean inErrorState;
+		private final String explanation;
+
+		private Status(boolean consistent, boolean inErrorState,
+				String explanation) {
+			this.consistent = consistent;
+			this.inErrorState = inErrorState;
+			this.explanation = explanation;
+		}
+
+		public boolean isConsistent() {
+			return consistent;
+		}
+
+		public boolean isInErrorState() {
+			return inErrorState;
+		}
+
+		public String getExplanation() {
+			return explanation;
+		}
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasonerDriver.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasonerDriver.java
new file mode 100644
index 000000000..edd3da3a9
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasonerDriver.java
@@ -0,0 +1,17 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.tboxreasoner;
+
+import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerStatus;
+
+
+/**
+ * What calls can the ConfiguredReasonerListener make to drive the TBox
+ * reasoner?
+ */
+public interface TBoxReasonerDriver {
+
+	void runSynchronizer(TBoxChanges changeSet);
+	
+	TBoxReasonerStatus getStatus();
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/BasicTBoxReasonerDriver.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/BasicTBoxReasonerDriver.java
new file mode 100644
index 000000000..9ffe21cb5
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/BasicTBoxReasonerDriver.java
@@ -0,0 +1,253 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.tboxreasoner.impl;
+
+import static edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread.WorkLevel.IDLE;
+import static edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread.WorkLevel.WORKING;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.Resource;
+
+import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
+import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerStatus;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.ConfiguredReasonerListener;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.InferenceModelUpdater;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.PatternListBuilder;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.ReasonerConfiguration;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.ReasonerStatementPattern;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.TBoxChanges;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.TBoxReasoner;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.TBoxReasoner.Status;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.TBoxReasonerDriver;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection.LockableModel;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection.LockableOntModel;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection.LockedOntModel;
+import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread;
+
+/**
+ * The basic implementation of the TBoxReasonerDriver. It gets help from a
+ * listener, an executor, and a reasoner.
+ * 
+ * Create a listener that listens for changes to the TBox, but filters them
+ * according to a ReasonerConfiguration object. The listener accumulates the
+ * changes it likes, until it detects an ending EditEvent. Then it passes the
+ * change set back to the driver.
+ * 
+ * Each time a change set is received, a task is created and given to the
+ * executor to run. The executor is single-threaded, so the change sets are
+ * processed in sequence.
+ * 
+ * Processing involves the following steps:
+ * 
+ * 1. Telling the reasoner about the changes, so it can update its own internal
+ * ontology model.
+ * 
+ * 2. Telling the reasoner to re-inference its model. A status is returned.
+ * 
+ * 3. Asking the reasoner for the inferences from its model. As with the initial
+ * changes, these inferences are filtered according to the
+ * ReasonerConfiguration.
+ * 
+ * 4. Synchronizing the applications TBox inferences model with the inferences
+ * obtained from the reasoner.
+ * 
+ * ----------------------
+ * 
+ * Possible optimization: if change sets come in quickly enough that the third
+ * set is received while the first is still being processed, it would be
+ * reasonable to merge the second and third sets into one.
+ */
+public class BasicTBoxReasonerDriver implements TBoxReasonerDriver {
+	private static final Log log = LogFactory
+			.getLog(BasicTBoxReasonerDriver.class);
+
+	private final LockableOntModel lockableAssertionsModel;
+	private final LockableModel lockableInferencesModel;
+	private final LockableOntModel lockableFullModel;
+
+	private final ReasonerConfiguration reasonerConfiguration;
+
+	private final ConfiguredReasonerListener listener;
+
+	private final Set<TBoxChanges> pendingChangeSets;
+
+	private final ExecutorService executorService;
+
+	private final TBoxReasoner reasoner;
+
+	private TBoxReasoner.Status innerStatus;
+
+	public BasicTBoxReasonerDriver(OntModel assertionsModel,
+			Model inferencesModel, OntModel fullModel, TBoxReasoner reasoner,
+			ReasonerConfiguration reasonerConfiguration) {
+		this.lockableAssertionsModel = new LockableOntModel(assertionsModel);
+		this.lockableInferencesModel = new LockableModel(inferencesModel);
+		this.lockableFullModel = new LockableOntModel(fullModel);
+		this.reasoner = reasoner;
+		this.reasonerConfiguration = reasonerConfiguration;
+
+		this.listener = new ConfiguredReasonerListener(reasonerConfiguration,
+				this);
+
+		this.pendingChangeSets = Collections
+				.synchronizedSet(new HashSet<TBoxChanges>());
+
+		this.executorService = Executors.newFixedThreadPool(1,
+				new VitroBackgroundThread.Factory("TBoxReasoner"));
+
+		assertionsModel.getBaseModel().register(listener);
+		fullModel.getBaseModel().register(listener);
+
+		doInitialReasoning();
+	}
+
+	private void doInitialReasoning() {
+		try (LockedOntModel assertionsModel = lockableAssertionsModel.read()) {
+			for (ReasonerStatementPattern pat : reasonerConfiguration
+					.getInferenceDrivingPatternAllowSet()) {
+				listener.addedStatements(assertionsModel.listStatements(
+						(Resource) null, pat.getPredicate(), (RDFNode) null));
+			}
+		}
+		listener.notifyEvent(null, new EditEvent(null, false));
+	}
+
+	@Override
+	public TBoxReasonerStatus getStatus() {
+		return new FullStatus(innerStatus, !pendingChangeSets.isEmpty());
+	}
+
+	@Override
+	public void runSynchronizer(TBoxChanges changeSet) {
+		if (!changeSet.isEmpty()) {
+			executorService.execute(new ReasoningTask(changeSet));
+		}
+	}
+
+	/**
+	 * Shut down the thread that runs the reasoning tasks. Don't wait longer
+	 * than 1 minute.
+	 */
+	public void shutdown() {
+		executorService.shutdown();
+		int waited = 0;
+		while (waited < 60 && !executorService.isTerminated()) {
+			try {
+				log.info("Waiting for TBox reasoner to terminate.");
+				executorService.awaitTermination(5, TimeUnit.SECONDS);
+				waited += 5;
+			} catch (InterruptedException e) {
+				// Should never happen.
+				e.printStackTrace();
+				break;
+			}
+		}
+		if (!executorService.isTerminated()) {
+			log.warn("Forcing TBox reasoner to terminate.");
+			executorService.shutdownNow();
+		}
+		if (!executorService.isTerminated()) {
+			log.error("TBox reasoner did not terminate.");
+		}
+	}
+
+	private class ReasoningTask implements Runnable {
+		private final TBoxChanges changes;
+		private List<ReasonerStatementPattern> patternList;
+
+		public ReasoningTask(TBoxChanges changes) {
+			this.changes = changes;
+			pendingChangeSets.add(changes);
+		}
+
+		@Override
+		public void run() {
+			try {
+				setWorking();
+
+				reasoner.updateReasonerModel(changes);
+				innerStatus = reasoner.performReasoning();
+
+				buildPatternList();
+				updateInferencesModel();
+
+				setIdle();
+			} finally {
+				pendingChangeSets.remove(changes);
+			}
+		}
+
+		private void setWorking() {
+			Thread current = Thread.currentThread();
+			if (current instanceof VitroBackgroundThread) {
+				((VitroBackgroundThread) current).setWorkLevel(WORKING);
+			}
+		}
+
+		private void setIdle() {
+			Thread current = Thread.currentThread();
+			if (current instanceof VitroBackgroundThread) {
+				((VitroBackgroundThread) current).setWorkLevel(IDLE);
+			}
+		}
+
+		private void buildPatternList() {
+			PatternListBuilder patternListBuilder = new PatternListBuilder(
+					reasonerConfiguration, reasoner, changes);
+			this.patternList = patternListBuilder.build();
+		}
+
+		private void updateInferencesModel() {
+			InferenceModelUpdater inferenceModelUpdater = new InferenceModelUpdater(
+					reasoner, lockableInferencesModel, lockableFullModel,
+					listener);
+			inferenceModelUpdater.update(patternList);
+		}
+	}
+
+	private static class FullStatus implements TBoxReasonerStatus {
+		private final TBoxReasoner.Status reasonerStatus;
+		private final boolean reasoning;
+
+		public FullStatus(Status reasonerStatus, boolean reasoning) {
+			this.reasonerStatus = reasonerStatus;
+			this.reasoning = reasoning;
+		}
+
+		@Override
+		public boolean isReasoning() {
+			return reasoning;
+		}
+
+		@Override
+		public boolean isConsistent() {
+			return reasonerStatus.isConsistent();
+		}
+
+		@Override
+		public boolean isInErrorState() {
+			return reasonerStatus.isInErrorState();
+		}
+
+		@Override
+		public String getExplanation() {
+			String explanation = reasonerStatus.getExplanation();
+			return explanation == null ? "" : explanation;
+		}
+
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/pellet/PelletTBoxReasoner.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/pellet/PelletTBoxReasoner.java
new file mode 100644
index 000000000..72b2ed49f
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/pellet/PelletTBoxReasoner.java
@@ -0,0 +1,114 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.tboxreasoner.impl.pellet;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.mindswap.pellet.exceptions.InconsistentOntologyException;
+import org.mindswap.pellet.jena.PelletInfGraph;
+
+import com.hp.hpl.jena.ontology.DatatypeProperty;
+import com.hp.hpl.jena.ontology.ObjectProperty;
+import com.hp.hpl.jena.ontology.Restriction;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.vocabulary.OWL;
+import com.hp.hpl.jena.vocabulary.RDFS;
+
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.ReasonerConfiguration;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.ReasonerStatementPattern;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.TBoxChanges;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.TBoxReasoner;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection.LockableOntModel;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection.LockedOntModel;
+
+/**
+ * An implementation the TBoxReasonerWrapper for Pellet.
+ */
+public class PelletTBoxReasoner implements TBoxReasoner {
+	private static final Log log = LogFactory
+			.getLog(PelletTBoxReasoner.class);
+
+	private final LockableOntModel lockablePelletModel;
+
+	public PelletTBoxReasoner(ReasonerConfiguration reasonerConfiguration) {
+		this.lockablePelletModel = new LockableOntModel(
+				ModelFactory.createOntologyModel(reasonerConfiguration
+						.getOntModelSpec()));
+	}
+
+	@Override
+	public void updateReasonerModel(TBoxChanges changes) {
+		try (LockedOntModel pelletModel = lockablePelletModel.write()) {
+			pelletModel.remove(changes.getRemovedStatements());
+			pelletModel.add(changes.getAddedStatements());
+		}
+	}
+
+	@Override
+	public Status performReasoning() {
+		try (LockedOntModel pelletModel = lockablePelletModel.write()) {
+			try {
+				pelletModel.rebind();
+				pelletModel.prepare();
+				return Status.SUCCESS;
+			} catch (InconsistentOntologyException ioe) {
+				String explanation = ((PelletInfGraph) pelletModel.getGraph())
+						.getKB().getExplanation();
+				log.error(ioe);
+				log.error(explanation);
+				return Status.inconsistent(explanation);
+			} catch (Exception e) {
+				log.error("Exception during inference", e);
+				return Status.ERROR;
+			}
+		}
+	}
+
+	@Override
+	public List<ObjectProperty> listObjectProperties() {
+		try (LockedOntModel pelletModel = lockablePelletModel.read()) {
+			return pelletModel.listObjectProperties().toList();
+		}
+	}
+
+	@Override
+	public List<DatatypeProperty> listDatatypeProperties() {
+		try (LockedOntModel pelletModel = lockablePelletModel.read()) {
+			return pelletModel.listDatatypeProperties().toList();
+		}
+	}
+
+	@Override
+	public List<Statement> filterResults(
+			List<ReasonerStatementPattern> patternList) {
+		List<Statement> filtered = new ArrayList<>();
+		try (LockedOntModel pelletModel = lockablePelletModel.read()) {
+			for (ReasonerStatementPattern pattern : patternList) {
+				filtered.addAll(pattern.matchStatementsFromModel(pelletModel));
+			}
+		}
+		for (Iterator<Statement> fit = filtered.iterator(); fit.hasNext(); ) {
+			Statement stmt = fit.next();
+			if (stmt.getObject().equals(RDFS.Resource)) {
+				fit.remove();
+			} else if (stmt.getSubject().equals(OWL.Nothing)) {
+				fit.remove();
+			} else if (stmt.getObject().equals(OWL.Nothing)) {
+				fit.remove();
+			}
+		}
+		return filtered;
+	}
+
+	@Override
+	public List<Restriction> listRestrictions() {
+		try (LockedOntModel pelletModel = lockablePelletModel.read()) {
+			return pelletModel.listRestrictions().toList();
+		}
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/pellet/PelletTBoxReasonerModule.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/pellet/PelletTBoxReasonerModule.java
new file mode 100644
index 000000000..e04c7c54d
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/pellet/PelletTBoxReasonerModule.java
@@ -0,0 +1,102 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.tboxreasoner.impl.pellet;
+
+import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_ASSERTIONS;
+import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_INFERENCES;
+import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_UNION;
+
+import java.util.List;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.Restriction;
+import com.hp.hpl.jena.rdf.model.Model;
+
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccess;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.modules.Application;
+import edu.cornell.mannlib.vitro.webapp.modules.ComponentStartupStatus;
+import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerModule;
+import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerStatus;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.ReasonerConfiguration;
+import edu.cornell.mannlib.vitro.webapp.tboxreasoner.impl.BasicTBoxReasonerDriver;
+
+/**
+ * Configure a Pellet reasoner on the TBox.
+ */
+public class PelletTBoxReasonerModule implements TBoxReasonerModule {
+	private static final Log log = LogFactory
+			.getLog(PelletTBoxReasonerModule.class);
+
+	private PelletTBoxReasoner reasoner;
+	private BasicTBoxReasonerDriver driver;
+
+	@Override
+	public void startup(Application application, ComponentStartupStatus ss) {
+		ServletContext ctx = application.getServletContext();
+
+		ContextModelAccess contextModels = ModelAccess.on(ctx);
+		OntModel tboxAssertionsModel = contextModels
+				.getOntModel(TBOX_ASSERTIONS);
+		Model tboxInferencesModel = contextModels.getOntModel(TBOX_INFERENCES)
+				.getBaseModel();
+		OntModel tboxUnionModel = contextModels.getOntModel(TBOX_UNION);
+
+		reasoner = new PelletTBoxReasoner(ReasonerConfiguration.DEFAULT);
+		driver = new BasicTBoxReasonerDriver(tboxAssertionsModel,
+				tboxInferencesModel, tboxUnionModel, reasoner,
+				ReasonerConfiguration.DEFAULT);
+
+		ss.info("Pellet reasoner connected for the TBox");
+
+		waitForTBoxReasoning();
+	}
+
+	@Override
+	public TBoxReasonerStatus getStatus() {
+		if (driver == null) {
+			throw new IllegalStateException(
+					"PelletTBoxReasonerModule has not been started.");
+		}
+		return driver.getStatus();
+	}
+
+	@Override
+	public List<Restriction> listRestrictions() {
+		if (reasoner == null) {
+			throw new IllegalStateException(
+					"PelletTBoxReasonerModule has not been started.");
+		}
+		return reasoner.listRestrictions();
+	}
+
+	@Override
+	public void shutdown(Application application) {
+		driver.shutdown();
+	}
+
+	@Override
+	public  void waitForTBoxReasoning() {
+		int sleeps = 0;
+		// sleep at least once to make sure the TBox reasoning gets started
+		while ((0 == sleeps)
+				|| ((sleeps < 1000) && getStatus().isReasoning())) {
+			if (((sleeps - 1) % 10) == 0) { // print message at 10 second
+											// intervals
+				log.info("Waiting for initial TBox reasoning to complete");
+			}
+			try {
+				Thread.sleep(1000);
+			} catch (InterruptedException e) {
+				// This should never happen.
+				e.printStackTrace();
+			}
+			sleeps++;
+		}
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/threads/VitroBackgroundThread.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/threads/VitroBackgroundThread.java
index 47780558f..437b8d48d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/threads/VitroBackgroundThread.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/threads/VitroBackgroundThread.java
@@ -10,6 +10,8 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -106,4 +108,25 @@ public class VitroBackgroundThread extends Thread {
 			return flags;
 		}
 	}
+	
+	/**
+	 * A factory class, for use in Executors, that creates threads with
+	 * successive names.
+	 */
+	public static class Factory implements ThreadFactory{
+		private final String threadName;
+		private final AtomicInteger index;
+
+		public Factory(String threadName) {
+			this.threadName = threadName;
+			this.index = new AtomicInteger();
+		}
+
+		@Override
+		public Thread newThread(Runnable r) {
+			return new VitroBackgroundThread(r, threadName + "_" + index.getAndIncrement());
+		}
+
+	}
+
 }
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/modules/ApplicationStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/modules/ApplicationStub.java
index f5aeaf92f..b8534649c 100644
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/modules/ApplicationStub.java
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/modules/ApplicationStub.java
@@ -12,6 +12,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.Application;
 import edu.cornell.mannlib.vitro.webapp.modules.fileStorage.FileStorage;
 import edu.cornell.mannlib.vitro.webapp.modules.imageProcessor.ImageProcessor;
 import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngine;
+import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerModule;
 import edu.cornell.mannlib.vitro.webapp.modules.tripleSource.ConfigurationTripleSource;
 import edu.cornell.mannlib.vitro.webapp.modules.tripleSource.ContentTripleSource;
 
@@ -101,4 +102,11 @@ public class ApplicationStub implements Application {
 				"ApplicationStub.getConfigurationTripleSource() not implemented.");
 	}
 
+	@Override
+	public TBoxReasonerModule getTBoxReasonerModule() {
+		// TODO Auto-generated method stub
+		throw new RuntimeException("ApplicationStub.getTBoxReasonerModule() not implemented.");
+		
+	}
+
 }
diff --git a/webapp/web/WEB-INF/resources/startup_listeners.txt b/webapp/web/WEB-INF/resources/startup_listeners.txt
index c5c9803eb..9c3fc7a42 100644
--- a/webapp/web/WEB-INF/resources/startup_listeners.txt
+++ b/webapp/web/WEB-INF/resources/startup_listeners.txt
@@ -34,6 +34,7 @@ edu.cornell.mannlib.vitro.webapp.servlet.setup.RemoveObsoletePermissions
 
 edu.cornell.mannlib.vitro.webapp.servlet.setup.FileGraphSetup
 
+edu.cornell.mannlib.vitro.webapp.application.ApplicationImpl$ReasonersSetup
 edu.cornell.mannlib.vitro.webapp.servlet.setup.SimpleReasonerSetup
 
 #edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
index 946861559..20495f03d 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
@@ -6,11 +6,11 @@
     <section class="pageBodyGroup" role="region">
         <h3>${i18n().ontology_editor}</h3>
         
-        <#if ontologyEditor.pellet?has_content>
+        <#if ontologyEditor.tboxReasonerStatus?has_content>
             <div class="notice">
-                <p>${ontologyEditor.pellet.error}</p>
-                <#if ontologyEditor.pellet.explanation?has_content>
-                    <p>${i18n().cause} ${ontologyEditor.pellet.explanation}</p>
+                <p>${ontologyEditor.tboxReasonerStatus.error}</p>
+                <#if ontologyEditor.tboxReasonerStatus.explanation?has_content>
+                    <p>${i18n().cause} ${ontologyEditor.tboxReasonerStatus.explanation}</p>
                 </#if>
             </div>
         </#if>

From 75fff3ee5464082417379d426a770343f23da01c Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Mon, 8 Dec 2014 11:25:34 -0500
Subject: [PATCH 20/30] Remove call to deprecated JUmitMatchers method.

---
 .../customlistview/CustomListViewConfigFileTest.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFileTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFileTest.java
index db6f6decc..0750187ca 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFileTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFileTest.java
@@ -10,10 +10,10 @@ import java.io.StringReader;
 import java.util.Arrays;
 import java.util.HashSet;
 
+import org.hamcrest.CoreMatchers;
 import org.hamcrest.Matcher;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.matchers.JUnitMatchers;
 import org.junit.rules.ExpectedException;
 
 import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
@@ -71,7 +71,7 @@ public class CustomListViewConfigFileTest extends AbstractTestClass {
 	@Test
 	public void invalidXml() throws InvalidConfigurationException {
 		suppressSyserr(); // catch the error report from the XML parser
-		expectException(JUnitMatchers
+		expectException(CoreMatchers
 				.containsString("Config file is not valid XML:"));
 		readConfigFile("<unbalancedTag>");
 	}

From 3b508a6c976b141a21b88abb8dce3d76ef8c0a7c Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Mon, 8 Dec 2014 15:25:59 -0500
Subject: [PATCH 21/30] VIVO-766 Java 8 handles no-argument constructors
 differently.

Claims that a non-static inner class has no no-argument constructors.
---
 .../webapp/utils/configuration/ConfigurationBeanLoaderTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java
index b1e8ccb4b..da924567a 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java
@@ -970,7 +970,7 @@ public class ConfigurationBeanLoaderTest extends AbstractTestClass {
 		// Nothing.
 	}
 
-	public class AGoodApple implements OneBadAppleSpoilsTheBunch {
+	public static class AGoodApple implements OneBadAppleSpoilsTheBunch {
 		// Nothing
 	}
 

From 14d1cdb5bfaf003f8d61fc5477caec3615a5d825 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Mon, 8 Dec 2014 15:28:21 -0500
Subject: [PATCH 22/30] VIVO-766 Java 8 writes prefixes in a different order.

Probably due to a change in the algorithm for HashMap, or something similar.
This test expected a particular string in response, but Java 7 and Java 8 returned two different, but equivalent, strings.
Modify it so it will accept @prefix or xmlns: specifications in any order.
---
 .../SparqlQueryApiExecutorTest.java           | 200 +++++++++++++-----
 1 file changed, 150 insertions(+), 50 deletions(-)

diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutorTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutorTest.java
index f288b7d46..d1838bfd0 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutorTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutorTest.java
@@ -2,11 +2,19 @@
 
 package edu.cornell.mannlib.vitro.webapp.controller.api.sparqlquery;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.io.ByteArrayOutputStream;
 import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
+import org.apache.commons.lang.StringUtils;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -25,6 +33,20 @@ import edu.cornell.mannlib.vitro.webapp.utils.http.NotAcceptableException;
  * formats.
  */
 public class SparqlQueryApiExecutorTest extends AbstractTestClass {
+
+	/* SPARQL response types */
+	private static final String ACCEPT_TEXT = "text/plain";
+	private static final String ACCEPT_CSV = "text/csv";
+	private static final String ACCEPT_TSV = "text/tab-separated-values";
+	private static final String ACCEPT_SPARQL_XML = "application/sparql-results+xml";
+	private static final String ACCEPT_SPARQL_JSON = "application/sparql-results+json";
+
+	/* RDF result types */
+	private static final String ACCEPT_RDFXML = "application/rdf+xml";
+	private static final String ACCEPT_N3 = "text/n3";
+	private static final String ACCEPT_TURTLE = "text/turtle";
+	private static final String ACCEPT_JSON = "application/json";
+
 	private static final String MODEL_CONTENTS_N3 = "" //
 			+ "<http://here.edu/subject> \n"
 			+ "    <http://here.edu/predicate> <http://here.edu/object> ."
@@ -201,24 +223,24 @@ public class SparqlQueryApiExecutorTest extends AbstractTestClass {
 
 	@Test(expected = NullPointerException.class)
 	public void nullRdfService() throws Exception {
-		SparqlQueryApiExecutor.instance(null, SELECT_ALL_QUERY, "text/plain");
+		SparqlQueryApiExecutor.instance(null, SELECT_ALL_QUERY, ACCEPT_TEXT);
 	}
 
 	@Test(expected = NullPointerException.class)
 	public void nullQuery() throws Exception {
-		SparqlQueryApiExecutor.instance(rdfService, null, "text/plain");
+		SparqlQueryApiExecutor.instance(rdfService, null, ACCEPT_TEXT);
 		fail("nullQuery not implemented");
 	}
 
 	@Test(expected = QueryParseException.class)
 	public void emptyQuery() throws Exception {
-		SparqlQueryApiExecutor.instance(rdfService, "", "text/plain");
+		SparqlQueryApiExecutor.instance(rdfService, "", ACCEPT_TEXT);
 		fail("emptyQuery not implemented");
 	}
 
 	@Test(expected = QueryParseException.class)
 	public void cantParseQuery() throws Exception {
-		SparqlQueryApiExecutor.instance(rdfService, "BOGUS", "text/plain");
+		SparqlQueryApiExecutor.instance(rdfService, "BOGUS", ACCEPT_TEXT);
 		fail("cantParseQuery not implemented");
 	}
 
@@ -237,179 +259,177 @@ public class SparqlQueryApiExecutorTest extends AbstractTestClass {
 
 	@Test
 	public void selectToText() throws Exception {
-		executeQuery("select to text", SELECT_ALL_QUERY, "text/plain",
+		executeQuery("select to text", SELECT_ALL_QUERY, ACCEPT_TEXT,
 				SELECT_RESULT_TEXT);
 	}
 
 	@Test
 	public void selectToCsv() throws Exception {
-		executeQuery("select to csv", SELECT_ALL_QUERY, "text/csv",
+		executeQuery("select to csv", SELECT_ALL_QUERY, ACCEPT_CSV,
 				SELECT_RESULT_CSV);
 	}
 
 	@Test
 	public void selectToTsv() throws Exception {
-		executeQuery("select to tsv", SELECT_ALL_QUERY,
-				"text/tab-separated-values", SELECT_RESULT_TSV);
+		executeQuery("select to tsv", SELECT_ALL_QUERY, ACCEPT_TSV,
+				SELECT_RESULT_TSV);
 	}
 
 	@Test
 	public void selectToXml() throws Exception {
-		executeQuery("select to xml", SELECT_ALL_QUERY,
-				"application/sparql-results+xml", SELECT_RESULT_XML);
+		executeQuery("select to xml", SELECT_ALL_QUERY, ACCEPT_SPARQL_XML,
+				SELECT_RESULT_XML);
 	}
 
 	@Test
 	public void selectToJson() throws Exception {
-		executeQuery("select to json", SELECT_ALL_QUERY,
-				"application/sparql-results+json", SELECT_RESULT_JSON);
+		executeQuery("select to json", SELECT_ALL_QUERY, ACCEPT_SPARQL_JSON,
+				SELECT_RESULT_JSON);
 	}
 
 	@Test
 	public void selectWithInvalidContentType() throws Exception {
 		executeWithInvalidAcceptHeader("select with application/rdf+xml",
-				SELECT_ALL_QUERY, "application/rdf+xml");
+				SELECT_ALL_QUERY, ACCEPT_RDFXML);
 		executeWithInvalidAcceptHeader("select with text/n3", SELECT_ALL_QUERY,
-				"text/n3");
+				ACCEPT_N3);
 		executeWithInvalidAcceptHeader("select with text/turtle",
-				SELECT_ALL_QUERY, "text/turtle");
+				SELECT_ALL_QUERY, ACCEPT_TURTLE);
 		executeWithInvalidAcceptHeader("select with application/json",
-				SELECT_ALL_QUERY, "application/json");
+				SELECT_ALL_QUERY, ACCEPT_JSON);
 	}
 
 	// ----------------------------------------------------------------------
 
 	@Test
 	public void askToText() throws Exception {
-		executeQuery("ask to text", ASK_ALL_QUERY, "text/plain",
-				ASK_RESULT_TEXT);
+		executeQuery("ask to text", ASK_ALL_QUERY, ACCEPT_TEXT, ASK_RESULT_TEXT);
 	}
 
 	@Test
 	public void askToCsv() throws Exception {
-		executeQuery("ask to csv", ASK_ALL_QUERY, "text/csv", ASK_RESULT_CSV);
+		executeQuery("ask to csv", ASK_ALL_QUERY, ACCEPT_CSV, ASK_RESULT_CSV);
 	}
 
 	@Test
 	public void askToTsv() throws Exception {
-		executeQuery("ask to tsv", ASK_ALL_QUERY, "text/tab-separated-values",
-				ASK_RESULT_TSV);
+		executeQuery("ask to tsv", ASK_ALL_QUERY, ACCEPT_TSV, ASK_RESULT_TSV);
 	}
 
 	@Test
 	public void askToXml() throws Exception {
-		executeQuery("ask to xml", ASK_ALL_QUERY,
-				"application/sparql-results+xml", ASK_RESULT_XML);
+		executeQuery("ask to xml", ASK_ALL_QUERY, ACCEPT_SPARQL_XML,
+				ASK_RESULT_XML);
 	}
 
 	@Test
 	public void askToJson() throws Exception {
-		executeQuery("ask to json", ASK_ALL_QUERY,
-				"application/sparql-results+json", ASK_RESULT_JSON);
+		executeQuery("ask to json", ASK_ALL_QUERY, ACCEPT_SPARQL_JSON,
+				ASK_RESULT_JSON);
 	}
 
 	@Test
 	public void askWithInvalidAcceptHeader() throws Exception {
 		executeWithInvalidAcceptHeader("ask with application/rdf+xml",
-				ASK_ALL_QUERY, "application/rdf+xml");
+				ASK_ALL_QUERY, ACCEPT_RDFXML);
 		executeWithInvalidAcceptHeader("ask with text/n3", ASK_ALL_QUERY,
-				"text/n3");
+				ACCEPT_N3);
 		executeWithInvalidAcceptHeader("ask with text/turtle", ASK_ALL_QUERY,
-				"text/turtle");
+				ACCEPT_TURTLE);
 		executeWithInvalidAcceptHeader("ask with application/json",
-				ASK_ALL_QUERY, "application/json");
+				ASK_ALL_QUERY, ACCEPT_JSON);
 	}
 
 	// ----------------------------------------------------------------------
 
 	@Test
 	public void constructToText() throws Exception {
-		executeQuery("construct to text", CONSTRUCT_ALL_QUERY, "text/plain",
+		executeQuery("construct to text", CONSTRUCT_ALL_QUERY, ACCEPT_TEXT,
 				CONSTRUCT_RESULT_TEXT);
 	}
 
 	@Test
 	public void constructToRdfXml() throws Exception {
 		executeQuery("construct to rdf/xml", CONSTRUCT_ALL_QUERY,
-				"application/rdf+xml", CONSTRUCT_RESULT_RDFXML);
+				ACCEPT_RDFXML, CONSTRUCT_RESULT_RDFXML);
 	}
 
 	@Test
 	public void constructToN3() throws Exception {
-		executeQuery("construct to n3", CONSTRUCT_ALL_QUERY, "text/n3",
+		executeQuery("construct to n3", CONSTRUCT_ALL_QUERY, ACCEPT_N3,
 				CONSTRUCT_RESULT_N3);
 	}
 
 	@Test
 	public void constructToTurtle() throws Exception {
-		executeQuery("construct to turtle", CONSTRUCT_ALL_QUERY, "text/turtle",
+		executeQuery("construct to turtle", CONSTRUCT_ALL_QUERY, ACCEPT_TURTLE,
 				CONSTRUCT_RESULT_TURTLE);
 	}
 
 	@Test
 	public void constructToJsonld() throws Exception {
-		executeQuery("construct to JSON-LD", CONSTRUCT_ALL_QUERY,
-				"application/json", CONSTRUCT_RESULT_JSONLD);
+		executeQuery("construct to JSON-LD", CONSTRUCT_ALL_QUERY, ACCEPT_JSON,
+				CONSTRUCT_RESULT_JSONLD);
 	}
 
 	@Test
 	public void constructWithInvalidAcceptHeader() throws Exception {
 		executeWithInvalidAcceptHeader("construct with text/csv",
-				CONSTRUCT_ALL_QUERY, "text/csv");
+				CONSTRUCT_ALL_QUERY, ACCEPT_CSV);
 		executeWithInvalidAcceptHeader("construct with text/tsv",
 				CONSTRUCT_ALL_QUERY, "text/tsv");
 		executeWithInvalidAcceptHeader(
 				"construct with application/sparql-results+xml",
-				CONSTRUCT_ALL_QUERY, "application/sparql-results+xml");
+				CONSTRUCT_ALL_QUERY, ACCEPT_SPARQL_XML);
 		executeWithInvalidAcceptHeader(
 				"construct with application/sparql-results+json",
-				CONSTRUCT_ALL_QUERY, "application/sparql-results+json");
+				CONSTRUCT_ALL_QUERY, ACCEPT_SPARQL_JSON);
 	}
 
 	// ----------------------------------------------------------------------
 
 	@Test
 	public void describeToText() throws Exception {
-		executeQuery("describe to text", DESCRIBE_ALL_QUERY, "text/plain",
+		executeQuery("describe to text", DESCRIBE_ALL_QUERY, ACCEPT_TEXT,
 				DESCRIBE_RESULT_TEXT);
 	}
 
 	@Test
 	public void describeToRdfXml() throws Exception {
-		executeQuery("describe to rdf/xml", DESCRIBE_ALL_QUERY,
-				"application/rdf+xml", DESCRIBE_RESULT_RDFXML);
+		executeQuery("describe to rdf/xml", DESCRIBE_ALL_QUERY, ACCEPT_RDFXML,
+				DESCRIBE_RESULT_RDFXML);
 	}
 
 	@Test
 	public void describeToN3() throws Exception {
-		executeQuery("describe to n3", DESCRIBE_ALL_QUERY, "text/n3",
+		executeQuery("describe to n3", DESCRIBE_ALL_QUERY, ACCEPT_N3,
 				DESCRIBE_RESULT_N3);
 	}
 
 	@Test
 	public void describeToTurtle() throws Exception {
-		executeQuery("describe to turtle", DESCRIBE_ALL_QUERY, "text/turtle",
+		executeQuery("describe to turtle", DESCRIBE_ALL_QUERY, ACCEPT_TURTLE,
 				DESCRIBE_RESULT_TURTLE);
 	}
 
 	@Test
 	public void describeToJsonld() throws Exception {
-		executeQuery("describe to JSON-LD", DESCRIBE_ALL_QUERY,
-				"application/json", DESCRIBE_RESULT_JSONLD);
+		executeQuery("describe to JSON-LD", DESCRIBE_ALL_QUERY, ACCEPT_JSON,
+				DESCRIBE_RESULT_JSONLD);
 	}
 
 	@Test
 	public void describeWithInvalidAcceptHeader() throws Exception {
 		executeWithInvalidAcceptHeader("describe with text/csv",
-				DESCRIBE_ALL_QUERY, "text/csv");
+				DESCRIBE_ALL_QUERY, ACCEPT_CSV);
 		executeWithInvalidAcceptHeader("describe with text/tsv",
 				DESCRIBE_ALL_QUERY, "text/tsv");
 		executeWithInvalidAcceptHeader(
 				"describe with application/sparql-results+xml",
-				DESCRIBE_ALL_QUERY, "application/sparql-results+xml");
+				DESCRIBE_ALL_QUERY, ACCEPT_SPARQL_XML);
 		executeWithInvalidAcceptHeader(
 				"describe with application/sparql-results+json",
-				DESCRIBE_ALL_QUERY, "application/sparql-results+json");
+				DESCRIBE_ALL_QUERY, ACCEPT_SPARQL_JSON);
 	}
 
 	// ----------------------------------------------------------------------
@@ -424,7 +444,87 @@ public class SparqlQueryApiExecutorTest extends AbstractTestClass {
 				rdfService, queryString, acceptHeader);
 		executor.executeAndFormat(out);
 
-		assertEquals(message, expected.replaceAll("\\s+", " "), out.toString().replaceAll("\\s+", " "));
+		if (ACCEPT_RDFXML.equals(acceptHeader)) {
+			assertEquivalentRdfxml(message, expected, out.toString());
+		} else if (ACCEPT_TURTLE.equals(acceptHeader)) {
+			assertEquivalentTurtle(message, expected, out.toString());
+		} else if (ACCEPT_N3.equals(acceptHeader)) {
+			assertEquivalentN3(message, expected, out.toString());
+		} else {
+			assertEqualsIgnoreWhiteSpace(message, expected, out.toString());
+		}
+	}
+
+	/**
+	 * RDF/XML namespaces may come in any order, so separate them out and test
+	 * accordingly.
+	 */
+	private void assertEquivalentRdfxml(String message, String expected,
+			String actual) {
+		assertEquals(message, getRdfxmlNamespaces(expected),
+				getRdfxmlNamespaces(actual));
+		assertEqualsIgnoreWhiteSpace(message, omitRdfxmlNamespaces(expected),
+				omitRdfxmlNamespaces(actual));
+	}
+
+	private Set<String> getRdfxmlNamespaces(String rdfxml) {
+		Set<String> namespaces = new TreeSet<>();
+		Pattern p = Pattern.compile("xmlns:\\w+=\\\"[^\\\"]*\\\"");
+		Matcher m = p.matcher(rdfxml);
+		while (m.find()) {
+			namespaces.add(m.group());
+		}
+		return namespaces;
+	}
+
+	private String omitRdfxmlNamespaces(String rdfxml) {
+		return rdfxml.replaceAll("xmlns:\\w+=\\\"[^\\\"]*\\\"", "");
+	}
+
+	/**
+	 * TTL prefix lines may come in any order, so separate them out and test
+	 * accordingly.
+	 */
+	private void assertEquivalentTurtle(String message, String expected,
+			String actual) {
+		assertEquals(message, getTurtlePrefixes(expected),
+				getTurtlePrefixes(actual));
+		assertEqualsIgnoreWhiteSpace(message, getTurtleRemainder(expected),
+				getTurtleRemainder(actual));
+	}
+
+	/**
+	 * N3 is like TTL, as far as prefix lines are concerned.
+	 */
+	private void assertEquivalentN3(String message, String expected,
+			String actual) {
+		assertEquivalentTurtle(message, expected, actual);
+	}
+
+	private Set<String> getTurtlePrefixes(String ttl) {
+		Set<String> prefixes = new TreeSet<>();
+		for (String line : ttl.split("[\\n\\r]+")) {
+			if (line.startsWith("@prefix")) {
+				prefixes.add(line.replaceAll("\\s+", " "));
+			}
+		}
+		return prefixes;
+	}
+
+	private String getTurtleRemainder(String ttl) {
+		List<String> remainder = new ArrayList<>();
+		for (String line : ttl.split("[\\n\\r]+")) {
+			if (!line.startsWith("@prefix")) {
+				remainder.add(line);
+			}
+		}
+		return StringUtils.join(remainder, "\n");
+	}
+
+	private void assertEqualsIgnoreWhiteSpace(String message, String expected,
+			String actual) {
+		assertEquals(message, expected.replaceAll("\\s+", " "),
+				actual.replaceAll("\\s+", " "));
 	}
 
 	private void executeWithInvalidAcceptHeader(String message,

From d1b07bcffc655b86240d7e27ef599ffaf1209898 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Mon, 8 Dec 2014 15:31:10 -0500
Subject: [PATCH 23/30] VIVO-766 This comparator is invalid under Java 8.

Because subclass/superclass is only a partial ordering, this breaks the contract for Comparator,
and throws an IllegalArgumentException under Java 8. In particular, for classes sub, super and other,
we have sub=other, sub<super, which should imply other<super, but instead other=super.

As far as I can determine, this sort is never used anyway, so there should be no impact in removing it.
PropertyInstanceDaoJena sorts these results again before using them, as does GroupedPropertyList.
---
 .../webapp/dao/jena/PropertyDaoJena.java      | 49 ++++++++++++-------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java
index 086d16f30..3c2343fd1 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java
@@ -564,26 +564,36 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
     	
     }
     
-    /*
+    /* Removed: see VIVO-766.
      * sorts VClasses so that subclasses come before superclasses
+     * 
+     * Because subclass/superclass is only a partial ordering, this breaks the 
+     * contract for Comparator, and throws an IllegalArgumentException under Java 8.
+     * In particular, for classes sub, super and other, we have sub=other, sub<super, 
+     * which should imply other<super, but that is not true.
+     * 
+     * As far as I can determine, this sort is never relied on anyway, so there 
+     * should be no impact in removing it. Note that PropertyInstanceDaoJena re-sorts
+     * thes results before using them, so this sort was irrelevant for any calls 
+     * through that path.
      */
-    private class VClassHierarchyRanker implements Comparator<VClass> {
-    	private VClassDao vcDao;
-    	public VClassHierarchyRanker(VClassDao vcDao) {
-    		this.vcDao = vcDao;
-    	}
-        @Override
-    	public int compare(VClass vc1, VClass vc2) {
-    		if (vcDao.isSubClassOf(vc1, vc2)) {
-    			return -1;
-    		} else if (vcDao.isSubClassOf(vc2, vc1)) {
-    		    return 1;
-    		} else {
-    		    return 0;
-    		}
-    	}
-    }
-    
+//    private class VClassHierarchyRanker implements Comparator<VClass> {
+//    	private VClassDao vcDao;
+//    	public VClassHierarchyRanker(VClassDao vcDao) {
+//    		this.vcDao = vcDao;
+//    	}
+//        @Override
+//    	public int compare(VClass vc1, VClass vc2) {
+//    		if (vcDao.isSubClassOf(vc1, vc2)) {
+//    			return -1;
+//    		} else if (vcDao.isSubClassOf(vc2, vc1)) {
+//    		    return 1;
+//    		} else {
+//    		    return 0;
+//    		}
+//    	}
+//    }
+//    
     
     public List<PropertyInstance> getAllPropInstByVClass(String classURI) {
         if (classURI==null || classURI.length()<1) {
@@ -708,7 +718,8 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
             return propInsts;
         }
         
-        Collections.sort(vclasses, new VClassHierarchyRanker(this.getWebappDaoFactory().getVClassDao()));
+        // Removed: see VIVO-766.
+        // Collections.sort(vclasses, new VClassHierarchyRanker(this.getWebappDaoFactory().getVClassDao()));
         
         OntModel ontModel = getOntModelSelector().getTBoxModel();
         

From ec365740411d706c5f0ca63b2cc2ed0f63b1a546 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Tue, 9 Dec 2014 11:41:26 -0500
Subject: [PATCH 24/30] VIVO-774 fix a unit test that was broken by faux
 property refactoring.

---
 ...yTemplateModel_PropertyListConfigTest.java |  6 ++
 .../vitro/webapp/dao/FauxPropertyDaoStub.java | 67 +++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDaoStub.java

diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java
index 7e608b44e..882d6297c 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java
@@ -2,6 +2,7 @@
 
 package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual;
 
+import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.PolicyOption.POLICY_NEUTRAL;
 import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.ReasoningOption.ASSERTIONS_AND_INFERENCES;
 import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.FULL_UNION;
 import static org.junit.Assert.assertEquals;
@@ -27,6 +28,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import stubs.edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDaoStub;
 import stubs.edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDaoStub;
 import stubs.edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryStub;
 import stubs.edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccessFactoryStub;
@@ -60,6 +62,7 @@ public class ObjectPropertyTemplateModel_PropertyListConfigTest extends
 
 	private WebappDaoFactoryStub wadf;
 	private ObjectPropertyDaoStub opDao;
+	private FauxPropertyDaoStub fpDao;
 
 	private ServletContextStub ctx;
 	private HttpSessionStub session;
@@ -117,8 +120,10 @@ public class ObjectPropertyTemplateModel_PropertyListConfigTest extends
 		logMessages = new StringWriter();
 
 		opDao = new ObjectPropertyDaoStub();
+		fpDao = new FauxPropertyDaoStub();
 		wadf = new WebappDaoFactoryStub();
 		wadf.setObjectPropertyDao(opDao);
+		wadf.setFauxPropertyDao(fpDao);
 
 		ctx = new ServletContextStub();
 		// create paths for all of the files in the temporary config directory.
@@ -136,6 +141,7 @@ public class ObjectPropertyTemplateModel_PropertyListConfigTest extends
 		
 		mafs = new ModelAccessFactoryStub();
 		mafs.get(vreq).setWebappDaoFactory(wadf, ASSERTIONS_AND_INFERENCES);
+		mafs.get(vreq).setWebappDaoFactory(wadf, POLICY_NEUTRAL);
 
 		subject = new IndividualImpl();
 
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDaoStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDaoStub.java
new file mode 100644
index 000000000..4c0321b0b
--- /dev/null
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDaoStub.java
@@ -0,0 +1,67 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.edu.cornell.mannlib.vitro.webapp.dao;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
+import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao.FullPropertyKey;
+
+/**
+ * TODO
+ */
+public class FauxPropertyDaoStub implements FauxPropertyDao {
+	// ----------------------------------------------------------------------
+	// Stub infrastructure
+	// ----------------------------------------------------------------------
+
+	private final Map<FullPropertyKey, FauxProperty> props = new HashMap<>();
+	
+	// ----------------------------------------------------------------------
+	// Stub methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public FauxProperty getFauxPropertyByUris(String domainUri, String baseUri,
+			String rangeUri) {
+		return props.get(new FullPropertyKey(domainUri, baseUri, rangeUri));
+	}
+
+	// ----------------------------------------------------------------------
+	// Un-implemented methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public List<FauxProperty> getFauxPropertiesForBaseUri(String uri) {
+		throw new RuntimeException(
+				"FauxPropertyDaoStub.getFauxPropertiesForBaseUri() not implemented.");
+	}
+
+	@Override
+	public FauxProperty getFauxPropertyFromContextUri(String contextUri) {
+		throw new RuntimeException(
+				"FauxPropertyDaoStub.getFauxPropertyFromContextUri() not implemented.");
+	}
+
+	@Override
+	public void insertFauxProperty(FauxProperty fp) {
+		throw new RuntimeException(
+				"FauxPropertyDaoStub.insertFauxProperty() not implemented.");
+	}
+
+	@Override
+	public void updateFauxProperty(FauxProperty fp) {
+		throw new RuntimeException(
+				"FauxPropertyDaoStub.updateFauxProperty() not implemented.");
+	}
+
+	@Override
+	public void deleteFauxProperty(FauxProperty fp) {
+		// TODO Auto-generated method stub
+		throw new RuntimeException(
+				"FauxPropertyDaoStub.deleteFauxProperty() not implemented.");
+	}
+}

From 5a54fa171b95b6fad9fd6728aade0f75d916642f Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Tue, 9 Dec 2014 12:26:49 -0500
Subject: [PATCH 25/30] VIVO-825 do not allow access to APIs if the account is
 not in a valid state.

Before testing the password, test that the account is well-formed: first name, last name, email.
After testing the password, check to see whether a password change is required.
---
 .../vitro/webapp/controller/api/VitroApiServlet.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/api/VitroApiServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/api/VitroApiServlet.java
index 3731040f1..71e826f37 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/api/VitroApiServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/api/VitroApiServlet.java
@@ -46,6 +46,13 @@ public class VitroApiServlet extends HttpServlet {
 
 		Authenticator auth = Authenticator.getInstance(req);
 		UserAccount account = auth.getAccountForInternalAuth(email);
+		
+		if (auth.accountRequiresEditing(account)) {
+			log.debug("Account " + email + " requires editing.");
+			throw new AuthException("user account must include first and "
+					+ "last names and a valid email address.");
+		}
+		
 		if (!auth.isCurrentPassword(account, password)) {
 			log.debug("Invalid: '" + email + "'/'" + password + "'");
 			throw new AuthException("email/password combination is not valid");
@@ -57,6 +64,11 @@ public class VitroApiServlet extends HttpServlet {
 			throw new AuthException("Account is not authorized");
 		}
 
+		if (account.isPasswordChangeRequired()) {
+			log.debug("Account " + email + " requires a new password.");
+			throw new AuthException("user account requires a new password.");
+		}
+		
 		log.debug("Authorized for '" + email + "'");
 	}
 

From ee8300dccc9b8939b484dad17bcc66dda7008357 Mon Sep 17 00:00:00 2001
From: Tim Worrall <tlw72@cornell.edu>
Date: Tue, 9 Dec 2014 13:16:20 -0500
Subject: [PATCH 26/30] No Jira issue. Faux property listing was not displaying
 all cases of a property where the labels were the same but the domains were
 different.

---
 .../controller/freemarker/ListFauxPropertiesController.java  | 5 ++---
 .../body/siteAdmin/siteAdmin-fauxPropertiesList.ftl          | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java
index f2303bfcb..409575826 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java
@@ -118,7 +118,6 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
                     ObjectProperty op = opIt.next();
 					String baseURI = op.getURI();
                     fauxProps = fpDao.getFauxPropertiesForBaseUri(baseURI);
-
 					if ( fauxProps != null ) {
 						Iterator<FauxProperty> fpIt = fauxProps.iterator();
 						if ( !fpIt.hasNext()) {
@@ -152,7 +151,7 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
 								tmpHash.put("domain", domainLabel);
 								tmpHash.put("domainURI", domainURI);
 								// add the faux and its details to the treemap	
-								theFauxProps.put(fauxLabel, tmpHash);
+								theFauxProps.put(fauxLabel + "@@" + domainLabel, tmpHash);
 							} 
 						} 
 					}
@@ -208,7 +207,7 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
 								tmpHash.put("domain", domainLabel);
 								tmpHash.put("domainURI", domainURI);
 								// add the faux and its details to the treemap	
-								fauxForGivenBase.put(fauxLabel, tmpHash);
+								fauxForGivenBase.put(fauxLabel + "@@" + domainLabel, tmpHash);
 							}
 							 fauxByBaseProps.put(baseLabel, fauxForGivenBase);
 						} 
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl
index 748197437..3f3260eb4 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl
@@ -34,7 +34,7 @@
       <#assign ks = fauxProps[key] />
       <section id="classContainer1">
       <div>
-        <a href='editForm?controller=FauxProperty&baseUri=${ks["baseURI"]?url!}&<#if ks["domainURI"]?has_content>domainUri=${ks["domainURI"]?url}&</#if>rangeUri=${ks["rangeURI"]?url!}'>${key}</a>
+        <a href='editForm?controller=FauxProperty&baseUri=${ks["baseURI"]?url!}&<#if ks["domainURI"]?has_content>domainUri=${ks["domainURI"]?url}&</#if>rangeUri=${ks["rangeURI"]?url!}'>${key?substring(0,key?index_of("@@"))}</a>
       </div>
       <table id="classHierarchy1" class="classHierarchy">
         <tbody>
@@ -76,7 +76,7 @@
           <tbody>
               <tr>
                 <td class="classDetail">${i18n().faux_property_capitalized}:</td>
-	            <td><a href='editForm?controller=FauxProperty&baseUri=${faux["baseURI"]?url!}&<#if faux["domainURI"]?has_content>domainUri=${faux["domainURI"]?url}&</#if>rangeUri=${faux["rangeURI"]?url!}'>${k2}</a></td>
+	            <td><a href='editForm?controller=FauxProperty&baseUri=${faux["baseURI"]?url!}&<#if faux["domainURI"]?has_content>domainUri=${faux["domainURI"]?url}&</#if>rangeUri=${faux["rangeURI"]?url!}'>${k2?substring(0,k2?index_of("@@"))}</a></td>
 	          </tr>
 	          <tr>
                 <td class="classDetail">${i18n().group_capitalized}:</td>

From 05fe47e50a79f653752dc68291b1b4ff63f91c1c Mon Sep 17 00:00:00 2001
From: hudajkhan <hjk54@cornell.edu>
Date: Wed, 10 Dec 2014 12:36:37 -0500
Subject: [PATCH 27/30] needed access to rdfservice in nyccsc

---
 .../webapp/search/documentBuilding/ContextNodeFields.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ContextNodeFields.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ContextNodeFields.java
index e0e698466..cb1a829d0 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ContextNodeFields.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ContextNodeFields.java
@@ -34,8 +34,8 @@ public class ContextNodeFields implements DocumentModifier, ContextModelsUser{
     protected List<String> queries = new ArrayList<String>();
     protected boolean shutdown = false;    
     protected Log log = LogFactory.getLog(ContextNodeFields.class);   
-
-    private RDFService rdfService;
+    //Subclasses may want to utilize rdfService directly (for example, to execute queries that yielding multiple variables mapped to different fields)
+    protected RDFService rdfService;
 	
 	@Override
 	public void setContextModels(ContextModelAccess models) {

From 481d3fc1d8d75e6dd00400c313eb385222a78aac Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Wed, 10 Dec 2014 15:01:51 -0500
Subject: [PATCH 28/30] VIVO-695 VIVO-699 Refactor and optimize the
 PropertyRestrictionBean

Formerly the PropertyRestrictionPolicyHelper.
---
 .../permissions/DisplayByRolePermission.java  |  23 +-
 .../permissions/EditByRolePermission.java     |  26 +-
 .../auth/permissions/PermissionRegistry.java  |  45 +-
 .../permissions/PublishByRolePermission.java  |  18 +-
 .../auth/policy/BaseSelfEditingPolicy.java    |  10 +-
 .../DisplayRestrictedDataToSelfPolicy.java    |  22 +-
 .../policy/bean/PropertyRestrictionBean.java  | 207 +++++++
 .../bean/PropertyRestrictionBeanImpl.java     | 252 +++++++++
 .../bean/PropertyRestrictionLevels.java       |  68 +++
 .../bean/PropertyRestrictionListener.java     |  79 +--
 .../bean/PropertyRestrictionPolicyHelper.java | 498 -----------------
 .../policy/bean/RoleRestrictedProperty.java   |   6 +
 .../AbstractRelationshipPolicy.java           |  10 +-
 .../vitro/webapp/beans/FauxProperty.java      |  14 +
 .../edit/DatapropRetryController.java         |   4 +-
 .../edit/FauxPropertyRetryController.java     |   2 +-
 .../edit/PropertyRetryController.java         |   4 +-
 .../mannlib/vitro/webapp/dao/PropertyDao.java |  10 +-
 .../dao/jena/ObjectPropertyDaoJena.java       |   3 +-
 .../individual/GroupedPropertyList.java       |   2 +-
 .../auth/policy/SelfEditingPolicyTest.java    |   9 +-
 .../auth/policy/SelfEditingPolicy_2_Test.java |   7 +-
 .../bean/PropertyRestrictionBeanImplTest.java | 511 ++++++++++++++++++
 .../PropertyRestrictionPolicyHelperTest.java  | 331 ------------
 .../bean/PropertyRestrictionBeanStub.java     | 122 +++++
 .../PropertyRestrictionPolicyHelperStub.java  |  63 ---
 .../vitro/webapp/dao/DataPropertyDaoStub.java |  12 +-
 .../vitro/webapp/dao/FauxPropertyDaoStub.java |  32 +-
 .../webapp/dao/ObjectPropertyDaoStub.java     |  45 +-
 .../WEB-INF/resources/startup_listeners.txt   |   2 +-
 30 files changed, 1321 insertions(+), 1116 deletions(-)
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBean.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImpl.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionLevels.java
 delete mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelper.java
 create mode 100644 webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImplTest.java
 delete mode 100644 webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelperTest.java
 create mode 100644 webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanStub.java
 delete mode 100644 webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelperStub.java

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/DisplayByRolePermission.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/DisplayByRolePermission.java
index dd96aedac..a3df82419 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/DisplayByRolePermission.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/DisplayByRolePermission.java
@@ -2,12 +2,10 @@
 
 package edu.cornell.mannlib.vitro.webapp.auth.permissions;
 
-import javax.servlet.ServletContext;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBean;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayDataProperty;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayDataPropertyStatement;
@@ -30,10 +28,8 @@ public class DisplayByRolePermission extends Permission {
 
 	private final String roleName;
 	private final RoleLevel roleLevel;
-	private final ServletContext ctx;
 
-	public DisplayByRolePermission(String roleName, RoleLevel roleLevel,
-			ServletContext ctx) {
+	public DisplayByRolePermission(String roleName, RoleLevel roleLevel) {
 		super(NAMESPACE + roleName);
 
 		if (roleName == null) {
@@ -42,13 +38,9 @@ public class DisplayByRolePermission extends Permission {
 		if (roleLevel == null) {
 			throw new NullPointerException("roleLevel may not be null.");
 		}
-		if (ctx == null) {
-			throw new NullPointerException("context may not be null.");
-		}
 
 		this.roleName = roleName;
 		this.roleLevel = roleLevel;
-		this.ctx = ctx;
 	}
 
 	@Override
@@ -110,22 +102,21 @@ public class DisplayByRolePermission extends Permission {
 	 * subject, its predicate, and its object.
 	 */
 	private boolean isAuthorized(DisplayObjectPropertyStatement action) {
-		String subjectUri = action.getSubjectUri(); 
+		String subjectUri = action.getSubjectUri();
 		String objectUri = action.getObjectUri();
 		Property op = action.getProperty();
-		return canDisplayResource(subjectUri)
-				&& canDisplayPredicate(op)
+		return canDisplayResource(subjectUri) && canDisplayPredicate(op)
 				&& canDisplayResource(objectUri);
 	}
 
 	private boolean canDisplayResource(String resourceUri) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx).canDisplayResource(
+		return PropertyRestrictionBean.getBean().canDisplayResource(
 				resourceUri, this.roleLevel);
 	}
 
 	private boolean canDisplayPredicate(Property predicate) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx)
-				.canDisplayPredicate(predicate, this.roleLevel);
+		return PropertyRestrictionBean.getBean().canDisplayPredicate(predicate,
+				this.roleLevel);
 	}
 
 	@Override
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/EditByRolePermission.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/EditByRolePermission.java
index 6c4bb7a24..263815bd2 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/EditByRolePermission.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/EditByRolePermission.java
@@ -2,12 +2,10 @@
 
 package edu.cornell.mannlib.vitro.webapp.auth.permissions;
 
-import javax.servlet.ServletContext;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBean;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractDataPropertyStatementAction;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractObjectPropertyStatementAction;
@@ -27,10 +25,8 @@ public class EditByRolePermission extends Permission {
 
 	private final String roleName;
 	private final RoleLevel roleLevel;
-	private final ServletContext ctx;
 
-	public EditByRolePermission(String roleName, RoleLevel roleLevel,
-			ServletContext ctx) {
+	public EditByRolePermission(String roleName, RoleLevel roleLevel) {
 		super(NAMESPACE + roleName);
 
 		if (roleName == null) {
@@ -39,13 +35,9 @@ public class EditByRolePermission extends Permission {
 		if (roleLevel == null) {
 			throw new NullPointerException("roleLevel may not be null.");
 		}
-		if (ctx == null) {
-			throw new NullPointerException("context may not be null.");
-		}
 
 		this.roleName = roleName;
 		this.roleLevel = roleLevel;
-		this.ctx = ctx;
 	}
 
 	/**
@@ -80,8 +72,7 @@ public class EditByRolePermission extends Permission {
 	private boolean isAuthorized(AbstractDataPropertyStatementAction action) {
 		String subjectUri = action.getSubjectUri();
 		Property predicate = action.getPredicate();
-		return canModifyResource(subjectUri)
-				&& canModifyPredicate(predicate);
+		return canModifyResource(subjectUri) && canModifyPredicate(predicate);
 	}
 
 	/**
@@ -92,19 +83,18 @@ public class EditByRolePermission extends Permission {
 		String subjectUri = action.getSubjectUri();
 		Property predicate = action.getPredicate();
 		String objectUri = action.getObjectUri();
-		return canModifyResource(subjectUri)
-				&& canModifyPredicate(predicate)
+		return canModifyResource(subjectUri) && canModifyPredicate(predicate)
 				&& canModifyResource(objectUri);
 	}
 
 	private boolean canModifyResource(String resourceUri) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx).canModifyResource(
-				resourceUri, roleLevel);
+		return PropertyRestrictionBean.getBean().canModifyResource(resourceUri,
+				roleLevel);
 	}
 
 	private boolean canModifyPredicate(Property predicate) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx).canModifyPredicate(
-				predicate, roleLevel);
+		return PropertyRestrictionBean.getBean().canModifyPredicate(predicate,
+				roleLevel);
 	}
 
 	@Override
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionRegistry.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionRegistry.java
index 1a050608f..be496700a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionRegistry.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionRegistry.java
@@ -150,9 +150,9 @@ public class PermissionRegistry {
 				List<Permission> permissions = new ArrayList<Permission>();
 
 				permissions.addAll(SimplePermission.getAllInstances());
-				permissions.addAll(createDisplayByRolePermissions(ctx));
-				permissions.addAll(createEditByRolePermissions(ctx));
-				permissions.addAll(createPublishByRolePermissions(ctx));
+				permissions.addAll(createDisplayByRolePermissions());
+				permissions.addAll(createEditByRolePermissions());
+				permissions.addAll(createPublishByRolePermissions());
 
 				PermissionRegistry.createRegistry(ctx, permissions);
 
@@ -169,17 +169,12 @@ public class PermissionRegistry {
 		 * same rights as PUBLIC. Other permissions give them their self-editing
 		 * privileges.
 		 */
-		private Collection<Permission> createDisplayByRolePermissions(
-				ServletContext ctx) {
+		private Collection<Permission> createDisplayByRolePermissions() {
 			List<Permission> list = new ArrayList<Permission>();
-			list.add(new DisplayByRolePermission("Admin", RoleLevel.DB_ADMIN,
-					ctx));
-			list.add(new DisplayByRolePermission("Curator", RoleLevel.CURATOR,
-					ctx));
-			list.add(new DisplayByRolePermission("Editor", RoleLevel.EDITOR,
-					ctx));
-			list.add(new DisplayByRolePermission("Public", RoleLevel.PUBLIC,
-					ctx));
+			list.add(new DisplayByRolePermission("Admin", RoleLevel.DB_ADMIN));
+			list.add(new DisplayByRolePermission("Curator", RoleLevel.CURATOR));
+			list.add(new DisplayByRolePermission("Editor", RoleLevel.EDITOR));
+			list.add(new DisplayByRolePermission("Public", RoleLevel.PUBLIC));
 			return list;
 		}
 
@@ -191,12 +186,11 @@ public class PermissionRegistry {
 		 * 
 		 * Other permissions give self-editors their editing privileges.
 		 */
-		private Collection<Permission> createEditByRolePermissions(
-				ServletContext ctx) {
+		private Collection<Permission> createEditByRolePermissions() {
 			List<Permission> list = new ArrayList<Permission>();
-			list.add(new EditByRolePermission("Admin", RoleLevel.DB_ADMIN, ctx));
-			list.add(new EditByRolePermission("Curator", RoleLevel.CURATOR, ctx));
-			list.add(new EditByRolePermission("Editor", RoleLevel.EDITOR, ctx));
+			list.add(new EditByRolePermission("Admin", RoleLevel.DB_ADMIN));
+			list.add(new EditByRolePermission("Curator", RoleLevel.CURATOR));
+			list.add(new EditByRolePermission("Editor", RoleLevel.EDITOR));
 			return list;
 		}
 
@@ -210,17 +204,12 @@ public class PermissionRegistry {
 		 * same rights as PUBLIC. Other permissions give them their self-editing
 		 * privileges.
 		 */
-		private Collection<Permission> createPublishByRolePermissions(
-				ServletContext ctx) {
+		private Collection<Permission> createPublishByRolePermissions() {
 			List<Permission> list = new ArrayList<Permission>();
-			list.add(new PublishByRolePermission("Admin", RoleLevel.DB_ADMIN,
-					ctx));
-			list.add(new PublishByRolePermission("Curator", RoleLevel.CURATOR,
-					ctx));
-			list.add(new PublishByRolePermission("Editor", RoleLevel.EDITOR,
-					ctx));
-			list.add(new PublishByRolePermission("Public", RoleLevel.PUBLIC,
-					ctx));
+			list.add(new PublishByRolePermission("Admin", RoleLevel.DB_ADMIN));
+			list.add(new PublishByRolePermission("Curator", RoleLevel.CURATOR));
+			list.add(new PublishByRolePermission("Editor", RoleLevel.EDITOR));
+			list.add(new PublishByRolePermission("Public", RoleLevel.PUBLIC));
 			return list;
 		}
 	}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PublishByRolePermission.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PublishByRolePermission.java
index e587742a7..9942cfa88 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PublishByRolePermission.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PublishByRolePermission.java
@@ -2,12 +2,10 @@
 
 package edu.cornell.mannlib.vitro.webapp.auth.permissions;
 
-import javax.servlet.ServletContext;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBean;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.publish.PublishDataProperty;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.publish.PublishDataPropertyStatement;
@@ -29,10 +27,8 @@ public class PublishByRolePermission extends Permission {
 
 	private final String roleName;
 	private final RoleLevel roleLevel;
-	private final ServletContext ctx;
 
-	public PublishByRolePermission(String roleName, RoleLevel roleLevel,
-			ServletContext ctx) {
+	public PublishByRolePermission(String roleName, RoleLevel roleLevel) {
 		super(NAMESPACE + roleName);
 
 		if (roleName == null) {
@@ -41,13 +37,9 @@ public class PublishByRolePermission extends Permission {
 		if (roleLevel == null) {
 			throw new NullPointerException("roleLevel may not be null.");
 		}
-		if (ctx == null) {
-			throw new NullPointerException("context may not be null.");
-		}
 
 		this.roleName = roleName;
 		this.roleLevel = roleLevel;
-		this.ctx = ctx;
 	}
 
 	@Override
@@ -116,13 +108,13 @@ public class PublishByRolePermission extends Permission {
 	}
 
 	private boolean canPublishResource(String resourceUri) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx).canPublishResource(
+		return PropertyRestrictionBean.getBean().canPublishResource(
 				resourceUri, this.roleLevel);
 	}
 
 	private boolean canPublishPredicate(Property predicate) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx)
-				.canPublishPredicate(predicate, this.roleLevel);
+		return PropertyRestrictionBean.getBean().canPublishPredicate(predicate,
+				this.roleLevel);
 	}
 
 	@Override
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/BaseSelfEditingPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/BaseSelfEditingPolicy.java
index 326ee93ef..e072f183a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/BaseSelfEditingPolicy.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/BaseSelfEditingPolicy.java
@@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.policy;
 
 import javax.servlet.ServletContext;
 
-import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBean;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
 import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
@@ -23,13 +23,13 @@ public abstract class BaseSelfEditingPolicy {
 	}
 
 	protected boolean canModifyResource(String uri) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx).canModifyResource(
-				uri, roleLevel);
+		return PropertyRestrictionBean.getBean().canModifyResource(uri,
+				roleLevel);
 	}
 
 	protected boolean canModifyPredicate(Property predicate) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx).canModifyPredicate(
-				predicate, roleLevel);
+		return PropertyRestrictionBean.getBean().canModifyPredicate(predicate,
+				roleLevel);
 	}
 
 	protected PolicyDecision cantModifyResource(String uri) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/DisplayRestrictedDataToSelfPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/DisplayRestrictedDataToSelfPolicy.java
index d0e411be0..57cfa0aa6 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/DisplayRestrictedDataToSelfPolicy.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/DisplayRestrictedDataToSelfPolicy.java
@@ -11,7 +11,7 @@ import org.apache.commons.logging.LogFactory;
 
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasAssociatedIndividual;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBean;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
@@ -114,14 +114,18 @@ public class DisplayRestrictedDataToSelfPolicy implements PolicyIface {
 		String subjectUri = action.getSubjectUri();
 		Property predicate = action.getProperty();
 		String objectUri = action.getObjectUri();
-		if (canDisplayResource(subjectUri) && canDisplayPredicate(predicate)
+		if (canDisplayResource(subjectUri)
+				&& canDisplayPredicate(predicate)
 				&& canDisplayResource(objectUri)
-				&& isAboutAssociatedIndividual(individuals, subjectUri, objectUri)) {
+				&& isAboutAssociatedIndividual(individuals, subjectUri,
+						objectUri)) {
 			return authorized("user may view ObjectPropertyStatement "
-					+ subjectUri + " ==> " + predicate.getURI() + " ==> " + objectUri);
+					+ subjectUri + " ==> " + predicate.getURI() + " ==> "
+					+ objectUri);
 		} else {
 			return defaultDecision("user may not view ObjectPropertyStatement "
-					+ subjectUri + " ==> " + predicate.getURI() + " ==> " + objectUri);
+					+ subjectUri + " ==> " + predicate.getURI() + " ==> "
+					+ objectUri);
 		}
 	}
 
@@ -138,13 +142,13 @@ public class DisplayRestrictedDataToSelfPolicy implements PolicyIface {
 	}
 
 	private boolean canDisplayResource(String uri) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx).canDisplayResource(
-				uri, RoleLevel.SELF);
+		return PropertyRestrictionBean.getBean().canDisplayResource(uri,
+				RoleLevel.SELF);
 	}
 
 	private boolean canDisplayPredicate(Property predicate) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx)
-				.canDisplayPredicate(predicate, RoleLevel.SELF);
+		return PropertyRestrictionBean.getBean().canDisplayPredicate(predicate,
+				RoleLevel.SELF);
 	}
 
 	private boolean isAboutAssociatedIndividual(Collection<String> selves,
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBean.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBean.java
new file mode 100644
index 000000000..517fb84fd
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBean.java
@@ -0,0 +1,207 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+import edu.cornell.mannlib.vitro.webapp.beans.Property;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
+
+/**
+ * Assists the role-based policies in determining whether a property or resource
+ * may be displayed, modified, or published in linked open data.
+ * 
+ * There is a singleton bean that holds the current threshold role levels for
+ * displaying, modifying, or publishing restricted properties.
+ * 
+ * Create this bean after the context models are in place.
+ * 
+ * Add PropertyRestrictionListener to your EditProcessObject if you are editing
+ * a property, to ensure that the bean stays current.
+ */
+public abstract class PropertyRestrictionBean {
+	private static final Log log = LogFactory
+			.getLog(PropertyRestrictionBean.class);
+
+	private static final PropertyRestrictionBean NULL = new PropertyRestrictionBeanNull();
+
+	protected static volatile PropertyRestrictionBean instance = NULL;
+
+	protected static final Collection<String> PROHIBITED_NAMESPACES = Arrays
+			.asList(new String[] { VitroVocabulary.vitroURI, "" });
+
+	protected static final Collection<String> PERMITTED_EXCEPTIONS = Arrays
+			.asList(new String[] { VitroVocabulary.MONIKER,
+					VitroVocabulary.MODTIME, VitroVocabulary.IND_MAIN_IMAGE,
+					VitroVocabulary.LINK, VitroVocabulary.PRIMARY_LINK,
+					VitroVocabulary.ADDITIONAL_LINK,
+					VitroVocabulary.LINK_ANCHOR, VitroVocabulary.LINK_URL });
+
+	// ----------------------------------------------------------------------
+	// static methods
+	// ----------------------------------------------------------------------
+
+	public static PropertyRestrictionBean getBean() {
+		return instance;
+	}
+
+	// ----------------------------------------------------------------------
+	// instance methods
+	// ----------------------------------------------------------------------
+
+	/**
+	 * Any resource can be displayed.
+	 * 
+	 * (Someday we may want to implement display restrictions based on VClass.)
+	 */
+	public abstract boolean canDisplayResource(String resourceUri,
+			RoleLevel userRole);
+
+	/**
+	 * A resource cannot be modified if its namespace is in the prohibited list
+	 * (but some exceptions are allowed).
+	 * 
+	 * (Someday we may want to implement modify restrictions based on VClass.)
+	 */
+	public abstract boolean canModifyResource(String resourceUri,
+			RoleLevel userRole);
+
+	/**
+	 * Any resource can be published.
+	 * 
+	 * (Someday we may want to implement publish restrictions based on VClass.)
+	 */
+	public abstract boolean canPublishResource(String resourceUri,
+			RoleLevel userRole);
+
+	/**
+	 * If display of a predicate is restricted, the user's role must be at least
+	 * as high as the restriction level.
+	 */
+	public abstract boolean canDisplayPredicate(Property predicate,
+			RoleLevel userRole);
+
+	/**
+	 * A predicate cannot be modified if its namespace is in the prohibited list
+	 * (some exceptions are allowed).
+	 * 
+	 * If modification of a predicate is restricted, the user's role must be at
+	 * least as high as the restriction level.
+	 */
+	public abstract boolean canModifyPredicate(Property predicate,
+			RoleLevel userRole);
+
+	/**
+	 * If publishing of a predicate is restricted, the user's role must be at
+	 * least as high as the restriction level.
+	 */
+	public abstract boolean canPublishPredicate(Property predicate,
+			RoleLevel userRole);
+
+	/**
+	 * The threshold values for this property may have changed.
+	 */
+	public abstract void updateProperty(PropertyRestrictionLevels levels);
+
+	// ----------------------------------------------------------------------
+	// The null implementation
+	// ----------------------------------------------------------------------
+
+	/**
+	 * A placeholder for when the bean instance is not set.
+	 */
+	private static class PropertyRestrictionBeanNull extends
+			PropertyRestrictionBean {
+		@Override
+		public boolean canDisplayResource(String resourceUri, RoleLevel userRole) {
+			warn();
+			return false;
+		}
+
+		@Override
+		public boolean canModifyResource(String resourceUri, RoleLevel userRole) {
+			warn();
+			return false;
+		}
+
+		@Override
+		public boolean canPublishResource(String resourceUri, RoleLevel userRole) {
+			warn();
+			return false;
+		}
+
+		@Override
+		public boolean canDisplayPredicate(Property predicate,
+				RoleLevel userRole) {
+			warn();
+			return false;
+		}
+
+		@Override
+		public boolean canModifyPredicate(Property predicate, RoleLevel userRole) {
+			warn();
+			return false;
+		}
+
+		@Override
+		public boolean canPublishPredicate(Property predicate,
+				RoleLevel userRole) {
+			warn();
+			return false;
+		}
+
+		@Override
+		public void updateProperty(PropertyRestrictionLevels levels) {
+			warn();
+		}
+
+		private void warn() {
+			try {
+				throw new IllegalStateException();
+			} catch (IllegalStateException e) {
+				log.warn("No PropertyRestrictionBean in place.", e);
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// Setup class
+	// ----------------------------------------------------------------------
+
+	/**
+	 * Create the bean at startup and remove it at shutdown.
+	 */
+	public static class Setup implements ServletContextListener {
+		@Override
+		public void contextInitialized(ServletContextEvent sce) {
+			ServletContext ctx = sce.getServletContext();
+			StartupStatus ss = StartupStatus.getBean(ctx);
+
+			try {
+				instance = new PropertyRestrictionBeanImpl(
+						PROHIBITED_NAMESPACES, PERMITTED_EXCEPTIONS,
+						ModelAccess.on(ctx));
+			} catch (Exception e) {
+				ss.fatal(this,
+						"could not set up PropertyRestrictionBean", e);
+			}
+		}
+
+		@Override
+		public void contextDestroyed(ServletContextEvent sce) {
+			instance = NULL;
+		}
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImpl.java
new file mode 100644
index 000000000..4681de664
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImpl.java
@@ -0,0 +1,252 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
+
+import static edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionLevels.Which.DISPLAY;
+import static edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionLevels.Which.MODIFY;
+import static edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionLevels.Which.PUBLISH;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.rdf.model.impl.Util;
+
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionLevels.Which;
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.Property;
+import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao.FullPropertyKey;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccess;
+
+/**
+ * On creation, populate a map of PropertyRestrictionLevels.
+ * 
+ * When a change is detected, update the map accordingly.
+ * 
+ * ------------------------------
+ * 
+ * How is authorization determined?
+ * 
+ * Resources are easy. If they aren't in a prohibited namespace, or are an
+ * exception to the prohibition, they are accessible.
+ * 
+ * Properties are harder. The prohibited namespace and exceptions still apply,
+ * but if we pass that test, then we check the threshold map.
+ * 
+ * When a test is made, we look for thresholds in the map. First we look for the
+ * full key of domain-base-range, in case we are testing a faux property. Faux
+ * properties are recorded in the map with the full key.
+ * 
+ * If we don't find the full key, then perhaps we are testing a faux property
+ * that has no settings, or perhaps we are testing an object property. We look
+ * for the partial key of null-base-null, which covers both of these cases,
+ * since object properties (and data properties) are recorded the map with a
+ * partial key.
+ * 
+ * Similarly, if we find a null threshold value in the full key, we look back to
+ * the partial key for a threshold.
+ * 
+ * If we find no non-null threshold value then the property is unrestricted for
+ * that feature.
+ * 
+ * -----------------------------
+ * 
+ * It would perhaps be a silly optimization, but if we find a key with 3 null
+ * thresholds, we could remove it from the map without changing the behavior.
+ */
+public class PropertyRestrictionBeanImpl extends PropertyRestrictionBean {
+	private static final Log log = LogFactory
+			.getLog(PropertyRestrictionBeanImpl.class);
+
+	private final Set<String> prohibitedNamespaces;
+	private final Set<String> permittedExceptions;
+
+	private final Map<FullPropertyKey, PropertyRestrictionLevels> thresholdMap = new ConcurrentHashMap<>();
+
+	public PropertyRestrictionBeanImpl(Collection<String> prohibitedNamespaces,
+			Collection<String> permittedExceptions, ContextModelAccess models) {
+		Objects.requireNonNull(prohibitedNamespaces,
+				"prohibitedNamespaces may not be null.");
+		this.prohibitedNamespaces = Collections.unmodifiableSet(new TreeSet<>(
+				prohibitedNamespaces));
+
+		Objects.requireNonNull(permittedExceptions,
+				"permittedExceptions may not be null.");
+		this.permittedExceptions = Collections.unmodifiableSet(new TreeSet<>(
+				permittedExceptions));
+
+		Objects.requireNonNull(models, "models may not be null.");
+		populateThresholdMap(models.getWebappDaoFactory());
+	}
+
+	private void populateThresholdMap(WebappDaoFactory wadf) {
+		for (ObjectProperty oProp : wadf.getObjectPropertyDao()
+				.getAllObjectProperties()) {
+			addObjectPropertyToMap(oProp);
+			for (FauxProperty fProp : wadf.getFauxPropertyDao()
+					.getFauxPropertiesForBaseUri(oProp.getURI())) {
+				addFauxPropertyToMap(fProp);
+			}
+		}
+		for (DataProperty dProp : wadf.getDataPropertyDao()
+				.getAllDataProperties()) {
+			addDataPropertyToMap(dProp);
+		}
+	}
+
+	private void addObjectPropertyToMap(ObjectProperty oProp) {
+		FullPropertyKey key = new FullPropertyKey(oProp.getURI());
+		PropertyRestrictionLevels levels = new PropertyRestrictionLevels(key,
+				oProp.getHiddenFromDisplayBelowRoleLevel(),
+				oProp.getProhibitedFromUpdateBelowRoleLevel(),
+				oProp.getHiddenFromPublishBelowRoleLevel());
+		thresholdMap.put(key, levels);
+	}
+
+	private void addFauxPropertyToMap(FauxProperty fProp) {
+		FullPropertyKey key = new FullPropertyKey(fProp.getDomainURI(),
+				fProp.getBaseURI(), fProp.getRangeURI());
+		PropertyRestrictionLevels levels = new PropertyRestrictionLevels(key,
+				fProp.getHiddenFromDisplayBelowRoleLevel(),
+				fProp.getProhibitedFromUpdateBelowRoleLevel(),
+				fProp.getHiddenFromPublishBelowRoleLevel());
+		thresholdMap.put(key, levels);
+	}
+
+	private void addDataPropertyToMap(DataProperty dProp) {
+		FullPropertyKey key = new FullPropertyKey(dProp.getURI());
+		PropertyRestrictionLevels levels = new PropertyRestrictionLevels(key,
+				dProp.getHiddenFromDisplayBelowRoleLevel(),
+				dProp.getProhibitedFromUpdateBelowRoleLevel(),
+				dProp.getHiddenFromPublishBelowRoleLevel());
+		thresholdMap.put(key, levels);
+	}
+
+	@Override
+	public boolean canDisplayResource(String resourceUri, RoleLevel userRole) {
+		return (resourceUri != null) && (userRole != null);
+	}
+
+	@Override
+	public boolean canModifyResource(String resourceUri, RoleLevel userRole) {
+		if (resourceUri == null || userRole == null) {
+			return false;
+		}
+		if (prohibitedNamespaces.contains(namespace(resourceUri))
+				&& !permittedExceptions.contains(resourceUri)) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public boolean canPublishResource(String resourceUri, RoleLevel userRole) {
+		return (resourceUri != null) && (userRole != null);
+	}
+
+	@Override
+	public boolean canDisplayPredicate(Property predicate, RoleLevel userRole) {
+		if (predicate == null || predicate.getURI() == null) {
+			return false;
+		}
+		return isAuthorized(userRole, getThreshold(predicate, DISPLAY));
+	}
+
+	@Override
+	public boolean canModifyPredicate(Property predicate, RoleLevel userRole) {
+		if (predicate == null || predicate.getURI() == null) {
+			return false;
+		}
+		return isAuthorized(userRole, getPropertyModifyThreshold(predicate));
+	}
+
+	@Override
+	public boolean canPublishPredicate(Property predicate, RoleLevel userRole) {
+		if (predicate == null || predicate.getURI() == null) {
+			return false;
+		}
+		return isAuthorized(userRole, getThreshold(predicate, PUBLISH));
+	}
+
+	@Override
+	public void updateProperty(PropertyRestrictionLevels levels) {
+		thresholdMap.put(levels.getKey(), levels);
+	}
+
+	private boolean isAuthorized(RoleLevel userRole, RoleLevel thresholdRole) {
+		if (userRole == null) {
+			return false;
+		}
+		if (thresholdRole == null) {
+			return true;
+		}
+		return userRole.compareTo(thresholdRole) >= 0;
+	}
+
+	private RoleLevel getPropertyModifyThreshold(Property p) {
+		if (prohibitedNamespaces.contains(namespace(p.getURI()))
+				&& !permittedExceptions.contains(p.getURI())) {
+			return RoleLevel.NOBODY;
+		}
+		return getThreshold(p, MODIFY);
+	}
+
+	private RoleLevel getThreshold(Property p, Which which) {
+		RoleLevel qualifiedLevel = getThreshold(new FullPropertyKey(p), which);
+		if (qualifiedLevel != null) {
+			return qualifiedLevel;
+		}
+
+		RoleLevel bareLevel = getThreshold(new FullPropertyKey(p.getURI()),
+				which);
+		return bareLevel;
+	}
+
+	private RoleLevel getThreshold(FullPropertyKey key, Which which) {
+		PropertyRestrictionLevels levels = thresholdMap.get(key);
+		if (levels == null) {
+			return null;
+		} else {
+			return levels.getLevel(which);
+		}
+	}
+
+	private String namespace(String uri) {
+		return uri.substring(0, Util.splitNamespace(uri));
+	}
+
+	@Override
+	public String toString() {
+		SortedSet<FullPropertyKey> keys = new TreeSet<>(
+				new Comparator<FullPropertyKey>() {
+					@Override
+					public int compare(FullPropertyKey o1, FullPropertyKey o2) {
+						return o1.toString().compareTo(o2.toString());
+					}
+				});
+		keys.addAll(thresholdMap.keySet());
+
+		StringBuilder buffer = new StringBuilder();
+		for (FullPropertyKey key : keys) {
+			buffer.append(key + " " + thresholdMap.get(key).getLevel(DISPLAY)
+					+ " " + thresholdMap.get(key).getLevel(MODIFY) + " "
+					+ thresholdMap.get(key).getLevel(PUBLISH) + "\n");
+		}
+		return buffer.toString();
+
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionLevels.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionLevels.java
new file mode 100644
index 000000000..a5f4711a8
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionLevels.java
@@ -0,0 +1,68 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
+
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao.FullPropertyKey;
+
+/**
+ * The threshold levels for operations on a given property.
+ * 
+ * This is based on the assumption that the FullPropertyKey is sufficient to
+ * distinguish all properties. An object property and a data property may not
+ * share the same key. A faux property must have a different key from any object
+ * property.
+ */
+public class PropertyRestrictionLevels {
+	private final FullPropertyKey key;
+	private final RoleLevel displayThreshold;
+	private final RoleLevel modifyThreshold;
+	private final RoleLevel publishThreshold;
+
+	public enum Which {
+		DISPLAY, MODIFY, PUBLISH
+	}
+
+	public PropertyRestrictionLevels(FullPropertyKey key,
+			RoleRestrictedProperty p) {
+		this(key, p.getHiddenFromDisplayBelowRoleLevel(), p
+				.getProhibitedFromUpdateBelowRoleLevel(), p
+				.getHiddenFromPublishBelowRoleLevel());
+	}
+
+	public PropertyRestrictionLevels(FullPropertyKey key,
+			RoleLevel displayThreshold, RoleLevel modifyThreshold,
+			RoleLevel publishThreshold) {
+		this.key = key;
+		this.displayThreshold = displayThreshold;
+		this.modifyThreshold = modifyThreshold;
+		this.publishThreshold = publishThreshold;
+	}
+
+	public FullPropertyKey getKey() {
+		return key;
+	}
+
+	public RoleLevel getLevel(Which which) {
+		if (which == null) {
+			return null;
+		} else {
+			switch (which) {
+			case DISPLAY:
+				return displayThreshold;
+			case MODIFY:
+				return modifyThreshold;
+			default:
+				return publishThreshold;
+			}
+		}
+	}
+
+	@Override
+	public String toString() {
+		return "PropertyRestrictionLevels[key=" + key + ", display="
+				+ displayThreshold + ", modify=" + modifyThreshold
+				+ ", publish=" + publishThreshold + "]";
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionListener.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionListener.java
index 97b1f359a..f6997825a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionListener.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionListener.java
@@ -2,20 +2,12 @@
 
 package edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
 
-import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY;
-
-import javax.servlet.ServletContext;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.rdf.model.Model;
-
 import edu.cornell.mannlib.vedit.beans.EditProcessObject;
 import edu.cornell.mannlib.vedit.listener.ChangeListener;
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
-import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao.FullPropertyKey;
 
 /**
  * Add this ChangeListener to your EditProcessObject when modifying the
@@ -26,12 +18,6 @@ public class PropertyRestrictionListener implements ChangeListener {
 	private static final Log log = LogFactory
 			.getLog(PropertyRestrictionListener.class);
 
-	private final ServletContext ctx;
-
-	public PropertyRestrictionListener(ServletContext ctx) {
-		this.ctx = ctx;
-	}
-
 	/**
 	 * If the deleted property had a non-null restriction, rebuild the bean.
 	 */
@@ -39,84 +25,43 @@ public class PropertyRestrictionListener implements ChangeListener {
 	public void doDeleted(Object oldObj, EditProcessObject epo) {
 		if (oldObj instanceof RoleRestrictedProperty) {
 			RoleRestrictedProperty p = (RoleRestrictedProperty) oldObj;
-			if (anyRoleChanged(p.getHiddenFromDisplayBelowRoleLevel(),
-					p.getProhibitedFromUpdateBelowRoleLevel(),
-					p.getHiddenFromPublishBelowRoleLevel(), null, null, null)) {
-				log.debug("rebuilding the PropertyRestrictionPolicyHelper after deletion");
-				createAndSetBean();
-			}
+			FullPropertyKey key = new FullPropertyKey(p);
+			updateLevels(new PropertyRestrictionLevels(key, p));
 		} else {
 			log.warn("Not an instance of RoleRestrictedProperty: " + oldObj);
 		}
 	}
 
 	/**
-	 * If the inserted property has a non-null restriction, rebuild the bean.
+	 * Update the inserted property.
 	 */
 	@Override
 	public void doInserted(Object newObj, EditProcessObject epo) {
 		if (newObj instanceof RoleRestrictedProperty) {
 			RoleRestrictedProperty p = (RoleRestrictedProperty) newObj;
-			if (anyRoleChanged(null, null, null,
-					p.getHiddenFromDisplayBelowRoleLevel(),
-					p.getProhibitedFromUpdateBelowRoleLevel(),
-					p.getHiddenFromPublishBelowRoleLevel())) {
-				log.debug("rebuilding the PropertyRestrictionPolicyHelper after insertion");
-				createAndSetBean();
-			}
+			FullPropertyKey key = new FullPropertyKey(p);
+			updateLevels(new PropertyRestrictionLevels(key, p));
 		} else {
 			log.warn("Not an instance of RoleRestrictedProperty: " + newObj);
 		}
 	}
 
 	/**
-	 * If the updated property has changed its restrictions, rebuild the bean.
+	 * Update the changed property.
 	 */
 	@Override
 	public void doUpdated(Object oldObj, Object newObj, EditProcessObject epo) {
-		if (oldObj instanceof RoleRestrictedProperty
-				&& newObj instanceof RoleRestrictedProperty) {
-			RoleRestrictedProperty oldP = (RoleRestrictedProperty) oldObj;
+		if (newObj instanceof RoleRestrictedProperty) {
 			RoleRestrictedProperty newP = (RoleRestrictedProperty) newObj;
-			if (anyRoleChanged(oldP.getHiddenFromDisplayBelowRoleLevel(),
-					oldP.getProhibitedFromUpdateBelowRoleLevel(),
-					oldP.getHiddenFromPublishBelowRoleLevel(),
-					newP.getHiddenFromDisplayBelowRoleLevel(),
-					newP.getProhibitedFromUpdateBelowRoleLevel(),
-					newP.getHiddenFromPublishBelowRoleLevel())) {
-				log.debug("rebuilding the PropertyRestrictionPolicyHelper after update");
-				createAndSetBean();
-			}
+			FullPropertyKey key = new FullPropertyKey(newP);
+			updateLevels(new PropertyRestrictionLevels(key, newP));
 		} else {
 			log.warn("Not instances of RoleRestrictedProperty: " + oldObj
 					+ ", " + newObj);
 		}
 	}
 
-	private boolean anyRoleChanged(RoleLevel oldDisplayRole,
-			RoleLevel oldUpdateRole, RoleLevel oldPublishRole,
-			RoleLevel newDisplayRole, RoleLevel newUpdateRole,
-			RoleLevel newPublishRole) {
-		return (!isTheSame(oldDisplayRole, newDisplayRole))
-				|| (!isTheSame(oldUpdateRole, newUpdateRole))
-				|| (!isTheSame(oldPublishRole, newPublishRole));
-	}
-
-	private boolean isTheSame(RoleLevel oldRole, RoleLevel newRole) {
-		if ((oldRole == null) && (newRole == null)) {
-			return true;
-		} else if ((oldRole == null) || (newRole == null)) {
-			return false;
-		} else {
-			return oldRole.compareTo(newRole) == 0;
-		}
-	}
-
-	private void createAndSetBean() {
-		OntModel model = ModelAccess.on(ctx).getOntModel();
-		Model displayModel = ModelAccess.on(ctx).getOntModel(DISPLAY);
-		PropertyRestrictionPolicyHelper bean = PropertyRestrictionPolicyHelper
-				.createBean(model, displayModel);
-		PropertyRestrictionPolicyHelper.setBean(ctx, bean);
+	private void updateLevels(PropertyRestrictionLevels levels) {
+		PropertyRestrictionBean.getBean().updateProperty(levels);
 	}
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelper.java
deleted file mode 100644
index 6e8d5637a..000000000
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelper.java
+++ /dev/null
@@ -1,498 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
-
-import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.rdf.model.impl.Util;
-import com.hp.hpl.jena.shared.Lock;
-
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.Property;
-import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao.FullPropertyKey;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
-import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
-import edu.cornell.mannlib.vitro.webapp.utils.ApplicationConfigurationOntologyUtils;
-
-/**
- * Assists the role-based policies in determining whether a property or resource
- * may be displayed, modified, or published in linked open data.
- * 
- * There is a bean in the context that holds the current threshold role levels
- * for displaying, modifying, or publishing restricted properties.
- * 
- * Create this bean after the Jena model is in place in the context.
- * 
- * Add PropertyRestrictionListener to your EditProcessObject if you are editing
- * a property, to ensure that the bean stays current.
- */
-public class PropertyRestrictionPolicyHelper {
-	private static final Log log = LogFactory
-			.getLog(PropertyRestrictionPolicyHelper.class);
-
-	private static final Collection<String> PROHIBITED_NAMESPACES = Arrays
-			.asList(new String[] { VitroVocabulary.vitroURI, "" });
-
-	private static final Collection<String> PERMITTED_EXCEPTIONS = Arrays
-			.asList(new String[] {
-					VitroVocabulary.MONIKER,
-					VitroVocabulary.MODTIME,
-
-					VitroVocabulary.IND_MAIN_IMAGE,
-
-					VitroVocabulary.LINK,
-					VitroVocabulary.PRIMARY_LINK,
-					VitroVocabulary.ADDITIONAL_LINK,
-					VitroVocabulary.LINK_ANCHOR,
-					VitroVocabulary.LINK_URL });
-
-	/**
-	 * The bean is attached to the ServletContext using this attribute name.
-	 */
-	private static final String ATTRIBUTE_NAME = PropertyRestrictionPolicyHelper.class
-			.getName();
-
-	// ----------------------------------------------------------------------
-	// static methods
-	// ----------------------------------------------------------------------
-
-	public static PropertyRestrictionPolicyHelper getBean(ServletContext ctx) {
-		Object attribute = ctx.getAttribute(ATTRIBUTE_NAME);
-		if (!(attribute instanceof PropertyRestrictionPolicyHelper)) {
-			throw new IllegalStateException(
-					"PropertyRestrictionPolicyHelper has not been initialized.");
-		}
-		return (PropertyRestrictionPolicyHelper) attribute;
-	}
-
-	private static void removeBean(ServletContext ctx) {
-		ctx.removeAttribute(ATTRIBUTE_NAME);
-	}
-
-	public static void setBean(ServletContext ctx,
-			PropertyRestrictionPolicyHelper bean) {
-		if (bean == null) {
-			throw new NullPointerException("bean may not be null.");
-		}
-		ctx.setAttribute(ATTRIBUTE_NAME, bean);
-	}
-
-	/**
-	 * Initialize the bean with the standard prohibitions and exceptions, and
-	 * with the thresholds obtained from the model.
-	 */
-	public static PropertyRestrictionPolicyHelper createBean(OntModel model, 
-	                                                         Model displayModel) {
-	    
-	    
-		Map<FullPropertyKey, RoleLevel> displayThresholdMap = 
-		        new HashMap<FullPropertyKey, RoleLevel>();
-		Map<FullPropertyKey, RoleLevel> modifyThresholdMap = 
-		        new HashMap<FullPropertyKey, RoleLevel>();
-		Map<FullPropertyKey, RoleLevel> publishThresholdMap = 
-				new HashMap<FullPropertyKey, RoleLevel>();
-		
-		OntModel union = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM,
-		        ModelFactory.createUnion(displayModel, model));
-
-
-		populateThresholdMap(union, displayThresholdMap,
-				VitroVocabulary.HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT);
-		populateThresholdMap(union, modifyThresholdMap,
-				VitroVocabulary.PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT);
-		populateThresholdMap(union, publishThresholdMap,
-				VitroVocabulary.HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT);
-
-		PropertyRestrictionPolicyHelper bean = new PropertyRestrictionPolicyHelper(
-				PROHIBITED_NAMESPACES, PERMITTED_EXCEPTIONS,
-				displayThresholdMap, modifyThresholdMap, publishThresholdMap);
-
-		return bean;
-	}
-
-	private RoleLevel getModifyThreshold(Property property) {
-	    return getThreshold(property, modifyThresholdMap);
-	}
-	
-	private RoleLevel getThreshold(Property property,
-			Map<FullPropertyKey, RoleLevel> thresholdMap) {
-	    if (property.getURI() == null) {
-	        return RoleLevel.NOBODY;
-	    }
-		RoleLevel roleLevel = thresholdMap.get(new FullPropertyKey(property));
-		if (roleLevel == null) {
-			roleLevel = thresholdMap
-					.get(new FullPropertyKey(property.getURI()));
-		}
-	    return roleLevel;
-	}
-	
-	/**
-	 * Find all the resources that possess this property, and map the resource
-	 * URI to the required RoleLevel.
-	 */
-	private static void populateThresholdMap(OntModel model,
-			Map<FullPropertyKey, RoleLevel> map, String propertyUri) {
-		model.enterCriticalSection(Lock.READ);
-		try {
-		    com.hp.hpl.jena.rdf.model.Property property = model.getProperty(propertyUri);
-			StmtIterator stmts = model.listStatements((Resource) null,
-					property, (Resource) null);
-			try {
-    			while (stmts.hasNext()) {
-    				Statement stmt = stmts.next();
-    				Resource subject = stmt.getSubject();
-    				RDFNode objectNode = stmt.getObject();
-    				if ((subject == null) || (!(objectNode instanceof Resource))) {
-    					continue;
-    				}
-    				Resource object = (Resource) objectNode;
-    				RoleLevel role = RoleLevel.getRoleByUri(object.getURI());
-					map.put(new FullPropertyKey(subject.getURI()), role);
-    			} 
-			} finally {
-	            stmts.close();			    
-			}
-            List<ObjectProperty> fauxOps = ApplicationConfigurationOntologyUtils
-                    .getAdditionalFauxSubproperties(null, null, model, model);
-            for (ObjectProperty faux : fauxOps) {
-                RoleLevel role = null;
-                if(VitroVocabulary.PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT
-                        .equals(propertyUri)) {
-                    role = faux.getProhibitedFromUpdateBelowRoleLevel();
-                } else if (VitroVocabulary.HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT
-                        .equals(propertyUri)) {
-                    role = faux.getHiddenFromDisplayBelowRoleLevel();
-                } else if (VitroVocabulary.HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT
-                		.equals(propertyUri)) {
-                	role = faux.getHiddenFromPublishBelowRoleLevel();
-                }
-                if (role != null) {
-                	FullPropertyKey key = new FullPropertyKey(faux);
-					map.put(key, role);
-					log.debug("Putting key: " + key + " ==> L:" + role);
-                }
-            }
-
-		} finally {
-			model.leaveCriticalSection();
-		}
-	}
-
-	// ----------------------------------------------------------------------
-	// the bean
-	// ----------------------------------------------------------------------
-
-	/**
-	 * URIs in these namespaces can't be modified, unless they are listed in the
-	 * exceptions.
-	 */
-	private final Collection<String> modifyProhibitedNamespaces;
-
-	/**
-	 * These URIs can be modified, even if they are in the prohibited
-	 * namespaces.
-	 */
-	private final Collection<String> modifyExceptionsAllowedUris;
-
-	/**
-	 * These URIs can be displayed only if the user's role is at least as high
-	 * as the threshold role.
-	 */
-	private final Map<FullPropertyKey, RoleLevel> displayThresholdMap;
-
-	/**
-	 * These URIs can be modified only if the user's role is at least as high as
-	 * the threshold role.
-	 */
-	private final Map<FullPropertyKey, RoleLevel> modifyThresholdMap;
-	
-	/**
-	 * These URIs can be published only if the user's role is at least as high as
-	 * the threshold role.
-	 */
-	private final Map<FullPropertyKey, RoleLevel> publishThresholdMap;
-	
-
-	/**
-	 * Store unmodifiable versions of the inputs.
-	 * 
-	 * Protected access: the bean should only be created by the static methods,
-	 * or by unit tests.
-	 */
-	protected PropertyRestrictionPolicyHelper(
-			Collection<String> modifyProhibitedNamespaces,
-			Collection<String> modifyExceptionsAllowedUris,
-			Map<FullPropertyKey, RoleLevel> displayThresholdMap,
-			Map<FullPropertyKey, RoleLevel> modifyThresholdMap,
-			Map<FullPropertyKey, RoleLevel> publishThresholdMap) {
-		this.modifyProhibitedNamespaces = unmodifiable(modifyProhibitedNamespaces);
-		this.modifyExceptionsAllowedUris = unmodifiable(modifyExceptionsAllowedUris);
-		this.displayThresholdMap = displayThresholdMap;
-		this.modifyThresholdMap = modifyThresholdMap;
-		this.publishThresholdMap = publishThresholdMap;
-		// TODO: why are these no longer unmodifiable? Brian changed during the
-		// TODO: ISF integration.
-		// this.displayThresholdMap = unmodifiable(displayThresholdMap);
-		// this.modifyThresholdMap = unmodifiable(modifyThresholdMap);
-
-		if (log.isDebugEnabled()) {
-			log.debug("prohibited: " + this.modifyProhibitedNamespaces);
-			log.debug("exceptions: " + this.modifyExceptionsAllowedUris);
-			log.debug("display thresholds: " + this.displayThresholdMap);
-			log.debug("modify thresholds: " + this.modifyThresholdMap);
-			log.debug("publish thresholds: " + this.publishThresholdMap);
-		}
-	}
-
-	private Collection<String> unmodifiable(Collection<String> raw) {
-		if (raw == null) {
-			return Collections.emptyList();
-		} else {
-			return Collections.unmodifiableCollection(new HashSet<String>(raw));
-		}
-	}
-
-	@SuppressWarnings("unused")
-	private Map<String, RoleLevel> unmodifiable(Map<String, RoleLevel> raw) {
-		if (raw == null) {
-			return Collections.emptyMap();
-		} else {
-			return Collections.unmodifiableMap(new HashMap<String, RoleLevel>(
-					raw));
-		}
-	}
-
-	/**
-	 * Any resource can be displayed.
-	 * 
-	 * (Someday we may want to implement display restrictions based on VClass.)
-	 */
-	@SuppressWarnings("unused")
-	public boolean canDisplayResource(String resourceUri, RoleLevel userRole) {
-		if (resourceUri == null) {
-			log.debug("can't display resource: resourceUri was null");
-			return false;
-		}
-
-		log.debug("can display resource '" + resourceUri + "'");
-		return true;
-	}
-
-	/**
-	 * A resource cannot be modified if its namespace is in the prohibited list
-	 * (but some exceptions are allowed).
-	 * 
-	 * (Someday we may want to implement modify restrictions based on VClass.)
-	 */
-	@SuppressWarnings("unused")
-	public boolean canModifyResource(String resourceUri, RoleLevel userRole) {
-		if (resourceUri == null) {
-			log.debug("can't modify resource: resourceUri was null");
-			return false;
-		}
-
-		if (modifyProhibitedNamespaces.contains(namespace(resourceUri))) {
-			if (modifyExceptionsAllowedUris.contains(resourceUri)) {
-				log.debug("'" + resourceUri + "' is a permitted exception");
-			} else {
-				log.debug("can't modify resource '" + resourceUri
-						+ "': prohibited namespace: '" + namespace(resourceUri)
-						+ "'");
-				return false;
-			}
-		}
-
-		log.debug("can modify resource '" + resourceUri + "'");
-		return true;
-	}
-
-	/**
-	 * Any resource can be published.
-	 * 
-	 * (Someday we may want to implement publish restrictions based on VClass.)
-	 */
-	@SuppressWarnings("unused")
-	public boolean canPublishResource(String resourceUri, RoleLevel userRole) {
-		if (resourceUri == null) {
-			log.debug("can't publish resource: resourceUri was null");
-			return false;
-		}
-
-		log.debug("can publish resource '" + resourceUri + "'");
-		return true;
-	}
-
-	/**
-	 * If display of a predicate is restricted, the user's role must be at least
-	 * as high as the restriction level.
-	 */
-	public boolean canDisplayPredicate(Property predicate, RoleLevel userRole) {	    
-		if (predicate == null) {
-			log.debug("can't display predicate: predicate was null");
-			return false;
-		}
-		
-		RoleLevel displayThreshold = getThreshold(predicate, displayThresholdMap);		
-		       	        
-		if (isAuthorized(userRole, displayThreshold)) {
-            log.debug("can display predicate: '" + predicate.getURI() + "', domain=" 
-                    + predicate.getDomainVClassURI() + ", range=" 
-                    + predicate.getRangeVClassURI() + ", userRole="
-                    + userRole + ", thresholdRole=" + displayThreshold);
-			return true;
-		}
-
-        log.debug("can't display predicate: '" + predicate.getURI() + "', domain=" 
-                + predicate.getDomainVClassURI() + ", range=" 
-                + predicate.getRangeVClassURI() + ", userRole="
-                + userRole + ", thresholdRole=" + displayThreshold);
-		return false;
-	}
-	
-	/**
-	 * A predicate cannot be modified if its namespace is in the prohibited list
-	 * (some exceptions are allowed).
-	 * 
-	 * If modification of a predicate is restricted, the user's role must be at
-	 * least as high as the restriction level.
-	 */
-	public boolean canModifyPredicate(Property predicate, RoleLevel userRole) {
-		if (predicate == null || predicate.getURI() == null) {
-			log.debug("can't modify predicate: predicate was null");
-			return false;
-		}
-
-		if (modifyProhibitedNamespaces.contains(namespace(predicate.getURI()))) {
-			if (modifyExceptionsAllowedUris.contains(predicate.getURI())) {
-				log.debug("'" + predicate.getURI() + "' is a permitted exception");
-			} else {
-				log.debug("can't modify resource '" + predicate.getURI()
-						+ "': prohibited namespace: '"
-						+ namespace(predicate.getURI()) + "'");
-				return false;
-			}
-		}
-
-		RoleLevel modifyThreshold = getModifyThreshold(predicate);
-		if (isAuthorized(userRole, modifyThreshold)) {
-			log.debug("can modify predicate: '" + predicate.getURI() + "', domain=" 
-		            + predicate.getDomainVClassURI() + ", range=" 
-			        + predicate.getRangeVClassURI() + ", userRole="
-					+ userRole + ", thresholdRole=" + modifyThreshold);
-			return true;
-		}
-
-        log.debug("can't modify predicate: '" + predicate.getURI() + "', domain=" 
-                + predicate.getDomainVClassURI() + ", range=" 
-                + predicate.getRangeVClassURI() + ", userRole="
-                + userRole + ", thresholdRole=" + modifyThreshold);
-		return false;
-	}
-
-	/**
-	 * If publishing of a predicate is restricted, the user's role must be at least
-	 * as high as the restriction level.
-	 */
-	public boolean canPublishPredicate(Property predicate, RoleLevel userRole) {	    
-		if (predicate == null) {
-			log.debug("can't publish predicate: predicate was null");
-			return false;
-		}
-		
-		RoleLevel publishThreshold = getThreshold(predicate, publishThresholdMap);		
-		       	        
-		if (isAuthorized(userRole, publishThreshold)) {
-            log.debug("can publish predicate: '" + predicate.getURI() + "', domain=" 
-                    + predicate.getDomainVClassURI() + ", range=" 
-                    + predicate.getRangeVClassURI() + ", userRole="
-                    + userRole + ", thresholdRole=" + publishThreshold);
-			return true;
-		}
-
-        log.debug("can't publish predicate: '" + predicate.getURI() + "', domain=" 
-                + predicate.getDomainVClassURI() + ", range=" 
-                + predicate.getRangeVClassURI() + ", userRole="
-                + userRole + ", thresholdRole=" + publishThreshold);
-		return false;
-	}
-	
-	private boolean isAuthorized(RoleLevel userRole, RoleLevel thresholdRole) {
-		if (userRole == null) {
-			return false;
-		}
-		if (thresholdRole == null) {
-			return true;
-		}
-		return userRole.compareTo(thresholdRole) >= 0;
-	}
-
-	private String namespace(String uri) {
-		return uri.substring(0, Util.splitNamespace(uri));
-	}
-
-	// ----------------------------------------------------------------------
-	// Setup class
-	// ----------------------------------------------------------------------
-
-	/**
-	 * Create the bean at startup and remove it at shutdown.
-	 */
-	public static class Setup implements ServletContextListener {
-		@Override
-		public void contextInitialized(ServletContextEvent sce) {
-			ServletContext ctx = sce.getServletContext();
-			StartupStatus ss = StartupStatus.getBean(ctx);
-
-			try {
-				OntModel model = ModelAccess.on(ctx).getOntModel();
-				if (model == null) {
-					throw new NullPointerException(
-							"jenaOntModel has not been initialized.");
-				}
-                Model displayModel = ModelAccess.on(ctx).getOntModel(DISPLAY);
-                if (displayModel == null) {
-                    throw new NullPointerException(
-                            "display model has not been initialized.");
-                }
-                
-				PropertyRestrictionPolicyHelper bean = PropertyRestrictionPolicyHelper
-						.createBean(model, displayModel);
-				PropertyRestrictionPolicyHelper.setBean(ctx, bean);
-			} catch (Exception e) {
-				ss.fatal(this, "could not set up PropertyRestrictionPolicyHelper", e);
-			}
-		}
-
-		@Override
-		public void contextDestroyed(ServletContextEvent sce) {
-			removeBean(sce.getServletContext());
-		}
-	}
-
-}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/RoleRestrictedProperty.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/RoleRestrictedProperty.java
index fb93bce16..040141c2b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/RoleRestrictedProperty.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/RoleRestrictedProperty.java
@@ -9,6 +9,12 @@ import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
  * user's role level.
  */
 public interface RoleRestrictedProperty {
+	String getDomainVClassURI();
+
+	String getRangeVClassURI();
+
+	String getURI();
+
 	RoleLevel getHiddenFromDisplayBelowRoleLevel();
 
 	RoleLevel getProhibitedFromUpdateBelowRoleLevel();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/specialrelationships/AbstractRelationshipPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/specialrelationships/AbstractRelationshipPolicy.java
index 359c646b2..e388c65ad 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/specialrelationships/AbstractRelationshipPolicy.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/specialrelationships/AbstractRelationshipPolicy.java
@@ -8,7 +8,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import edu.cornell.mannlib.vitro.webapp.auth.policy.BasicPolicyDecision;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBean;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
@@ -31,13 +31,13 @@ public abstract class AbstractRelationshipPolicy implements PolicyIface {
 	}
 
 	protected boolean canModifyResource(String uri) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx).canModifyResource(
-				uri, RoleLevel.SELF);
+		return PropertyRestrictionBean.getBean().canModifyResource(uri,
+				RoleLevel.SELF);
 	}
 
 	protected boolean canModifyPredicate(Property predicate) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx).canModifyPredicate(
-				predicate, RoleLevel.SELF);
+		return PropertyRestrictionBean.getBean().canModifyPredicate(predicate,
+				RoleLevel.SELF);
 	}
 
 	protected PolicyDecision cantModifyResource(String uri) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
index f5f9c9b3e..2d868520a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
@@ -233,4 +233,18 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean,
 				+ ", customEntryForm=" + customEntryForm + ", customListView="
 				+ customListView + "]";
 	}
+
+	// ----------------------------------------------------------------------
+	// Satisfy the RoleRestrictedProperty interface.
+	// ----------------------------------------------------------------------
+
+	@Override
+	public String getDomainVClassURI() {
+		return getDomainURI();
+	}
+
+	@Override
+	public String getRangeVClassURI() {
+		return getRangeURI();
+	}
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java
index ec3759041..115f84f74 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java
@@ -34,9 +34,9 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.edit.utils.RoleLevelOptionsSetup;
 import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.DatatypeDao;
-import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 
 
 public class DatapropRetryController extends BaseEditController {
@@ -124,7 +124,7 @@ public class DatapropRetryController extends BaseEditController {
 
         //set up any listeners
         List changeListenerList = new ArrayList();
-        changeListenerList.add(new PropertyRestrictionListener(getServletContext()));
+        changeListenerList.add(new PropertyRestrictionListener());
         epo.setChangeListenerList(changeListenerList);
 
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
index 9c6cdfd3a..7516ac914 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java
@@ -211,7 +211,7 @@ public class FauxPropertyRetryController extends BaseEditController {
 
 		private void setListeners() {
 			epo.setChangeListenerList(Collections
-					.singletonList(new PropertyRestrictionListener(ctx)));
+					.singletonList(new PropertyRestrictionListener()));
 		}
 
 		private void setForwarders() {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java
index 2b2ed1a77..63c2a2e15 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java
@@ -33,9 +33,9 @@ import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.edit.utils.RoleLevelOptionsSetup;
-import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 
 public class PropertyRetryController extends BaseEditController {
     
@@ -115,7 +115,7 @@ public class PropertyRetryController extends BaseEditController {
 
         //set up any listeners
         List<ChangeListener> changeListenerList = new ArrayList<>();
-        changeListenerList.add(new PropertyRestrictionListener(getServletContext()));
+        changeListenerList.add(new PropertyRestrictionListener());
         epo.setChangeListenerList(changeListenerList);
 
         //make a postinsert pageforwarder that will send us to a new class's fetch screen
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java
index 378aac5dd..1e325cac9 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java
@@ -7,6 +7,7 @@ import java.util.Objects;
 
 import com.hp.hpl.jena.vocabulary.OWL;
 
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.RoleRestrictedProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.Property;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 
@@ -72,9 +73,12 @@ public interface PropertyDao {
 			this(OWL_THING, uri, OWL_THING);
 		}
 
-		public FullPropertyKey(Property prop) {
-			this(prop.getDomainVClassURI(), prop.getURI(), prop
-					.getRangeVClassURI());
+		public FullPropertyKey(Property p) {
+			this(p.getDomainVClassURI(), p.getURI(), p.getRangeVClassURI());
+		}
+
+		public FullPropertyKey(RoleRestrictedProperty p) {
+			this(p.getDomainVClassURI(), p.getURI(), p.getRangeVClassURI());
 		}
 
 		public FullPropertyKey(String domainUri, String propertyUri,
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
index be1198c4d..e2ccdfb81 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
@@ -42,6 +42,7 @@ import com.hp.hpl.jena.vocabulary.OWL;
 import com.hp.hpl.jena.vocabulary.RDF;
 import com.hp.hpl.jena.vocabulary.RDFS;
 
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.RoleRestrictedProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
@@ -1137,7 +1138,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
             }
             qexec.close();
         }
-        FullPropertyKey key = new FullPropertyKey(op);
+        FullPropertyKey key = new FullPropertyKey((RoleRestrictedProperty)op);
 		String customListViewConfigFileName = customListViewConfigFileMap.get(key);
         if (customListViewConfigFileName == null) {
             log.debug("no list view found for " + key);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
index 013f6afcc..fa81a6705 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
@@ -274,7 +274,7 @@ public class GroupedPropertyList extends BaseTemplateModel {
     }
     
     private boolean redundant(ObjectProperty op, ObjectProperty op2) {
-    	return new FullPropertyKey(op).equals(new FullPropertyKey(op2));
+    	return new FullPropertyKey((Property)op).equals(new FullPropertyKey((Property)op2));
     }
 
     private void addObjectPropertyToPropertyList(String propertyUri, String domainUri, String rangeUri,
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java
index 95cc96aff..cfaff087f 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java
@@ -12,7 +12,7 @@ import static org.junit.Assert.assertNull;
 import org.junit.Before;
 import org.junit.Test;
 
-import stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelperStub;
+import stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBeanStub;
 import stubs.javax.servlet.ServletContextStub;
 
 import com.hp.hpl.jena.ontology.OntModel;
@@ -23,7 +23,6 @@ import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasProfile;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction;
@@ -71,9 +70,8 @@ public class SelfEditingPolicyTest extends AbstractTestClass {
 	public void setUp() throws Exception {
 		ctx = new ServletContextStub();
 
-		PropertyRestrictionPolicyHelper prph = PropertyRestrictionPolicyHelperStub
+		PropertyRestrictionBeanStub
 				.getInstance(new String[] { UNSAFE_NS });
-		PropertyRestrictionPolicyHelper.setBean(ctx, prph);
 
 		policy = new SelfEditingPolicy(ctx);
 
@@ -87,14 +85,13 @@ public class SelfEditingPolicyTest extends AbstractTestClass {
 
 	@Test
 	public void testProhibitedProperties() {
-		PropertyRestrictionPolicyHelper prph = PropertyRestrictionPolicyHelperStub
+		PropertyRestrictionBeanStub
 				.getInstance(new String[] { UNSAFE_NS }, new String[] {
 						"http://mannlib.cornell.edu/bad#prp234",
 						"http://mannlib.cornell.edu/bad#prp999",
 						"http://mannlib.cornell.edu/bad#prp333",
 						"http://mannlib.cornell.edu/bad#prp777",
 						"http://mannlib.cornell.edu/bad#prp0020" });
-		PropertyRestrictionPolicyHelper.setBean(ctx, prph);
 
 		whatToAuth = new AddObjectPropertyStatement(ontModel, SELFEDITOR_URI,
 				new Property("http://mannlib.cornell.edu/bad#prp234"), SAFE_RESOURCE);
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java
index d448a3ac6..34267371a 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java
@@ -10,7 +10,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelperStub;
+import stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBeanStub;
 import stubs.javax.servlet.ServletContextStub;
 
 import com.hp.hpl.jena.ontology.OntModel;
@@ -22,7 +22,6 @@ import edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasProfile;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement;
@@ -78,9 +77,7 @@ public class SelfEditingPolicy_2_Test extends AbstractTestClass {
 	@Before
 	public void setUp() throws Exception {
 		ServletContextStub ctx = new ServletContextStub();
-		PropertyRestrictionPolicyHelper.setBean(ctx,
-				PropertyRestrictionPolicyHelperStub
-						.getInstance(new String[] { ADMIN_NS }));
+		PropertyRestrictionBeanStub.getInstance(new String[] { ADMIN_NS });
 
 		policy = new SelfEditingPolicy(ctx);
 		Assert.assertNotNull(policy);
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImplTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImplTest.java
new file mode 100644
index 000000000..fc3fe813a
--- /dev/null
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImplTest.java
@@ -0,0 +1,511 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
+
+import static edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionLevels.Which.DISPLAY;
+import static edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionLevels.Which.MODIFY;
+import static edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionLevels.Which.PUBLISH;
+import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.CURATOR;
+import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.DB_ADMIN;
+import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.EDITOR;
+import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.NOBODY;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import stubs.edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDaoStub;
+import stubs.edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDaoStub;
+import stubs.edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDaoStub;
+import stubs.edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryStub;
+import stubs.edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccessStub;
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionLevels.Which;
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.Property;
+import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao.FullPropertyKey;
+
+/**
+ * If we believe that authorization will succeed regardless of user role, check
+ * that it succeeds with the lowest role.
+ * 
+ * If we believe that authorization will fail regardless of user role, check
+ * that it fails with the highest role.
+ * 
+ * If we believe that authorization depends on the user role, it should pass if
+ * the user role is higher than or equal to the threshold, and fail if the user
+ * role is less than the threshold.
+ * 
+ * Note that we can't set a threshold to be tested to either the lowest or
+ * highest role, or the attempt to test with higher or lower role will throw an
+ * exception.
+ */
+public class PropertyRestrictionBeanImplTest extends AbstractTestClass {
+	private static final String NS_PROHIBITED = "http://prbi.prohibited/";
+	private static final String URI_RESOURCE_EXCEPTIONAL = NS_PROHIBITED
+			+ "exceptionalResource";
+	private static final String URI_PREDICATE_EXCEPTIONAL = NS_PROHIBITED
+			+ "exceptionalPredicate";
+
+	private static final List<String> PROHIBITED_NAMESPACES = Arrays
+			.asList(new String[] { NS_PROHIBITED });
+	private static final List<String> PERMITTED_EXCEPTIONS = Arrays
+			.asList(new String[] { URI_RESOURCE_EXCEPTIONAL,
+					URI_PREDICATE_EXCEPTIONAL });
+
+	private static final String URI_RESOURCE_ANY = "http://prbi.test/anyResource";
+	private static final String URI_RESOURCE_PROHIBITED = NS_PROHIBITED
+			+ "resource";
+
+	private static final String URI_PREDICATE_BARE = "http://prbi.test/barePredicate";
+	private static final String URI_PREDICATE_PROHIBITED = NS_PROHIBITED
+			+ "predicate";
+	private static final String URI_PREDICATE_UNKNOWN = "http://prbi.test/unknownPredicate";
+
+	private static final String URI_DOMAIN_1 = "http://prbi.test/domain1";
+	private static final String URI_RANGE_1 = "http://prbi.test/range1";
+	private static final String URI_DOMAIN_2 = "http://prbi.test/domain2";
+	private static final String URI_RANGE_2 = "http://prbi.test/range2";
+
+	private PropertyRestrictionBeanImpl bean;
+
+	private ObjectProperty barePredicate;
+	private ObjectProperty prohibitedPredicate;
+	private ObjectProperty exceptionalPredicate;
+	private ObjectProperty unknownPredicate;
+
+	private FauxProperty emptyFaux;
+	private FauxProperty restrictedFaux;
+	private FauxProperty unknownFaux;
+
+	@Before
+	public void setup() {
+		barePredicate = createObjectProperty(null, URI_PREDICATE_BARE, null,
+				EDITOR, CURATOR, DB_ADMIN);
+		unknownPredicate = createObjectProperty(null, URI_PREDICATE_UNKNOWN,
+				null, null, null, null);
+		prohibitedPredicate = createObjectProperty(null,
+				URI_PREDICATE_PROHIBITED, null, null, null, null);
+		exceptionalPredicate = createObjectProperty(null,
+				URI_PREDICATE_EXCEPTIONAL, null, CURATOR, EDITOR, EDITOR);
+
+		emptyFaux = createFauxProperty(URI_DOMAIN_1, URI_PREDICATE_BARE,
+				URI_RANGE_1, null, null, null);
+		restrictedFaux = createFauxProperty(URI_DOMAIN_2, URI_PREDICATE_BARE,
+				URI_RANGE_2, EDITOR, DB_ADMIN, CURATOR);
+		unknownFaux = createFauxProperty(URI_DOMAIN_1, URI_PREDICATE_UNKNOWN,
+				URI_RANGE_1, NOBODY, NOBODY, NOBODY);
+
+		ObjectPropertyDaoStub opDao = new ObjectPropertyDaoStub();
+		opDao.addObjectProperty(barePredicate);
+		opDao.addObjectProperty(prohibitedPredicate);
+		opDao.addObjectProperty(exceptionalPredicate);
+
+		DataPropertyDaoStub dpDao = new DataPropertyDaoStub();
+
+		FauxPropertyDaoStub fpDao = new FauxPropertyDaoStub();
+		fpDao.insertFauxProperty(emptyFaux);
+		fpDao.insertFauxProperty(restrictedFaux);
+
+		WebappDaoFactoryStub wadf = new WebappDaoFactoryStub();
+		wadf.setObjectPropertyDao(opDao);
+		wadf.setDataPropertyDao(dpDao);
+		wadf.setFauxPropertyDao(fpDao);
+
+		ContextModelAccessStub models = new ContextModelAccessStub();
+		models.setWebappDaoFactory(wadf);
+
+		bean = new PropertyRestrictionBeanImpl(PROHIBITED_NAMESPACES,
+				PERMITTED_EXCEPTIONS, models);
+	}
+
+	private ObjectProperty createObjectProperty(String domainUri, String uri,
+			String rangeUri, RoleLevel displayThreshold,
+			RoleLevel modifyThreshold, RoleLevel publishThreshold) {
+		ObjectProperty op = new ObjectProperty();
+		op.setURI(uri);
+		op.setDomainVClassURI(domainUri);
+		op.setRangeVClassURI(rangeUri);
+		op.setHiddenFromDisplayBelowRoleLevel(displayThreshold);
+		op.setProhibitedFromUpdateBelowRoleLevel(modifyThreshold);
+		op.setHiddenFromPublishBelowRoleLevel(publishThreshold);
+		return op;
+	}
+
+	private FauxProperty createFauxProperty(String domainUri, String uri,
+			String rangeUri, RoleLevel displayThreshold,
+			RoleLevel modifyThreshold, RoleLevel publishThreshold) {
+		FauxProperty fp = new FauxProperty(domainUri, uri, rangeUri);
+		fp.setHiddenFromDisplayBelowRoleLevel(displayThreshold);
+		fp.setProhibitedFromUpdateBelowRoleLevel(modifyThreshold);
+		fp.setHiddenFromPublishBelowRoleLevel(publishThreshold);
+		return fp;
+	}
+
+	// ----------------------------------------------------------------------
+	// Resources
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void nullResource_display_false() {
+		assertFalse(bean.canDisplayResource(null, highestRole()));
+	}
+
+	@Test
+	public void anyResource_display_true() {
+		assertTrue(bean.canDisplayResource(URI_RESOURCE_ANY, lowestRole()));
+	}
+
+	@Test
+	public void anyResource_nullUserRole_display_false() {
+		assertFalse(bean.canDisplayResource(URI_RESOURCE_ANY, null));
+	}
+
+	@Test
+	public void nullResource_modify_false() {
+		assertFalse(bean.canModifyResource(null, highestRole()));
+	}
+
+	@Test
+	public void prohibitedResource_modify_false() {
+		assertFalse(bean.canModifyResource(URI_RESOURCE_PROHIBITED,
+				highestRole()));
+	}
+
+	@Test
+	public void exceptionalResource_modify_true() {
+		assertTrue(bean.canModifyResource(URI_RESOURCE_EXCEPTIONAL,
+				lowestRole()));
+	}
+
+	@Test
+	public void unremarkableResource_modify_true() {
+		assertTrue(bean.canModifyResource(URI_RESOURCE_ANY, lowestRole()));
+	}
+
+	@Test
+	public void unremarkableResource_nullUserRole_modify_false() {
+		assertFalse(bean.canModifyResource(URI_RESOURCE_ANY, null));
+	}
+
+	@Test
+	public void nullResource_publish_false() {
+		assertFalse(bean.canPublishResource(null, highestRole()));
+	}
+
+	@Test
+	public void anyResource_publish_true() {
+		assertTrue(bean.canPublishResource(URI_RESOURCE_ANY, lowestRole()));
+	}
+
+	@Test
+	public void anyResource_nullUserRole_publish_false() {
+		assertFalse(bean.canPublishResource(URI_RESOURCE_ANY, null));
+	}
+
+	// ----------------------------------------------------------------------
+	// Predicates
+	// ----------------------------------------------------------------------
+
+	// ----- display
+
+	@Test
+	public void nullPredicate_display_false() {
+		assertFalse(bean.canDisplayPredicate(null, highestRole()));
+	}
+
+	@Test
+	public void barePredicate_display_byRole() {
+		assertTrue(bean.canDisplayPredicate(barePredicate,
+				higherRole(barePredicate, DISPLAY)));
+		assertTrue(bean.canDisplayPredicate(barePredicate,
+				sameRole(barePredicate, DISPLAY)));
+		assertFalse(bean.canDisplayPredicate(barePredicate,
+				lowerRole(barePredicate, DISPLAY)));
+	}
+
+	@Test
+	public void unknownBarePredicate_display_true() {
+		assertTrue(bean.canDisplayPredicate(unknownPredicate, lowestRole()));
+	}
+
+	@Test
+	public void emptyQualifiedPredicate_display_byBareRole() {
+		assertTrue(bean.canDisplayPredicate(asProperty(emptyFaux),
+				higherRole(barePredicate, DISPLAY)));
+		assertTrue(bean.canDisplayPredicate(asProperty(emptyFaux),
+				sameRole(barePredicate, DISPLAY)));
+		assertFalse(bean.canDisplayPredicate(asProperty(emptyFaux),
+				lowerRole(barePredicate, DISPLAY)));
+	}
+
+	@Test
+	public void restrictedQualifiedPredicate_display_byRole() {
+		assertTrue(bean.canDisplayPredicate(asProperty(restrictedFaux),
+				higherRole(restrictedFaux, DISPLAY)));
+		assertTrue(bean.canDisplayPredicate(asProperty(restrictedFaux),
+				sameRole(restrictedFaux, DISPLAY)));
+		assertFalse(bean.canDisplayPredicate(asProperty(restrictedFaux),
+				lowerRole(restrictedFaux, DISPLAY)));
+	}
+
+	@Test
+	public void unknownQualifiedPredicate_display_true() {
+		assertTrue(bean.canDisplayPredicate(asProperty(unknownFaux),
+				lowestRole()));
+	}
+
+	// ----- modify
+
+	@Test
+	public void nullPredicate_modify_false() {
+		assertFalse(bean.canModifyPredicate(null, highestRole()));
+	}
+
+	@Test
+	public void prohibitedPredicate_modify_false() {
+		assertFalse(bean.canModifyPredicate(prohibitedPredicate, lowestRole()));
+	}
+
+	@Test
+	public void exceptionalPredicate_modify_byRole() {
+		assertTrue(bean.canModifyPredicate(exceptionalPredicate,
+				higherRole(exceptionalPredicate, MODIFY)));
+		assertTrue(bean.canModifyPredicate(exceptionalPredicate,
+				sameRole(exceptionalPredicate, MODIFY)));
+		assertFalse(bean.canModifyPredicate(exceptionalPredicate,
+				lowerRole(exceptionalPredicate, MODIFY)));
+	}
+
+	@Test
+	public void barePredicate_modify_byRole() {
+		assertTrue(bean.canModifyPredicate(barePredicate,
+				higherRole(barePredicate, MODIFY)));
+		assertTrue(bean.canModifyPredicate(barePredicate,
+				sameRole(barePredicate, MODIFY)));
+		assertFalse(bean.canModifyPredicate(barePredicate,
+				lowerRole(barePredicate, MODIFY)));
+	}
+
+	@Test
+	public void unknownBarePredicate_modify_true() {
+		assertTrue(bean.canModifyPredicate(unknownPredicate, lowestRole()));
+	}
+
+	@Test
+	public void emptyQualifiedPredicate_modify_byBareRole() {
+		assertTrue(bean.canModifyPredicate(asProperty(emptyFaux),
+				higherRole(barePredicate, MODIFY)));
+		assertTrue(bean.canModifyPredicate(asProperty(emptyFaux),
+				sameRole(barePredicate, MODIFY)));
+		assertFalse(bean.canModifyPredicate(asProperty(emptyFaux),
+				lowerRole(barePredicate, MODIFY)));
+	}
+
+	@Test
+	public void restrictedQualifiedPredicate_modify_byRole() {
+		assertTrue(bean.canModifyPredicate(asProperty(restrictedFaux),
+				higherRole(restrictedFaux, MODIFY)));
+		assertTrue(bean.canModifyPredicate(asProperty(restrictedFaux),
+				sameRole(restrictedFaux, MODIFY)));
+		assertFalse(bean.canModifyPredicate(asProperty(restrictedFaux),
+				lowerRole(restrictedFaux, MODIFY)));
+	}
+
+	@Test
+	public void unknownQualifiedPredicate_modify_true() {
+		assertTrue(bean.canModifyPredicate(asProperty(unknownFaux),
+				lowestRole()));
+	}
+
+	// ----- publish
+
+	@Test
+	public void nullPredicate_publish_false() {
+		assertFalse(bean.canPublishPredicate(null, highestRole()));
+	}
+
+	@Test
+	public void barePredicate_publish_byRole() {
+		assertTrue(bean.canPublishPredicate(barePredicate,
+				higherRole(barePredicate, PUBLISH)));
+		assertTrue(bean.canPublishPredicate(barePredicate,
+				sameRole(barePredicate, PUBLISH)));
+		assertFalse(bean.canPublishPredicate(barePredicate,
+				lowerRole(barePredicate, PUBLISH)));
+	}
+
+	@Test
+	public void unknownBarePredicate_publish_true() {
+		assertTrue(bean.canPublishPredicate(unknownPredicate, lowestRole()));
+	}
+
+	@Test
+	public void emptyQualifiedPredicate_publish_byBareRole() {
+		assertTrue(bean.canPublishPredicate(asProperty(emptyFaux),
+				higherRole(barePredicate, PUBLISH)));
+		assertTrue(bean.canPublishPredicate(asProperty(emptyFaux),
+				sameRole(barePredicate, PUBLISH)));
+		assertFalse(bean.canPublishPredicate(asProperty(emptyFaux),
+				lowerRole(barePredicate, PUBLISH)));
+	}
+
+	@Test
+	public void restrictedQualifiedPredicate_publish_byRole() {
+		assertTrue(bean.canPublishPredicate(asProperty(restrictedFaux),
+				higherRole(restrictedFaux, PUBLISH)));
+		assertTrue(bean.canPublishPredicate(asProperty(restrictedFaux),
+				sameRole(restrictedFaux, PUBLISH)));
+		assertFalse(bean.canPublishPredicate(asProperty(restrictedFaux),
+				lowerRole(restrictedFaux, PUBLISH)));
+	}
+
+	@Test
+	public void unknownQualifiedPredicate_publish_true() {
+		assertTrue(bean.canPublishPredicate(asProperty(unknownFaux),
+				lowestRole()));
+	}
+
+	// ----------------------------------------------------------------------
+	// update permissions
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void updateToAllowDisplay() {
+		RoleLevel desiredDisplayLevel = lowerRole(barePredicate, DISPLAY);
+
+		assertFalse(bean
+				.canDisplayPredicate(barePredicate, desiredDisplayLevel));
+
+		bean.updateProperty(updatedLevels(barePredicate, desiredDisplayLevel,
+				sameRole(barePredicate, MODIFY),
+				sameRole(barePredicate, PUBLISH)));
+
+		assertTrue(bean.canDisplayPredicate(barePredicate, desiredDisplayLevel));
+	}
+
+	@Test
+	public void updateToAllowModify() {
+		RoleLevel desiredModifyLevel = lowerRole(barePredicate, MODIFY);
+
+		assertFalse(bean.canModifyPredicate(barePredicate, desiredModifyLevel));
+
+		bean.updateProperty(updatedLevels(barePredicate,
+				sameRole(barePredicate, DISPLAY), desiredModifyLevel,
+				sameRole(barePredicate, PUBLISH)));
+
+		assertTrue(bean.canModifyPredicate(barePredicate, desiredModifyLevel));
+	}
+
+	@Test
+	public void updateToAllowPublish() {
+		RoleLevel desiredPublishLevel = lowerRole(barePredicate, PUBLISH);
+
+		assertFalse(bean
+				.canPublishPredicate(barePredicate, desiredPublishLevel));
+
+		bean.updateProperty(updatedLevels(barePredicate,
+				sameRole(barePredicate, DISPLAY),
+				sameRole(barePredicate, MODIFY), desiredPublishLevel));
+
+		assertTrue(bean.canPublishPredicate(barePredicate, desiredPublishLevel));
+	}
+
+	@Test
+	public void updateToDisallowDisplay() {
+		RoleLevel desiredDisplayLevel = sameRole(barePredicate, DISPLAY);
+
+		assertTrue(bean.canDisplayPredicate(barePredicate, desiredDisplayLevel));
+
+		bean.updateProperty(updatedLevels(barePredicate,
+				higherRole(barePredicate, DISPLAY),
+				sameRole(barePredicate, MODIFY),
+				sameRole(barePredicate, PUBLISH)));
+
+		assertFalse(bean
+				.canDisplayPredicate(barePredicate, desiredDisplayLevel));
+	}
+
+	@Test
+	public void updateToDisallowModify() {
+		RoleLevel desiredModifyLevel = sameRole(barePredicate, MODIFY);
+
+		assertTrue(bean.canModifyPredicate(barePredicate, desiredModifyLevel));
+
+		bean.updateProperty(updatedLevels(barePredicate,
+				sameRole(barePredicate, DISPLAY),
+				higherRole(barePredicate, MODIFY),
+				sameRole(barePredicate, PUBLISH)));
+
+		assertFalse(bean.canModifyPredicate(barePredicate, desiredModifyLevel));
+	}
+
+	@Test
+	public void updateToDisallowPublish() {
+		RoleLevel desiredPublishLevel = sameRole(barePredicate, PUBLISH);
+
+		assertTrue(bean.canPublishPredicate(barePredicate, desiredPublishLevel));
+
+		bean.updateProperty(updatedLevels(barePredicate,
+				sameRole(barePredicate, DISPLAY),
+				sameRole(barePredicate, MODIFY),
+				higherRole(barePredicate, PUBLISH)));
+
+		assertFalse(bean
+				.canPublishPredicate(barePredicate, desiredPublishLevel));
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper methods
+	// ----------------------------------------------------------------------
+
+	private RoleLevel lowestRole() {
+		return RoleLevel.values()[0];
+	}
+
+	private RoleLevel highestRole() {
+		RoleLevel[] values = RoleLevel.values();
+		return values[values.length - 1];
+	}
+
+	private RoleLevel sameRole(RoleRestrictedProperty p, Which which) {
+		switch (which) {
+		case DISPLAY:
+			return p.getHiddenFromDisplayBelowRoleLevel();
+		case MODIFY:
+			return p.getProhibitedFromUpdateBelowRoleLevel();
+		default: // PUBLISH
+			return p.getHiddenFromPublishBelowRoleLevel();
+		}
+	}
+
+	private RoleLevel lowerRole(RoleRestrictedProperty p, Which which) {
+		return RoleLevel.values()[sameRole(p, which).ordinal() - 1];
+	}
+
+	private RoleLevel higherRole(RoleRestrictedProperty p, Which which) {
+		return RoleLevel.values()[sameRole(p, which).ordinal() + 1];
+	}
+
+	private Property asProperty(FauxProperty fp) {
+		Property p = new Property();
+		p.setURI(fp.getBaseURI());
+		p.setDomainVClassURI(fp.getDomainURI());
+		p.setRangeVClassURI(fp.getRangeURI());
+		return p;
+	}
+
+	private PropertyRestrictionLevels updatedLevels(RoleRestrictedProperty p,
+			RoleLevel displayLevel, RoleLevel modifyLevel,
+			RoleLevel publishLevel) {
+		return new PropertyRestrictionLevels(new FullPropertyKey(p),
+				displayLevel, modifyLevel, publishLevel);
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelperTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelperTest.java
deleted file mode 100644
index 0ad53df91..000000000
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelperTest.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
-
-import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.CURATOR;
-import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.DB_ADMIN;
-import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.EDITOR;
-import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.NOBODY;
-import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.PUBLIC;
-import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.SELF;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean;
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
-import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao.FullPropertyKey;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-
-/**
- * Check that the bean gets built properly, and check that the bean works
- * properly.
- */
-public class PropertyRestrictionPolicyHelperTest extends AbstractTestClass {
-	private static final Log log = LogFactory
-			.getLog(PropertyRestrictionPolicyHelperTest.class);
-
-	private static final String PROPERTY_DISPLAY_THRESHOLD = VitroVocabulary.HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT;
-	private static final String PROPERTY_MODIFY_THRESHOLD = VitroVocabulary.PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT;
-	private static final String PROPERTY_PUBLISH_THRESHOLD = VitroVocabulary.HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT;
-
-	private static final String[] PROHIBITED_NAMESPACES = new String[] {
-			VitroVocabulary.vitroURI, "" };
-
-	private static final String[] PERMITTED_EXCEPTIONS = new String[] { VitroVocabulary.MONIKER };
-
-	private OntModel ontModel;
-	private ModelWrapper wrapper;
-	private PropertyRestrictionPolicyHelper bean;
-
-	@Before
-	public void setLoggingLevel() {
-		// setLoggerLevel(PropertyRestrictionPolicyHelper.class, Level.DEBUG);
-	}
-
-	private FullPropertyKey key(String predicateURI) {
-		return new FullPropertyKey(predicateURI);
-	}
-
-	@Before
-	public void createTheBean() {
-		Map<FullPropertyKey, RoleLevel> displayLevels = new HashMap<>();
-		displayLevels.put(key("http://predicates#display_curator"), CURATOR);
-		displayLevels.put(key("http://predicates#display_hidden"), NOBODY);
-
-		Map<FullPropertyKey, RoleLevel> modifyLevels = new HashMap<>();
-		modifyLevels.put(key("http://predicates#modify_self"), SELF);
-		modifyLevels.put(key("http://predicates#modify_curator"), CURATOR);
-		modifyLevels.put(key("http://predicates#modify_hidden"), NOBODY);
-
-		Map<FullPropertyKey, RoleLevel> publishLevels = new HashMap<>();
-		publishLevels.put(key("http://predicates#publish_curator"), CURATOR);
-		publishLevels.put(key("http://predicates#publish_hidden"), NOBODY);
-
-		bean = new PropertyRestrictionPolicyHelper(
-				Arrays.asList(PROHIBITED_NAMESPACES),
-				Arrays.asList(PERMITTED_EXCEPTIONS), displayLevels,
-				modifyLevels, publishLevels);
-	}
-
-	@Before
-	public void createTheModel() {
-		ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
-
-		wrapper = new ModelWrapper(ontModel);
-
-		wrapper.add("http://thresholds#display_public",
-				PROPERTY_DISPLAY_THRESHOLD, PUBLIC.getURI());
-		wrapper.add("http://thresholds#display_hidden",
-				PROPERTY_DISPLAY_THRESHOLD, NOBODY.getURI());
-
-		wrapper.add("http://thresholds#modify_editor",
-				PROPERTY_MODIFY_THRESHOLD, EDITOR.getURI());
-		wrapper.add("http://thresholds#modify_curator",
-				PROPERTY_MODIFY_THRESHOLD, CURATOR.getURI());
-
-		wrapper.add("http://thresholds#publish_public",
-				PROPERTY_PUBLISH_THRESHOLD, PUBLIC.getURI());
-		wrapper.add("http://thresholds#publish_hidden",
-				PROPERTY_PUBLISH_THRESHOLD, NOBODY.getURI());
-	}
-
-	// ----------------------------------------------------------------------
-	// test the bean
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void displayResource() {
-		assertEquals("display a random resource", true,
-				bean.canDisplayResource("http://someRandom#string", null));
-	}
-
-	@Test
-	public void modifyResourceNoRestriction() {
-		assertEquals("modify a random resource", true,
-				bean.canModifyResource("http://someRandom#string", null));
-	}
-
-	@Test
-	public void modifyResourceProhibitedNamespace() {
-		assertEquals("modify a prohibited resource", false,
-				bean.canModifyResource(PROHIBITED_NAMESPACES[0] + "random",
-						null));
-	}
-
-	@Test
-	public void publishResource() {
-		assertEquals("publish a random resource", true,
-				bean.canPublishResource("http://someRandom#string", null));
-	}
-
-	@Test
-	public void modifyResourcePermittedException() {
-		assertEquals("modify a exception resource", true,
-				bean.canModifyResource(PERMITTED_EXCEPTIONS[0], null));
-	}
-
-	@Test
-	public void displayPredicateNoRestriction() {
-		assertEquals("displayPredicate: open", true, bean.canDisplayPredicate(
-				createVitroProperty("http://predicates#open"), PUBLIC));
-	}
-
-	@Test
-	public void displayPredicateRestrictionLower() {
-		assertEquals("displayPredicate: lower restriction", true,
-				bean.canDisplayPredicate(
-						createVitroProperty("http://predicates#display_self"),
-						CURATOR));
-	}
-
-	@Test
-	public void displayPredicateRestrictionEqual() {
-		assertEquals(
-				"displayPredicate: equal restriction",
-				true,
-				bean.canDisplayPredicate(
-						createVitroProperty("http://predicates#display_curator"),
-						CURATOR));
-	}
-
-	@Test
-	public void displayPredicateRestrictionHigher() {
-		assertEquals(
-				"displayPredicate: higher restriction",
-				false,
-				bean.canDisplayPredicate(
-						createVitroProperty("http://predicates#display_hidden"),
-						CURATOR));
-	}
-
-	@Test
-	public void modifyPredicateNoRestriction() {
-		assertEquals("modifyPredicate: open", true, bean.canModifyPredicate(
-				new edu.cornell.mannlib.vitro.webapp.beans.Property(
-						"http://predicates#open"), PUBLIC));
-	}
-
-	@Test
-	public void modifyPredicateRestrictionLower() {
-		assertEquals("modifyPredicate: lower restriction", true,
-				bean.canModifyPredicate(
-						new edu.cornell.mannlib.vitro.webapp.beans.Property(
-								"http://predicates#modify_self"), CURATOR));
-	}
-
-	@Test
-	public void modifyPredicateRestrictionEqual() {
-		assertEquals("modifyPredicate: equal restriction", true,
-				bean.canModifyPredicate(
-						new edu.cornell.mannlib.vitro.webapp.beans.Property(
-								"http://predicates#modify_curator"), CURATOR));
-	}
-
-	@Test
-	public void modifyPredicateRestrictionHigher() {
-		assertEquals("modifyPredicate: higher restriction", false,
-				bean.canModifyPredicate(
-						new edu.cornell.mannlib.vitro.webapp.beans.Property(
-								"http://predicates#modify_hidden"), CURATOR));
-	}
-
-	@Test
-	public void modifyPredicateProhibitedNamespace() {
-		assertEquals(
-				"modifyPredicate: prohibited namespace",
-				false,
-				bean.canModifyPredicate(
-						new edu.cornell.mannlib.vitro.webapp.beans.Property(
-								PROHIBITED_NAMESPACES[0] + "randoom"), DB_ADMIN));
-	}
-
-	@Test
-	public void modifyPredicatePermittedException() {
-		assertEquals("modifyPredicate: permitted exception", true,
-				bean.canModifyPredicate(
-						new edu.cornell.mannlib.vitro.webapp.beans.Property(
-								PERMITTED_EXCEPTIONS[0]), DB_ADMIN));
-	}
-
-	@Test
-	public void publishPredicateNoRestriction() {
-		assertEquals("publishPredicate: open", true, bean.canPublishPredicate(
-				createVitroProperty("http://predicates#open"), PUBLIC));
-	}
-
-	@Test
-	public void publishPredicateRestrictionLower() {
-		assertEquals("publishPredicate: lower restriction", true,
-				bean.canPublishPredicate(
-						createVitroProperty("http://predicates#publish_self"),
-						CURATOR));
-	}
-
-	@Test
-	public void publishPredicateRestrictionEqual() {
-		assertEquals(
-				"publishPredicate: equal restriction",
-				true,
-				bean.canPublishPredicate(
-						createVitroProperty("http://predicates#publish_curator"),
-						CURATOR));
-	}
-
-	@Test
-	public void publishPredicateRestrictionHigher() {
-		assertEquals(
-				"publishPredicate: higher restriction",
-				false,
-				bean.canPublishPredicate(
-						createVitroProperty("http://predicates#publish_hidden"),
-						CURATOR));
-	}
-
-	// ----------------------------------------------------------------------
-	// test the bean builder
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void buildDisplayThresholds() {
-		Map<FullPropertyKey, BaseResourceBean.RoleLevel> expectedMap = new HashMap<>();
-		expectedMap.put(key("http://thresholds#display_public"), PUBLIC);
-		expectedMap.put(key("http://thresholds#display_hidden"), NOBODY);
-
-		Map<String, RoleLevel> actualMap = populateThresholdMap(PROPERTY_DISPLAY_THRESHOLD);
-		assertEquals("display thresholds", expectedMap, actualMap);
-	}
-
-	@Test
-	public void buildModifyThresholds() {
-		Map<FullPropertyKey, BaseResourceBean.RoleLevel> expectedMap = new HashMap<>();
-		expectedMap.put(key("http://thresholds#modify_editor"), EDITOR);
-		expectedMap.put(key("http://thresholds#modify_curator"), CURATOR);
-
-		Map<String, RoleLevel> actualMap = populateThresholdMap(PROPERTY_MODIFY_THRESHOLD);
-		assertEquals("modify thresholds", expectedMap, actualMap);
-	}
-
-	@Test
-	public void buildPublishThresholds() {
-		Map<FullPropertyKey, BaseResourceBean.RoleLevel> expectedMap = new HashMap<>();
-		expectedMap.put(key("http://thresholds#publish_public"), PUBLIC);
-		expectedMap.put(key("http://thresholds#publish_hidden"), NOBODY);
-
-		Map<String, RoleLevel> actualMap = populateThresholdMap(PROPERTY_PUBLISH_THRESHOLD);
-		assertEquals("publish thresholds", expectedMap, actualMap);
-	}
-
-	/** Invoke the private static method "populateThresholdMap" */
-	private Map<String, RoleLevel> populateThresholdMap(String propertyUri) {
-		Map<String, RoleLevel> map = new HashMap<String, BaseResourceBean.RoleLevel>();
-		try {
-			Class<?> clazz = PropertyRestrictionPolicyHelper.class;
-			Method method = clazz.getDeclaredMethod("populateThresholdMap",
-					OntModel.class, Map.class, String.class);
-			method.setAccessible(true);
-			method.invoke(null, ontModel, map, propertyUri);
-			return map;
-		} catch (Exception e) {
-			fail("failed to populate the map: propertyUri='" + propertyUri
-					+ "', " + e);
-			return null;
-		}
-	}
-
-	private static class ModelWrapper {
-		private final OntModel model;
-
-		public ModelWrapper(OntModel model) {
-			this.model = model;
-		}
-
-		public void add(String subjectUri, String propertyUri, String objectUri) {
-			Resource subject = model.getResource(subjectUri);
-			Property property = model.getProperty(propertyUri);
-			Resource object = model.getResource(objectUri);
-			model.add(subject, property, object);
-		}
-	}
-
-	private edu.cornell.mannlib.vitro.webapp.beans.Property createVitroProperty(
-			String propertyURI) {
-		return new edu.cornell.mannlib.vitro.webapp.beans.Property(propertyURI);
-	}
-}
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanStub.java
new file mode 100644
index 000000000..033056cd5
--- /dev/null
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanStub.java
@@ -0,0 +1,122 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.hp.hpl.jena.rdf.model.impl.Util;
+
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBean;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionLevels;
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+import edu.cornell.mannlib.vitro.webapp.beans.Property;
+
+/**
+ * Allow the unit test to specify a variety of restrictions
+ */
+public class PropertyRestrictionBeanStub extends PropertyRestrictionBean {
+
+	// ----------------------------------------------------------------------
+	// Stub infrastructure
+	// ----------------------------------------------------------------------
+
+	/** Don't prohibit or restrict anything. */
+	public static PropertyRestrictionBean getInstance() {
+		return getInstance(null, null);
+	}
+
+	/** Prohibit some namespaces. */
+	public static PropertyRestrictionBeanStub getInstance(
+			String[] restrictedNamespaces) {
+		return getInstance(restrictedNamespaces, null);
+	}
+
+	/**
+	 * Prohibit some namespaces and restrict some properties from modification
+	 * by anybody. They may still be displayed or published.
+	 * 
+	 * We can implement more granular control if we need it.
+	 */
+	public static PropertyRestrictionBeanStub getInstance(
+			String[] restrictedNamespaces, String[] restrictedProperties) {
+		PropertyRestrictionBeanStub stub = new PropertyRestrictionBeanStub(
+				restrictedNamespaces, restrictedProperties);
+		PropertyRestrictionBean.instance = stub;
+		return stub;
+	}
+
+	private final Set<String> restrictedNamespaces;
+	private final Set<String> restrictedProperties;
+
+	private PropertyRestrictionBeanStub(String[] restrictedNamespaces,
+			String[] restrictedProperties) {
+		this.restrictedNamespaces = (restrictedNamespaces == null) ? Collections
+				.<String> emptySet() : new HashSet<>(
+				Arrays.asList(restrictedNamespaces));
+		this.restrictedProperties = (restrictedProperties == null) ? Collections
+				.<String> emptySet() : new HashSet<>(
+				Arrays.asList(restrictedProperties));
+	}
+
+	private boolean isPermittedNamespace(String uri) {
+		return !restrictedNamespaces.contains(namespace(uri));
+	}
+
+	private String namespace(String uri) {
+		return uri.substring(0, Util.splitNamespace(uri));
+	}
+
+	private boolean isPermittedProperty(String uri) {
+		return !restrictedProperties.contains(uri);
+	}
+
+	// ----------------------------------------------------------------------
+	// Stub methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public boolean canDisplayResource(String resourceUri, RoleLevel userRole) {
+		return isPermittedNamespace(resourceUri);
+	}
+
+	@Override
+	public boolean canModifyResource(String resourceUri, RoleLevel userRole) {
+		return isPermittedNamespace(resourceUri)
+				&& isPermittedProperty(resourceUri);
+	}
+
+	@Override
+	public boolean canPublishResource(String resourceUri, RoleLevel userRole) {
+		return isPermittedNamespace(resourceUri);
+	}
+
+	@Override
+	public boolean canDisplayPredicate(Property predicate, RoleLevel userRole) {
+		return isPermittedNamespace(predicate.getURI());
+	}
+
+	@Override
+	public boolean canModifyPredicate(Property predicate, RoleLevel userRole) {
+		return isPermittedNamespace(predicate.getURI())
+				&& isPermittedProperty(predicate.getURI());
+	}
+
+	@Override
+	public boolean canPublishPredicate(Property predicate, RoleLevel userRole) {
+		return isPermittedNamespace(predicate.getURI());
+	}
+
+	// ----------------------------------------------------------------------
+	// Un-implemented methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public void updateProperty(PropertyRestrictionLevels levels) {
+		throw new RuntimeException(
+				"PropertyRestrictionBeanStub.updateProperty() not implemented.");
+	}
+
+}
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelperStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelperStub.java
deleted file mode 100644
index 5c98a2909..000000000
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelperStub.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
-import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao.FullPropertyKey;
-
-/**
- * Allow the unit test to specify a variety of restrictions
- */
-public class PropertyRestrictionPolicyHelperStub extends
-		PropertyRestrictionPolicyHelper {
-
-	/** Don't prohibit or restrict anything. */
-	public static PropertyRestrictionPolicyHelper getInstance() {
-		return getInstance(null, null);
-	}
-
-	/** Prohibit some namespaces. */
-	public static PropertyRestrictionPolicyHelperStub getInstance(
-			String[] restrictedNamespaces) {
-		return getInstance(restrictedNamespaces, null);
-	}
-
-	/**
-	 * Prohibit some namespaces and restrict some properties from modification
-	 * by anybody.
-	 */
-	public static PropertyRestrictionPolicyHelperStub getInstance(
-			String[] restrictedNamespaces, String[] restrictedProperties) {
-		Set<String> namespaceSet = new HashSet<String>();
-		if (restrictedNamespaces != null) {
-			namespaceSet.addAll(Arrays.asList(restrictedNamespaces));
-		}
-
-		Map<FullPropertyKey, RoleLevel> thresholdMap = new HashMap<>();
-		if (restrictedProperties != null) {
-			for (String prop : restrictedProperties) {
-				thresholdMap.put(new FullPropertyKey(prop), RoleLevel.NOBODY);
-			}
-		}
-
-		return new PropertyRestrictionPolicyHelperStub(namespaceSet, null,
-				null, thresholdMap, null);
-	}
-
-	private PropertyRestrictionPolicyHelperStub(
-			Set<String> modifyRestrictedNamespaces,
-			Set<String> modifyPermittedExceptions,
-			Map<FullPropertyKey, RoleLevel> displayThresholds,
-			Map<FullPropertyKey, RoleLevel> modifyThresholds,
-			Map<FullPropertyKey, RoleLevel> publishThresholds) {
-		super(modifyRestrictedNamespaces, modifyPermittedExceptions,
-				displayThresholds, modifyThresholds, publishThresholds);
-	}
-}
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDaoStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDaoStub.java
index 5ad473575..e599d67c7 100644
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDaoStub.java
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDaoStub.java
@@ -2,6 +2,7 @@
 
 package stubs.edu.cornell.mannlib.vitro.webapp.dao;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -57,6 +58,11 @@ public class DataPropertyDaoStub implements DataPropertyDao {
 	// Stub methods
 	// ----------------------------------------------------------------------
 
+	@Override
+	public List<DataProperty> getAllDataProperties() {
+		return new ArrayList<>(dpMap.values());
+	}
+
 	@Override
 	public DataProperty getDataPropertyByURI(String dataPropertyURI) {
 		return dpMap.get(dataPropertyURI);
@@ -189,12 +195,6 @@ public class DataPropertyDaoStub implements DataPropertyDao {
 				"PropertyDao.getClassesWithRestrictionOnProperty() not implemented.");
 	}
 
-	@Override
-	public List getAllDataProperties() {
-		throw new RuntimeException(
-				"DataPropertyDao.getAllDataProperties() not implemented.");
-	}
-
 	@Override
 	public List getAllExternalIdDataProperties() {
 		throw new RuntimeException(
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDaoStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDaoStub.java
index 4c0321b0b..8be971cde 100644
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDaoStub.java
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDaoStub.java
@@ -2,9 +2,11 @@
 
 package stubs.edu.cornell.mannlib.vitro.webapp.dao;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
 import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
@@ -19,7 +21,7 @@ public class FauxPropertyDaoStub implements FauxPropertyDao {
 	// ----------------------------------------------------------------------
 
 	private final Map<FullPropertyKey, FauxProperty> props = new HashMap<>();
-	
+
 	// ----------------------------------------------------------------------
 	// Stub methods
 	// ----------------------------------------------------------------------
@@ -30,28 +32,32 @@ public class FauxPropertyDaoStub implements FauxPropertyDao {
 		return props.get(new FullPropertyKey(domainUri, baseUri, rangeUri));
 	}
 
+	@Override
+	public List<FauxProperty> getFauxPropertiesForBaseUri(String uri) {
+		List<FauxProperty> list = new ArrayList<>();
+		for (FauxProperty fp : props.values()) {
+			if (Objects.equals(fp.getBaseURI(), uri)) {
+				list.add(fp);
+			}
+		}
+		return list;
+	}
+
+	@Override
+	public void insertFauxProperty(FauxProperty fp) {
+		props.put(new FullPropertyKey(fp), fp);
+	}
+
 	// ----------------------------------------------------------------------
 	// Un-implemented methods
 	// ----------------------------------------------------------------------
 
-	@Override
-	public List<FauxProperty> getFauxPropertiesForBaseUri(String uri) {
-		throw new RuntimeException(
-				"FauxPropertyDaoStub.getFauxPropertiesForBaseUri() not implemented.");
-	}
-
 	@Override
 	public FauxProperty getFauxPropertyFromContextUri(String contextUri) {
 		throw new RuntimeException(
 				"FauxPropertyDaoStub.getFauxPropertyFromContextUri() not implemented.");
 	}
 
-	@Override
-	public void insertFauxProperty(FauxProperty fp) {
-		throw new RuntimeException(
-				"FauxPropertyDaoStub.insertFauxProperty() not implemented.");
-	}
-
 	@Override
 	public void updateFauxProperty(FauxProperty fp) {
 		throw new RuntimeException(
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java
index dacbdbc88..33c802dc5 100644
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java
@@ -2,6 +2,7 @@
 
 package stubs.edu.cornell.mannlib.vitro.webapp.dao;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,17 +41,18 @@ public class ObjectPropertyDaoStub implements ObjectPropertyDao {
 
 		opMap.put(uri, property);
 	}
-	
-	public void setCustomListViewConfigFileName(ObjectProperty property, String filename) {
+
+	public void setCustomListViewConfigFileName(ObjectProperty property,
+			String filename) {
 		if (property == null) {
 			throw new NullPointerException("property may not be null.");
 		}
-		
+
 		String uri = property.getURI();
 		if (uri == null) {
 			throw new NullPointerException("uri may not be null.");
 		}
-		
+
 		configFilesMap.put(uri, filename);
 	}
 
@@ -58,6 +60,11 @@ public class ObjectPropertyDaoStub implements ObjectPropertyDao {
 	// Stub methods
 	// ----------------------------------------------------------------------
 
+	@Override
+	public List<ObjectProperty> getAllObjectProperties() {
+		return new ArrayList<>(opMap.values());
+	}
+
 	@Override
 	public ObjectProperty getObjectPropertyByURI(String objectPropertyURI) {
 		if (objectPropertyURI == null) {
@@ -65,18 +72,18 @@ public class ObjectPropertyDaoStub implements ObjectPropertyDao {
 		}
 		return opMap.get(objectPropertyURI);
 	}
-	
-    @Override
-    public ObjectProperty getObjectPropertyByURIs(String objectPropertyURI, 
-            String domainURI, String rangeURI) {
-        return getObjectPropertyByURI(objectPropertyURI);
-    }
-    
-    @Override
-    public ObjectProperty getObjectPropertyByURIs(String objectPropertyURI, 
-            String domainURI, String rangeURI, ObjectProperty base) {
-        return getObjectPropertyByURI(objectPropertyURI);
-    }
+
+	@Override
+	public ObjectProperty getObjectPropertyByURIs(String objectPropertyURI,
+			String domainURI, String rangeURI) {
+		return getObjectPropertyByURI(objectPropertyURI);
+	}
+
+	@Override
+	public ObjectProperty getObjectPropertyByURIs(String objectPropertyURI,
+			String domainURI, String rangeURI, ObjectProperty base) {
+		return getObjectPropertyByURI(objectPropertyURI);
+	}
 
 	@Override
 	public String getCustomListViewConfigFileName(ObjectProperty objectProperty) {
@@ -194,12 +201,6 @@ public class ObjectPropertyDaoStub implements ObjectPropertyDao {
 				"ObjectPropertyDaoStub.getClassesWithRestrictionOnProperty() not implemented.");
 	}
 
-	@Override
-	public List<ObjectProperty> getAllObjectProperties() {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.getAllObjectProperties() not implemented.");
-	}
-
 	@Override
 	public List<ObjectProperty> getObjectPropertiesForObjectPropertyStatements(
 			List objectPropertyStatements) {
diff --git a/webapp/web/WEB-INF/resources/startup_listeners.txt b/webapp/web/WEB-INF/resources/startup_listeners.txt
index 9c3fc7a42..ffbeff7a8 100644
--- a/webapp/web/WEB-INF/resources/startup_listeners.txt
+++ b/webapp/web/WEB-INF/resources/startup_listeners.txt
@@ -46,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
 

From 73b76a6e904296e43783bcc9d1e0e814bca647d6 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Thu, 11 Dec 2014 15:51:59 -0500
Subject: [PATCH 29/30] VIVO-933 Read PropertyConfig.n3 into an existing model,
 just once.

---
 .../migration/FauxPropertiesUpdater.java      | 112 ++++++++++++++++++
 .../webapp/migration/Release18Migrator.java   |  26 ++++
 .../WEB-INF/resources/startup_listeners.txt   |   1 +
 3 files changed, 139 insertions(+)
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/migration/FauxPropertiesUpdater.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/migration/Release18Migrator.java

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/migration/FauxPropertiesUpdater.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/migration/FauxPropertiesUpdater.java
new file mode 100644
index 000000000..f057adcc1
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/migration/FauxPropertiesUpdater.java
@@ -0,0 +1,112 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.migration;
+
+import static com.hp.hpl.jena.rdf.model.ResourceFactory.createPlainLiteral;
+import static com.hp.hpl.jena.rdf.model.ResourceFactory.createProperty;
+import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource;
+import static edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary.vitroURI;
+
+import java.io.FileInputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextListener;
+
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.Resource;
+
+import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames;
+import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection.LockableOntModel;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection.LockedOntModel;
+
+/**
+ * PropertyConfig.n3 has moved to rdf/display/firsttime, so it is only pulled in
+ * if the display model is empty.
+ * 
+ * Let's pull it in one time, anyway.
+ * 
+ * Check askUpdated.sparql for an example of how we know that it is necessary.
+ * Also check success.n3
+ * 
+ * If a special triple is not found in the display model, read the file from
+ * firsttime. If we can't find the file, warn
+ */
+public class FauxPropertiesUpdater {
+	private static final String[] PATH_TO_PROPERTY_CONFIG = { "rdf", "display",
+			"firsttime", "PropertyConfig.n3" };
+
+	private static final Resource DISPLAY_MODEL = createResource(ModelNames.DISPLAY);
+	private static final Property UPDATED_DISPLAY_MODEL = createProperty(vitroURI
+			+ "updatedDisplayModel");
+	private static final Literal VERSION_1_8 = createPlainLiteral("1.8");
+
+	private final ServletContextListener parent;
+	private final StartupStatus ss;
+	private final LockableOntModel lockableDisplayModel;
+
+	private Path propertyConfigPath;
+
+	public FauxPropertiesUpdater(ServletContext ctx,
+			ServletContextListener parent) {
+		this.parent = parent;
+		this.ss = StartupStatus.getBean(ctx);
+		this.lockableDisplayModel = new LockableOntModel(ModelAccess.on(ctx)
+				.getOntModel(ModelNames.DISPLAY));
+	}
+
+	public void migrate() {
+		if (!isAlreadyUpdated()) {
+			if (locateFile()) {
+				if (loadFile()) {
+					writeSuccess();
+				}
+			}
+		}
+	}
+
+	private boolean isAlreadyUpdated() {
+		try (LockedOntModel m = lockableDisplayModel.read()) {
+			return m.contains(DISPLAY_MODEL, UPDATED_DISPLAY_MODEL, VERSION_1_8);
+		}
+	}
+
+	private boolean locateFile() {
+		String homePath = ApplicationUtils.instance().getHomeDirectory()
+				.getPath().toString();
+		propertyConfigPath = Paths.get(homePath, PATH_TO_PROPERTY_CONFIG);
+		if (Files.exists(propertyConfigPath)) {
+			return true;
+		} else {
+			ss.warning(parent, "Could not find attributes "
+					+ "for faux properties at " + propertyConfigPath);
+			return false;
+		}
+	}
+
+	private boolean loadFile() {
+		try (LockedOntModel m = lockableDisplayModel.write()) {
+			m.read(new FileInputStream(propertyConfigPath.toFile()), null, "N3");
+			ss.info(parent, "Read " + propertyConfigPath
+					+ " into display model: "
+					+ "attributes for faux properties.");
+			return true;
+		} catch (Exception e) {
+			ss.warning(parent,
+					"Failed to read attributes for faux properties.", e);
+			return false;
+		}
+	}
+
+	private void writeSuccess() {
+		try (LockedOntModel m = lockableDisplayModel.write()) {
+			m.add(DISPLAY_MODEL, UPDATED_DISPLAY_MODEL, VERSION_1_8);
+		}
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/migration/Release18Migrator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/migration/Release18Migrator.java
new file mode 100644
index 000000000..7707fcaac
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/migration/Release18Migrator.java
@@ -0,0 +1,26 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.migration;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+/**
+ * Handle the tasks that move an installation from 1.7 to 1.8.
+ */
+public class Release18Migrator implements ServletContextListener {
+
+	@Override
+	public void contextInitialized(ServletContextEvent sce) {
+		ServletContext ctx = sce.getServletContext();
+
+		new FauxPropertiesUpdater(ctx, this).migrate();
+	}
+
+	@Override
+	public void contextDestroyed(ServletContextEvent sce) {
+		// Nothing to tear down.
+	}
+
+}
diff --git a/webapp/web/WEB-INF/resources/startup_listeners.txt b/webapp/web/WEB-INF/resources/startup_listeners.txt
index ffbeff7a8..0653ef5a5 100644
--- a/webapp/web/WEB-INF/resources/startup_listeners.txt
+++ b/webapp/web/WEB-INF/resources/startup_listeners.txt
@@ -38,6 +38,7 @@ edu.cornell.mannlib.vitro.webapp.application.ApplicationImpl$ReasonersSetup
 edu.cornell.mannlib.vitro.webapp.servlet.setup.SimpleReasonerSetup
 
 #edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase
+edu.cornell.mannlib.vitro.webapp.migration.Release18Migrator
 
 # Must run after JenaDataSourceSetup
 edu.cornell.mannlib.vitro.webapp.servlet.setup.ThemeInfoSetup

From f339f1864f7d42a77892cce54498473ad0e3889c Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Thu, 11 Dec 2014 16:12:42 -0500
Subject: [PATCH 30/30] VIVO-863 get rid of GuardAgainstUnmigratedRDB

It was only useful for the transition from 1.6 to 1.7, and it was a problem when someone used a triple-store other than SDB.
---
 .../setup/GuardAgainstUnmigratedRDB.java      | 117 ------------------
 .../WEB-INF/resources/startup_listeners.txt   |   3 -
 2 files changed, 120 deletions(-)
 delete mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/GuardAgainstUnmigratedRDB.java

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/GuardAgainstUnmigratedRDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/GuardAgainstUnmigratedRDB.java
deleted file mode 100644
index 258d9e9fa..000000000
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/GuardAgainstUnmigratedRDB.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.servlet.setup;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Properties;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
-import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
-
-/**
- * If there are RDB tables in the database that have not been converted to TDB,
- * throw an error.
- * 
- * The ConfigurationPropertiesSmokeTests has already run, so we know we can
- * access the database. A table named "jena_graph", means that the database
- * contains RDB. A table named "vivo_rdb_migrated" means that the conversion
- * utility has been run.
- */
-public class GuardAgainstUnmigratedRDB implements ServletContextListener {
-	private static final String PROPERTY_DB_URL = "VitroConnection.DataSource.url";
-	private static final String PROPERTY_DB_USERNAME = "VitroConnection.DataSource.username";
-	private static final String PROPERTY_DB_PASSWORD = "VitroConnection.DataSource.password";
-	private static final String PROPERTY_DB_DRIVER_CLASS_NAME = "VitroConnection.DataSource.driver";
-
-	private static final String DEFAULT_DRIVER_CLASS = "com.mysql.jdbc.Driver";
-
-	private static final String TABLE_NAME_RDB = "jena_graph";
-	private static final String TABLE_NAME_CONVERSION = "vivo_rdb_migrated";
-
-	private static final String MESSAGE_PROBLEM = "The database at %s"
-			+ " contains data from an earlier VIVO (before 1.7). "
-			+ "It does not appear that this data has been migrated. "
-			+ "The upgrade guide has instructions on migrating "
-			+ "this data to the current VIVO.";
-	private static final String MESSAGE_TECHNICAL = "More technically: "
-			+ "the database contains tables used by Jena RDB ('jena_graph' and "
-			+ "others). It does not contain the table 'vivo_rdb_migrated', "
-			+ "which is created when the data is migrated to Jena TDB files.";
-	private static final String MESSAGE_WHAT_NOW = "You must either migrate "
-			+ "the obsolete RDB data or remove it from your database.";
-
-	@Override
-	public void contextInitialized(ServletContextEvent sce) {
-		ServletContext ctx = sce.getServletContext();
-		ConfigurationProperties props = ConfigurationProperties.getBean(ctx);
-		StartupStatus ss = StartupStatus.getBean(ctx);
-
-		String url = props.getProperty(PROPERTY_DB_URL);
-		String username = props.getProperty(PROPERTY_DB_USERNAME);
-		String password = props.getProperty(PROPERTY_DB_PASSWORD);
-		String driverClassName = props.getProperty(
-				PROPERTY_DB_DRIVER_CLASS_NAME, DEFAULT_DRIVER_CLASS);
-
-		try {
-			Class.forName(driverClassName).newInstance();
-
-			Properties connectionProps = new Properties();
-			connectionProps.put("user", username);
-			connectionProps.put("password", password);
-
-			try (Connection conn = DriverManager.getConnection(url,
-					connectionProps)) {
-				boolean hasRdb = checkForRdbTables(conn);
-				boolean hasBeenConverted = checkForConversionTable(conn);
-				if (hasRdb && !hasBeenConverted) {
-					ss.fatal(this, String.format(MESSAGE_PROBLEM, url));
-					ss.fatal(this, String.format(MESSAGE_TECHNICAL, url));
-					ss.fatal(this, String.format(MESSAGE_WHAT_NOW, url));
-				}
-			} catch (SQLException e) {
-				ss.fatal(this, "Can't connect to the database: "
-						+ PROPERTY_DB_URL + "='" + url + "', "
-						+ PROPERTY_DB_USERNAME + "='" + username + "'", e);
-			}
-		} catch (InstantiationException | IllegalAccessException
-				| ClassNotFoundException e) {
-			ss.fatal(this, "Can't load the database driver: " + driverClassName);
-		}
-	}
-
-	private boolean checkForRdbTables(Connection conn) throws SQLException {
-		DatabaseMetaData md = conn.getMetaData();
-		try (ResultSet rs = md.getTables(null, null, TABLE_NAME_RDB, null);) {
-			while (rs.next()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private boolean checkForConversionTable(Connection conn)
-			throws SQLException {
-		DatabaseMetaData md = conn.getMetaData();
-		try (ResultSet rs = md.getTables(null, null, TABLE_NAME_CONVERSION,
-				null);) {
-			while (rs.next()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public void contextDestroyed(ServletContextEvent sce) {
-		// Nothing to tear down.
-	}
-
-}
diff --git a/webapp/web/WEB-INF/resources/startup_listeners.txt b/webapp/web/WEB-INF/resources/startup_listeners.txt
index 0653ef5a5..dcb8284f7 100644
--- a/webapp/web/WEB-INF/resources/startup_listeners.txt
+++ b/webapp/web/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