From 6e5a6074f66c2b063f15c9a7110f97ff2e422d09 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Fri, 17 May 2013 11:46:00 -0400
Subject: [PATCH] VIVO-82 Use ModelAccess to get or set the JenaOntModel (Union
 Full model)

---
 .../generators/AddGrantRoleToPersonGenerator.java            | 4 +++-
 .../vitro/webapp/search/solr/VivoDocumentModifiers.java      | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
index d5a71ec4..4c0c0412 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
@@ -14,6 +14,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.vivoweb.webapp.util.ModelUtils;
 
+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.vocabulary.RDF;
@@ -22,6 +23,7 @@ import com.hp.hpl.jena.vocabulary.XSD;
 
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.AutocompleteRequiredInputValidator;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
@@ -565,7 +567,7 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
 	
 	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
     	//Here, retrieve model from 
-    	Model model = (Model) session.getServletContext().getAttribute("jenaOntModel");
+		OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel();
     	//Object property by definition
     	String objectUri = EditConfigurationUtils.getObjectUri(vreq);
     	if(objectUri != null) {
diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoDocumentModifiers.java b/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoDocumentModifiers.java
index 6dc7e661..2d0ac1ca 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoDocumentModifiers.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoDocumentModifiers.java
@@ -10,10 +10,9 @@ import javax.servlet.ServletContextEvent;
 import com.hp.hpl.jena.query.Dataset;
 import com.hp.hpl.jena.query.DatasetFactory;
 
-import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
-
 import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.CalculateParameters;
 import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.DocumentModifier;
 
@@ -25,7 +24,7 @@ public class VivoDocumentModifiers implements javax.servlet.ServletContextListen
         ServletContext context = sce.getServletContext();
 		RDFServiceFactory rdfServiceFactory = RDFServiceUtils.getRDFServiceFactory(context);
         
-        Dataset dataset = DatasetFactory.create(ModelContext.getJenaOntModel(context));
+        Dataset dataset = DatasetFactory.create(ModelAccess.on(context).getJenaOntModel());
         
         /* put DocumentModifiers into servlet context for use later in startup by SolrSetup */