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

---
 webapp/web/admin/syncSesame.jsp           | 2 +-
 webapp/web/jenaIngest/executeWorkflow.jsp | 2 +-
 webapp/web/jenaIngest/sparqlConstruct.jsp | 2 +-
 webapp/web/jenaIngest/workflowStep.jsp    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/web/admin/syncSesame.jsp b/webapp/web/admin/syncSesame.jsp
index adf5f9b06..5f2acffbc 100644
--- a/webapp/web/admin/syncSesame.jsp
+++ b/webapp/web/admin/syncSesame.jsp
@@ -55,7 +55,7 @@
     }
     String contextId = sesameProperties.getProperty(SESAME_CONTEXT);
     
-    Model fullModel = ModelAccess.on(getServletContext).getJenaOntModel();
+    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 b92a95933..8f5751f83 100644
--- a/webapp/web/jenaIngest/executeWorkflow.jsp
+++ b/webapp/web/jenaIngest/executeWorkflow.jsp
@@ -24,7 +24,7 @@
         <select name="workflowURI">
              
         <%
-              OntModel jenaOntModel = ModelAccess.on(getServletContext().getJenaOntModel();
+              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 090d1862f..fd0914584 100644
--- a/webapp/web/jenaIngest/sparqlConstruct.jsp
+++ b/webapp/web/jenaIngest/sparqlConstruct.jsp
@@ -47,7 +47,7 @@
 <h3>SPARQL Query <select name="savedQuery">
 	<option value="">select saved query</option>
 	<%
-              OntModel jenaOntModel = ModelAccess.on(getServletContext().getJenaOntModel();
+              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 355f8a625..360093eb2 100644
--- a/webapp/web/jenaIngest/workflowStep.jsp
+++ b/webapp/web/jenaIngest/workflowStep.jsp
@@ -26,7 +26,7 @@
 		<select name="workflowStepURI">
              
         <%
-              OntModel jenaOntModel = ModelAccess.on(getServletContext().getJenaOntModel();
+              OntModel jenaOntModel = ModelAccess.on(getServletContext()).getJenaOntModel();
               jenaOntModel.enterCriticalSection(Lock.READ);
               try {
                   List workflowSteps  = (List) request.getAttribute("workflowSteps");