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

---
 .../src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java  | 3 ++-
 webapp/web/admin/syncSesame.jsp                                | 3 ++-
 webapp/web/jenaIngest/executeWorkflow.jsp                      | 3 ++-
 webapp/web/jenaIngest/sparqlConstruct.jsp                      | 3 ++-
 webapp/web/jenaIngest/workflowStep.jsp                         | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java
index 3f1adb728..0ce4050f2 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java
@@ -260,10 +260,11 @@ public class ModelAccess {
 	 * VitroRequest.getUnfilteredRDFService()
 	 * VitroRequest.getWebappDaoFactory()
 	 * VitroRequest.getWriteModel()
+	 * VitroRequest.getJenaOntModel()
+	 * VitroRequest.setJenaOntModel()
 	 * ModelContext.getBaseOntModelSelector()
 	 * ModelContext.getInferenceOntModel()
 	 * ModelContext.getInferenceOntModelSelector()
-	 * ModelContext.getJenaOntModel()
 	 * ModelContext.getOntModelSelector()
 	 * ModelContext.getUnionOntModelSelector()
 	 * OntModelSelector.getAboxModel
diff --git a/webapp/web/admin/syncSesame.jsp b/webapp/web/admin/syncSesame.jsp
index d97aa3f56..adf5f9b06 100644
--- a/webapp/web/admin/syncSesame.jsp
+++ b/webapp/web/admin/syncSesame.jsp
@@ -7,6 +7,7 @@
 <%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.JenaModelUtils"%>
 <%@page import="com.hp.hpl.jena.rdf.model.Model"%>
 <%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.JenaBaseDao"%>
+<%@page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%>
 <%@page import="java.io.InputStream"%>
 <%@page import="java.util.Properties"%>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
@@ -54,7 +55,7 @@
     }
     String contextId = sesameProperties.getProperty(SESAME_CONTEXT);
     
-    Model fullModel = (Model) getServletContext().getAttribute(JenaBaseDao.JENA_ONT_MODEL_ATTRIBUTE_NAME);
+    Model fullModel = ModelAccess.on(getServletContext).getJenaOntModel();
     // Copy the model to avoid locking the main model during sync.  Assumes enough memory.
     Model copyModel = ModelFactory.createDefaultModel();
     fullModel.enterCriticalSection(Lock.READ);
diff --git a/webapp/web/jenaIngest/executeWorkflow.jsp b/webapp/web/jenaIngest/executeWorkflow.jsp
index 46aeeecc2..b92a95933 100644
--- a/webapp/web/jenaIngest/executeWorkflow.jsp
+++ b/webapp/web/jenaIngest/executeWorkflow.jsp
@@ -3,6 +3,7 @@
 <%@ page import="com.hp.hpl.jena.ontology.Individual" %>
 <%@ page import="com.hp.hpl.jena.ontology.OntModel" %>
 <%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %>
+<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%>
 <%@ page import="com.hp.hpl.jena.shared.Lock" %>
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
@@ -23,7 +24,7 @@
         <select name="workflowURI">
              
         <%
-              OntModel jenaOntModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
+              OntModel jenaOntModel = ModelAccess.on(getServletContext().getJenaOntModel();
               jenaOntModel.enterCriticalSection(Lock.READ);
               try {
                   List savedQueries = (List) request.getAttribute("workflows");
diff --git a/webapp/web/jenaIngest/sparqlConstruct.jsp b/webapp/web/jenaIngest/sparqlConstruct.jsp
index 0c1652e59..090d1862f 100644
--- a/webapp/web/jenaIngest/sparqlConstruct.jsp
+++ b/webapp/web/jenaIngest/sparqlConstruct.jsp
@@ -3,6 +3,7 @@
 <%@ page import="com.hp.hpl.jena.ontology.Individual"%>
 <%@ page import="com.hp.hpl.jena.ontology.OntModel"%>
 <%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker"%>
+<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%>
 <%@ page import="com.hp.hpl.jena.shared.Lock"%>
 <%@ page import="java.util.Iterator"%>
 <%@ page import="java.util.List"%>
@@ -46,7 +47,7 @@
 <h3>SPARQL Query <select name="savedQuery">
 	<option value="">select saved query</option>
 	<%
-              OntModel jenaOntModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
+              OntModel jenaOntModel = ModelAccess.on(getServletContext().getJenaOntModel();
               jenaOntModel.enterCriticalSection(Lock.READ);
               try {
                   List savedQueries = (List) request.getAttribute("savedQueries");
diff --git a/webapp/web/jenaIngest/workflowStep.jsp b/webapp/web/jenaIngest/workflowStep.jsp
index 9ea99e7ae..355f8a625 100644
--- a/webapp/web/jenaIngest/workflowStep.jsp
+++ b/webapp/web/jenaIngest/workflowStep.jsp
@@ -3,6 +3,7 @@
 <%@ page import="com.hp.hpl.jena.ontology.Individual" %>
 <%@ page import="com.hp.hpl.jena.ontology.OntModel" %>
 <%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %>
+<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%>
 <%@ page import="com.hp.hpl.jena.shared.Lock" %>
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
@@ -25,7 +26,7 @@
 		<select name="workflowStepURI">
              
         <%
-              OntModel jenaOntModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
+              OntModel jenaOntModel = ModelAccess.on(getServletContext().getJenaOntModel();
               jenaOntModel.enterCriticalSection(Lock.READ);
               try {
                   List workflowSteps  = (List) request.getAttribute("workflowSteps");