litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-82 Use ModelAccess to get or set the JenaOntModel (Union Full model)

Browse source
This commit is contained in:
j2blake 2013-05-17 12:28:48 -04:00
parent 0a15a6df7d
commit 4e4384bd3e
5 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java
View file

@ -260,10 +260,11 @@ public class ModelAccess {
* VitroRequest.getUnfilteredRDFService() * VitroRequest.getUnfilteredRDFService()
* VitroRequest.getWebappDaoFactory() * VitroRequest.getWebappDaoFactory()
* VitroRequest.getWriteModel() * VitroRequest.getWriteModel()
* VitroRequest.getJenaOntModel()
* VitroRequest.setJenaOntModel()
* ModelContext.getBaseOntModelSelector() * ModelContext.getBaseOntModelSelector()
* ModelContext.getInferenceOntModel() * ModelContext.getInferenceOntModel()
* ModelContext.getInferenceOntModelSelector() * ModelContext.getInferenceOntModelSelector()
* ModelContext.getJenaOntModel()
* ModelContext.getOntModelSelector() * ModelContext.getOntModelSelector()
* ModelContext.getUnionOntModelSelector() * ModelContext.getUnionOntModelSelector()
* OntModelSelector.getAboxModel * OntModelSelector.getAboxModel

3
webapp/web/admin/syncSesame.jsp
View file

@ -7,6 +7,7 @@
<%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.JenaModelUtils"%> <%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.JenaModelUtils"%>
<%@page import="com.hp.hpl.jena.rdf.model.Model"%> <%@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.jena.JenaBaseDao"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%>
<%@page import="java.io.InputStream"%> <%@page import="java.io.InputStream"%>
<%@page import="java.util.Properties"%> <%@page import="java.util.Properties"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
@ -54,7 +55,7 @@
} }
String contextId = sesameProperties.getProperty(SESAME_CONTEXT); 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. // Copy the model to avoid locking the main model during sync. Assumes enough memory.
Model copyModel = ModelFactory.createDefaultModel(); Model copyModel = ModelFactory.createDefaultModel();
fullModel.enterCriticalSection(Lock.READ); fullModel.enterCriticalSection(Lock.READ);

3
webapp/web/jenaIngest/executeWorkflow.jsp
View file

@ -3,6 +3,7 @@
<%@ page import="com.hp.hpl.jena.ontology.Individual" %> <%@ page import="com.hp.hpl.jena.ontology.Individual" %>
<%@ page import="com.hp.hpl.jena.ontology.OntModel" %> <%@ page import="com.hp.hpl.jena.ontology.OntModel" %>
<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %> <%@ 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="com.hp.hpl.jena.shared.Lock" %>
<%@ page import="java.util.Iterator" %> <%@ page import="java.util.Iterator" %>
<%@ page import="java.util.List" %> <%@ page import="java.util.List" %>
@ -23,7 +24,7 @@
<select name="workflowURI"> <select name="workflowURI">
<% <%
OntModel jenaOntModel = (OntModel) getServletContext().getAttribute("jenaOntModel"); OntModel jenaOntModel = ModelAccess.on(getServletContext().getJenaOntModel();
jenaOntModel.enterCriticalSection(Lock.READ); jenaOntModel.enterCriticalSection(Lock.READ);
try { try {
List savedQueries = (List) request.getAttribute("workflows"); List savedQueries = (List) request.getAttribute("workflows");

3
webapp/web/jenaIngest/sparqlConstruct.jsp
View file

@ -3,6 +3,7 @@
<%@ page import="com.hp.hpl.jena.ontology.Individual"%> <%@ page import="com.hp.hpl.jena.ontology.Individual"%>
<%@ page import="com.hp.hpl.jena.ontology.OntModel"%> <%@ page import="com.hp.hpl.jena.ontology.OntModel"%>
<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker"%> <%@ 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="com.hp.hpl.jena.shared.Lock"%>
<%@ page import="java.util.Iterator"%> <%@ page import="java.util.Iterator"%>
<%@ page import="java.util.List"%> <%@ page import="java.util.List"%>
@ -46,7 +47,7 @@
<h3>SPARQL Query <select name="savedQuery"> <h3>SPARQL Query <select name="savedQuery">
<option value="">select saved query</option> <option value="">select saved query</option>
<% <%
OntModel jenaOntModel = (OntModel) getServletContext().getAttribute("jenaOntModel"); OntModel jenaOntModel = ModelAccess.on(getServletContext().getJenaOntModel();
jenaOntModel.enterCriticalSection(Lock.READ); jenaOntModel.enterCriticalSection(Lock.READ);
try { try {
List savedQueries = (List) request.getAttribute("savedQueries"); List savedQueries = (List) request.getAttribute("savedQueries");

3
webapp/web/jenaIngest/workflowStep.jsp
View file

@ -3,6 +3,7 @@
<%@ page import="com.hp.hpl.jena.ontology.Individual" %> <%@ page import="com.hp.hpl.jena.ontology.Individual" %>
<%@ page import="com.hp.hpl.jena.ontology.OntModel" %> <%@ page import="com.hp.hpl.jena.ontology.OntModel" %>
<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %> <%@ 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="com.hp.hpl.jena.shared.Lock" %>
<%@ page import="java.util.Iterator" %> <%@ page import="java.util.Iterator" %>
<%@ page import="java.util.List" %> <%@ page import="java.util.List" %>
@ -25,7 +26,7 @@
<select name="workflowStepURI"> <select name="workflowStepURI">
<% <%
OntModel jenaOntModel = (OntModel) getServletContext().getAttribute("jenaOntModel"); OntModel jenaOntModel = ModelAccess.on(getServletContext().getJenaOntModel();
jenaOntModel.enterCriticalSection(Lock.READ); jenaOntModel.enterCriticalSection(Lock.READ);
try { try {
List workflowSteps = (List) request.getAttribute("workflowSteps"); List workflowSteps = (List) request.getAttribute("workflowSteps");