diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml index 3c3104dd..f9b9f010 100644 --- a/productMods/WEB-INF/web.xml +++ b/productMods/WEB-INF/web.xml @@ -702,6 +702,15 @@ /admin/showConfiguration + + ShowRDFSources + edu.cornell.mannlib.vitro.webapp.controller.admin.ShowSourcesController + + + ShowRDFSources + /admin/showSources + + StartupStatus edu.cornell.mannlib.vitro.webapp.controller.admin.StartupStatusController diff --git a/productMods/counter.jsp b/productMods/counter.jsp index 59be7457..f1989c3e 100644 --- a/productMods/counter.jsp +++ b/productMods/counter.jsp @@ -5,8 +5,8 @@ <%@ taglib uri="http://djpowell.net/tmp/sparql-tag/0.1/" prefix="sparql" %> <%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.1" prefix="str" %> <%@ page import="java.net.URLDecoder" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%> -<% request.setAttribute("jenaOntModel", ModelAccess.on(getServletContext()).getJenaOntModel()); %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess"%> +<% request.setAttribute("jenaOntModel", ModelAccess.on(getServletContext()).getOntModel()); %>
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java index 8a916c31..04656505 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java @@ -2,6 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; +import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_ASSERTIONS; + import java.util.HashMap; import java.util.Map; @@ -25,10 +27,9 @@ import edu.cornell.mannlib.vitro.webapp.controller.edit.utils.LocalNamespaceClas import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues; 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.ModelAccess; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent; -import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; /* * Custom controller for menu management. This will be replaced later once N3 Editing * has been successfully refactored and integrated with menu management. @@ -184,7 +185,7 @@ public class InstitutionalInternalClassController extends FreemarkerHttpServlet } //If existing class, need to simply add a statement specifying existing class is an internal class if(classUri != null && !classUri.isEmpty()) { - Model writeModel = ModelAccess.on(getServletContext()).getOntModel(ModelNames.TBOX_ASSERTIONS); + Model writeModel = ModelAccess.on(getServletContext()).getOntModel(TBOX_ASSERTIONS); writeModel.enterCriticalSection(Lock.WRITE); writeModel.notifyEvent(new EditEvent(null,true)); try { @@ -239,7 +240,7 @@ public class InstitutionalInternalClassController extends FreemarkerHttpServlet //Get current internal class private String retrieveCurrentInternalClass() { String internalClassUri = ""; - Model mainModel = ModelAccess.on(getServletContext()).getOntModel(ModelNames.TBOX_ASSERTIONS); + Model mainModel = ModelAccess.on(getServletContext()).getOntModel(TBOX_ASSERTIONS); StmtIterator internalIt = mainModel.listStatements(null, ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT), (RDFNode) null); diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java index 795266dc..cbd0f8eb 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java @@ -26,7 +26,6 @@ import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.vocabulary.OWL; import com.hp.hpl.jena.vocabulary.RDF; import com.hp.hpl.jena.vocabulary.RDFS; import com.hp.hpl.jena.vocabulary.XSD; @@ -36,14 +35,13 @@ import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; -import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess; -import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.AddAssociatedConceptsPreprocessor; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.ConceptSemanticTypesPreprocessor; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.utils.ConceptSearchService.ConceptSearchServiceUtils; /** * Generates the edit configuration for importing concepts from external @@ -454,7 +452,7 @@ public class AddAssociatedConceptGenerator extends VivoBaseGenerator implements String conceptSemanticTypeLabel = null; //Can a concept have multiple semantic types? Currently we are only returning the first one //TODO: Change this into a sparql query that returns all types for the concept that are subclasses of SKOS concepts - HashMap typeAndLabel = this.getConceptSemanticTypeQueryResults(conceptIndividual.getURI(), ModelAccess.on(vreq).getJenaOntModel()); + HashMap typeAndLabel = this.getConceptSemanticTypeQueryResults(conceptIndividual.getURI(), ModelAccess.on(vreq).getOntModel()); if(typeAndLabel.containsKey("semanticTypeURI")) { conceptSemanticTypeURI = typeAndLabel.get("semanticTypeURI"); } diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java index 05fb5503..c0475558 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java @@ -8,31 +8,25 @@ import java.util.List; import javax.servlet.http.HttpSession; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.vocabulary.XSD; import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryFactory; import com.hp.hpl.jena.query.QueryExecution; import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.ResultSet; +import com.hp.hpl.jena.query.QueryFactory; import com.hp.hpl.jena.rdf.model.RDFNode; import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.sparql.resultset.ResultSetMem; +import com.hp.hpl.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; -import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode; import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils; @@ -59,7 +53,7 @@ public class AddEditorshipToPersonGenerator extends VivoBaseGenerator implements "WHERE { <" + editorshipNode.getURI() + "> ?obj . \n" + " ?obj a . } \n"; Query documentQuery = QueryFactory.create(documentQueryStr); - QueryExecution qe = QueryExecutionFactory.create(documentQuery, ModelAccess.on(vreq).getJenaOntModel()); + QueryExecution qe = QueryExecutionFactory.create(documentQuery, ModelAccess.on(vreq).getOntModel()); try { ResultSetMem rs = new ResultSetMem(qe.execSelect()); if(!rs.hasNext()){ 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 d7170973..6a543eea 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 @@ -16,14 +16,12 @@ 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; import com.hp.hpl.jena.vocabulary.RDFS; 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; @@ -32,6 +30,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUti import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode; import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils; @@ -54,7 +53,7 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator VCLASSGROUP, CHILD_VCLASSES, HARDCODED_LITERALS - }; + } @Override public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) { @@ -564,7 +563,7 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) { //Here, retrieve model from - OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel(); + OntModel model = ModelAccess.on(session.getServletContext()).getOntModel(); //Object property by definition String objectUri = EditConfigurationUtils.getObjectUri(vreq); if(objectUri != null) { diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java index 31e54461..43b250b5 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java @@ -9,22 +9,19 @@ import java.util.Map; import javax.servlet.http.HttpSession; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.vocabulary.XSD; import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryFactory; import com.hp.hpl.jena.query.QueryExecution; import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.ResultSet; +import com.hp.hpl.jena.query.QueryFactory; +import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.RDFNode; import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.sparql.resultset.ResultSetMem; +import com.hp.hpl.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.beans.Individual; -import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; -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.PersonHasPublicationValidator; @@ -34,6 +31,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTw import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode; import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils; @@ -84,7 +82,7 @@ public class AddPublicationToPersonGenerator extends VivoBaseGenerator implement "WHERE { <" + authorshipNode.getURI() + "> <" + relatesPred + "> ?obj . \n" + " ?obj a <" + documentClass + "> . } \n"; Query pubQuery = QueryFactory.create(pubQueryStr); - QueryExecution qe = QueryExecutionFactory.create(pubQuery, ModelAccess.on(vreq).getJenaOntModel()); + QueryExecution qe = QueryExecutionFactory.create(pubQuery, ModelAccess.on(vreq).getOntModel()); try { ResultSetMem rs = new ResultSetMem(qe.execSelect()); if(!rs.hasNext()){ diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java index d5e0b336..c7f93f15 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java @@ -16,19 +16,18 @@ import org.apache.commons.logging.LogFactory; import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.DefaultAddMissingIndividualFormModelPreprocessor; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; /** * Generates the edit configuration for a default property form. @@ -396,7 +395,7 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) { //Here, retrieve model from - OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel(); + OntModel model = ModelAccess.on(session.getServletContext()).getOntModel(); //if object property if(EditConfigurationUtils.isObjectProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)){ Individual objectIndividual = EditConfigurationUtils.getObjectIndividual(vreq); diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java index 9aa1a4f1..b7ce0fc7 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java @@ -3,7 +3,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -11,7 +10,6 @@ import java.util.Map; import net.sf.json.JSON; import net.sf.json.JSONArray; -import net.sf.json.JSONObject; import net.sf.json.JSONSerializer; import org.apache.commons.lang.StringUtils; @@ -32,15 +30,14 @@ import com.hp.hpl.jena.vocabulary.RDF; import com.hp.hpl.jena.vocabulary.RDFS; import com.hp.hpl.jena.vocabulary.XSD; - import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BaseEditSubmissionPreprocessorVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; public class AddAssociatedConceptsPreprocessor extends BaseEditSubmissionPreprocessorVTwo { @@ -90,7 +87,7 @@ public class AddAssociatedConceptsPreprocessor extends public void preprocess(MultiValueEditSubmission inputSubmission, VitroRequest vreq) { submission = inputSubmission; this.wdf = vreq.getWebappDaoFactory(); - this.ontModel = ModelAccess.on(vreq).getJenaOntModel(); + this.ontModel = ModelAccess.on(vreq).getOntModel(); //Set the models that we need here // Get the input elements for concept node and concept label as well // as vocab uri (which is based on thge diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java index d0b3cb9a..c6fca4c8 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java @@ -8,30 +8,19 @@ 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.Dataset; import com.hp.hpl.jena.query.Query; import com.hp.hpl.jena.query.QueryExecution; import com.hp.hpl.jena.query.QueryExecutionFactory; import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolutionMap; 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.Property; -import com.hp.hpl.jena.rdf.model.ResIterator; -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.shared.Lock; import com.hp.hpl.jena.vocabulary.RDF; import com.hp.hpl.jena.vocabulary.RDFS; 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.dao.jena.DatasetWrapper; -import edu.cornell.mannlib.vitro.webapp.dao.jena.DatasetWrapperFactory; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; //We are representing semantic types from the UMLS Semantic Network as OWL Classes //and this preprocessor will add the appropriate class information to the TBox diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoDocumentModifiers.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoDocumentModifiers.java index ea717983..51bc5049 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoDocumentModifiers.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoDocumentModifiers.java @@ -10,20 +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.ModelAccess; +import edu.cornell.mannlib.vitro.webapp.modelaccess.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.documentBuilding.CalculateParameters; -import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.DocumentModifier; -import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ExcludeBasedOnNamespace; -import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.SearchIndexExcluder; -import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VIVOValuesFromVcards; -import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFAdvisingFields; -import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFBasicFields; -import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFEducationFields; -import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFGrantFields; -import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFMemberFields; -import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoInformationResourceContextNodeFields; public class VivoDocumentModifiers implements javax.servlet.ServletContextListener{ @@ -42,7 +31,7 @@ public class VivoDocumentModifiers implements javax.servlet.ServletContextListen ServletContext context = sce.getServletContext(); RDFServiceFactory rdfServiceFactory = RDFServiceUtils.getRDFServiceFactory(context); - Dataset dataset = DatasetFactory.create(ModelAccess.on(context).getJenaOntModel()); + Dataset dataset = DatasetFactory.create(ModelAccess.on(context).getOntModel()); /* Put DocumentModifiers into servlet context for use later in startup by SearchSetup * This adds the code for VIVO specific additions to the building diff --git a/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java b/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java index 3f8adfef..494cd629 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java +++ b/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java @@ -27,8 +27,8 @@ import com.hp.hpl.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; -import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames; /** diff --git a/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java b/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java index 29de2152..f596b64d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java +++ b/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java @@ -2,6 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.utils.menuManagement; +import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_ASSERTIONS; + import java.util.Map; import javax.servlet.ServletContext; @@ -14,9 +16,8 @@ import com.hp.hpl.jena.rdf.model.RDFNode; import com.hp.hpl.jena.rdf.model.ResourceFactory; import com.hp.hpl.jena.rdf.model.StmtIterator; -import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; /* * This class includes methods that help in selecting a data getter based on @@ -47,7 +48,7 @@ public class MenuManagementDataUtils { } private static String retrieveInternalClass(ServletContext context) { - OntModel mainModel = ModelAccess.on(context).getOntModel(ModelNames.TBOX_ASSERTIONS); + OntModel mainModel = ModelAccess.on(context).getOntModel(TBOX_ASSERTIONS); StmtIterator internalIt = mainModel.listStatements(null, ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT), (RDFNode) null); if(internalIt.hasNext()) { String internalClass = internalIt.nextStatement().getSubject().getURI();