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

[VIVO-1270] Initial commit of Jena 3

Browse source
This commit is contained in:
Graham Triggs 2016-09-02 19:59:21 +01:00
parent 47f1408b3e
commit 1865b525b8
101 changed files with 416 additions and 892 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java
View file

@ -37,15 +37,15 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource; import org.apache.jena.rdf.model.Resource;
import edu.cornell.mannlib.semservices.bo.Concept; import edu.cornell.mannlib.semservices.bo.Concept;
import edu.cornell.mannlib.semservices.service.ExternalConceptService; import edu.cornell.mannlib.semservices.service.ExternalConceptService;

14
api/src/main/java/edu/cornell/mannlib/semservices/util/SKOSUtils.java
View file

@ -18,13 +18,13 @@ import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.NodeIterator; import org.apache.jena.rdf.model.NodeIterator;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import org.apache.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.rdf.model.Statement; import org.apache.jena.rdf.model.Statement;
import com.hp.hpl.jena.rdf.model.StmtIterator; import org.apache.jena.rdf.model.StmtIterator;
import edu.cornell.mannlib.semservices.bo.Concept; import edu.cornell.mannlib.semservices.bo.Concept;

4
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java
View file

@ -11,8 +11,8 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.Individual
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java
View file

@ -16,9 +16,9 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.json.JSONException; import org.json.JSONException;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController; import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController;

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java
View file

@ -16,9 +16,9 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.json.JSONException; import org.json.JSONException;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController; import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController;

4
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeDetails.java
View file

@ -13,8 +13,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.json.JSONException; import org.json.JSONException;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

12
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java
View file

@ -12,12 +12,12 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import org.apache.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.rdf.model.Statement; import org.apache.jena.rdf.model.Statement;
import com.hp.hpl.jena.rdf.model.StmtIterator; import org.apache.jena.rdf.model.StmtIterator;
import com.hp.hpl.jena.shared.Lock; import org.apache.jena.shared.Lock;
import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
View file

@ -10,9 +10,9 @@ import java.util.Map;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java
View file

@ -10,9 +10,9 @@ import java.util.Map;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
View file

@ -10,9 +10,9 @@ import java.util.Map;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java
View file

@ -12,9 +12,9 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import com.hp.hpl.jena.query.Syntax; import org.apache.jena.query.Syntax;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java
View file

@ -12,9 +12,9 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import com.hp.hpl.jena.query.Syntax; import org.apache.jena.query.Syntax;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java
View file

@ -13,9 +13,9 @@ import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import com.hp.hpl.jena.query.Syntax; import org.apache.jena.query.Syntax;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java
View file

@ -7,9 +7,9 @@ import javax.servlet.ServletContext;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import com.hp.hpl.jena.query.Syntax; import org.apache.jena.query.Syntax;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/AutocompleteRequiredInputValidator.java
View file

@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3ValidatorVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3ValidatorVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/FirstAndLastNameValidator.java
View file

@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3ValidatorVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3ValidatorVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java
View file

@ -10,7 +10,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3ValidatorVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3ValidatorVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java
View file

@ -10,7 +10,7 @@ import java.util.Map;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3ValidatorVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3ValidatorVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;

26
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java
View file

@ -16,19 +16,19 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.ontology.OntModel; import org.apache.jena.ontology.OntModel;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource; import org.apache.jena.rdf.model.Resource;
import com.hp.hpl.jena.vocabulary.RDF; import org.apache.jena.vocabulary.RDF;
import com.hp.hpl.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.RDFS;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;

20
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
View file

@ -12,20 +12,20 @@ import java.util.Map.Entry;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.RDFS;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyComparator; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyComparator;
import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;

14
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java
View file

@ -10,13 +10,13 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

20
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java
View file

@ -12,20 +12,20 @@ import java.util.Map.Entry;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.RDFS;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyComparator; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyComparator;
import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;

16
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java
View file

@ -8,14 +8,14 @@ import java.util.List;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource; import org.apache.jena.rdf.model.Resource;
import com.hp.hpl.jena.sparql.resultset.ResultSetMem; import org.apache.jena.sparql.resultset.ResultSetMem;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java
View file

@ -14,7 +14,7 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

10
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
View file

@ -14,11 +14,11 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.vivoweb.webapp.util.ModelUtils; import org.vivoweb.webapp.util.ModelUtils;
import com.hp.hpl.jena.ontology.OntModel; import org.apache.jena.ontology.OntModel;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.vocabulary.RDF; import org.apache.jena.vocabulary.RDF;
import com.hp.hpl.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.RDFS;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java
View file

@ -14,7 +14,7 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
View file

@ -6,7 +6,7 @@ import java.util.Arrays;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

18
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java
View file

@ -9,15 +9,15 @@ import java.util.Map;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource; import org.apache.jena.rdf.model.Resource;
import com.hp.hpl.jena.sparql.resultset.ResultSetMem; import org.apache.jena.sparql.resultset.ResultSetMem;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java
View file

@ -16,9 +16,9 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.vivoweb.webapp.util.ModelUtils; import org.vivoweb.webapp.util.ModelUtils;
import com.hp.hpl.jena.vocabulary.RDF; import org.apache.jena.vocabulary.RDF;
import com.hp.hpl.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.RDFS;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

4
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java
View file

@ -13,8 +13,8 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java
View file

@ -8,7 +8,7 @@ import java.util.Map;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java
View file

@ -8,7 +8,7 @@ import java.util.List;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java
View file

@ -21,9 +21,9 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddDataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddDataPropertyStatement;

14
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
View file

@ -7,17 +7,17 @@ import java.util.Map;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java
View file

@ -8,7 +8,7 @@ import java.util.Map;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java
View file

@ -8,7 +8,7 @@ import java.util.List;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
View file

@ -5,7 +5,7 @@ import java.util.Arrays;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java
View file

@ -7,7 +7,7 @@ import java.util.HashMap;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java
View file

@ -7,7 +7,7 @@ import java.util.HashMap;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java
View file

@ -6,7 +6,7 @@ import java.util.Arrays;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
View file

@ -8,7 +8,7 @@ import java.util.List;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java
View file

@ -14,7 +14,7 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java
View file

@ -8,7 +8,7 @@ import java.util.Map;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java
View file

@ -9,7 +9,7 @@ import java.util.List;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java
View file

@ -14,7 +14,7 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java
View file

@ -8,7 +8,7 @@ import java.util.List;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java
View file

@ -14,7 +14,7 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

8
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java
View file

@ -15,11 +15,11 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java
View file

@ -9,9 +9,9 @@ import java.util.List;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.RDFS;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClass;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

26
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java
View file

@ -16,19 +16,19 @@ import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.ontology.OntModel; import org.apache.jena.ontology.OntModel;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Resource; import org.apache.jena.rdf.model.Resource;
import com.hp.hpl.jena.vocabulary.OWL; import org.apache.jena.vocabulary.OWL;
import com.hp.hpl.jena.vocabulary.RDF; import org.apache.jena.vocabulary.RDF;
import com.hp.hpl.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.RDFS;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;

22
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java
View file

@ -7,17 +7,17 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.ontology.OntModel; import org.apache.jena.ontology.OntModel;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.query.Syntax; import org.apache.jena.query.Syntax;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.shared.Lock; import org.apache.jena.shared.Lock;
import com.hp.hpl.jena.vocabulary.RDF; import org.apache.jena.vocabulary.RDF;
import com.hp.hpl.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.RDFS;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;

14
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java
View file

@ -9,13 +9,13 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.hp.hpl.jena.ontology.OntModel; import org.apache.jena.ontology.OntModel;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Property; import org.apache.jena.rdf.model.Property;
import com.hp.hpl.jena.rdf.model.ResIterator; import org.apache.jena.rdf.model.ResIterator;
import com.hp.hpl.jena.rdf.model.Resource; import org.apache.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.Statement; import org.apache.jena.rdf.model.Statement;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;

28
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java
View file

@ -13,20 +13,20 @@ import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Resource; import org.apache.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import org.apache.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import com.hp.hpl.jena.rdf.model.Property; import org.apache.jena.rdf.model.Property;
import com.hp.hpl.jena.shared.Lock; import org.apache.jena.shared.Lock;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

28
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java
View file

@ -13,20 +13,20 @@ import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Resource; import org.apache.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import org.apache.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.vocabulary.XSD; import org.apache.jena.vocabulary.XSD;
import com.hp.hpl.jena.rdf.model.Property; import org.apache.jena.rdf.model.Property;
import com.hp.hpl.jena.shared.Lock; import org.apache.jena.shared.Lock;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

20
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java
View file

@ -12,16 +12,16 @@ import java.util.Map;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.ontology.OntModel; import org.apache.jena.ontology.OntModel;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Resource; import org.apache.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import org.apache.jena.rdf.model.ResourceFactory;
import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;

28
api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java
View file

@ -11,20 +11,20 @@ import java.util.Set;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import com.hp.hpl.jena.query.DatasetFactory; import org.apache.jena.query.DatasetFactory;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.QuerySolutionMap; import org.apache.jena.query.QuerySolutionMap;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.query.Syntax; import org.apache.jena.query.Syntax;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource; import org.apache.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import org.apache.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.shared.Lock; import org.apache.jena.shared.Lock;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccess; import edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccess;

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java
View file

@ -16,9 +16,9 @@ import java.util.Set;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import org.apache.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.rdf.model.Statement; import org.apache.jena.rdf.model.Statement;
import com.hp.hpl.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.RDFS;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClass;

24
api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java
View file

@ -12,18 +12,18 @@ import javax.servlet.ServletContext;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.QuerySolutionMap; import org.apache.jena.query.QuerySolutionMap;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import org.apache.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.rdf.model.Statement; import org.apache.jena.rdf.model.Statement;
import com.hp.hpl.jena.rdf.model.StmtIterator; import org.apache.jena.rdf.model.StmtIterator;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;

10
api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java
View file

@ -7,11 +7,11 @@ import java.util.Map;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Resource; import org.apache.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import org.apache.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.vocabulary.RDF; import org.apache.jena.vocabulary.RDF;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;

8
api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/VIVOMenuManagementDataUtils.java
View file

@ -11,10 +11,10 @@ import javax.servlet.ServletContext;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.ontology.OntModel; import org.apache.jena.ontology.OntModel;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import org.apache.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.rdf.model.StmtIterator; import org.apache.jena.rdf.model.StmtIterator;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;

14
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/capabilitymap/CapabilityMapRequestHandler.java
View file

@ -3,13 +3,13 @@
package edu.cornell.mannlib.vitro.webapp.visualization.capabilitymap; package edu.cornell.mannlib.vitro.webapp.visualization.capabilitymap;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;

14
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java
View file

@ -12,10 +12,10 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
@ -28,9 +28,9 @@ import org.apache.jena.iri.IRI;
import org.apache.jena.iri.IRIFactory; import org.apache.jena.iri.IRIFactory;
import org.apache.jena.iri.Violation; import org.apache.jena.iri.Violation;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.Syntax; import org.apache.jena.query.Syntax;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoAuthorshipData; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoAuthorshipData;
import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaboratorComparator; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaboratorComparator;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java
View file

@ -12,7 +12,7 @@ import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

16
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java
View file

@ -15,14 +15,14 @@ import org.apache.jena.iri.IRI;
import org.apache.jena.iri.IRIFactory; import org.apache.jena.iri.IRIFactory;
import org.apache.jena.iri.Violation; import org.apache.jena.iri.Violation;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.query.Syntax; import org.apache.jena.query.Syntax;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants;
import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java
View file

@ -24,9 +24,9 @@ import org.apache.jena.iri.IRI;
import org.apache.jena.iri.IRIFactory; import org.apache.jena.iri.IRIFactory;
import org.apache.jena.iri.Violation; import org.apache.jena.iri.Violation;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.Syntax; import org.apache.jena.query.Syntax;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoInvestigationData; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoInvestigationData;
import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData;

4
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java
View file

@ -10,8 +10,8 @@ import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

4
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
View file

@ -9,7 +9,7 @@ import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
@ -27,7 +27,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java
View file

@ -13,7 +13,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.utilities.VisualizationCac
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java
View file

@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java
View file

@ -8,9 +8,9 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.Syntax; import org.apache.jena.query.Syntax;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants;
import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java
View file

@ -1,7 +1,7 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;

18
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountQueryRunner.java
View file

@ -2,15 +2,15 @@
package edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount; package edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.Syntax; import org.apache.jena.query.Syntax;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer; import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java
View file

@ -11,7 +11,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
View file

@ -11,7 +11,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoInves
import edu.cornell.mannlib.vitro.webapp.visualization.visutils.CollaborationDataViewHelper; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.CollaborationDataViewHelper;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

30
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java
View file

@ -5,12 +5,12 @@ package edu.cornell.mannlib.vitro.webapp.visualization.personpubcount;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Resource; import org.apache.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import org.apache.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.rdf.model.Statement; import org.apache.jena.rdf.model.Statement;
import com.hp.hpl.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.RDFS;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer; import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer;
@ -20,15 +20,15 @@ import org.apache.jena.iri.IRI;
import org.apache.jena.iri.IRIFactory; import org.apache.jena.iri.IRIFactory;
import org.apache.jena.iri.Violation; import org.apache.jena.iri.Violation;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.query.Syntax; import org.apache.jena.query.Syntax;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants;
import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java
View file

@ -11,7 +11,7 @@ import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

8
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/OrganizationUtilityFunctions.java
View file

@ -9,10 +9,10 @@ import org.apache.commons.logging.Log;
import org.apache.jena.iri.IRI; import org.apache.jena.iri.IRI;
import org.apache.jena.iri.IRIFactory; import org.apache.jena.iri.IRIFactory;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java
View file

@ -20,7 +20,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java
View file

@ -20,7 +20,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java
View file

@ -7,7 +7,7 @@ import java.util.Map;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;

8
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java
View file

@ -15,10 +15,10 @@ import org.apache.jena.iri.Violation;
import org.vivoweb.webapp.util.ModelUtils; import org.vivoweb.webapp.util.ModelUtils;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;

16
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/VisualizationCaches.java
View file

@ -2,14 +2,14 @@
package edu.cornell.mannlib.vitro.webapp.visualization.utilities; package edu.cornell.mannlib.vitro.webapp.visualization.utilities;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource; import org.apache.jena.rdf.model.Resource;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer; import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer;
import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java
View file

@ -6,7 +6,7 @@ import java.util.Map;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.IllegalConstructedModelIdentifierException; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.IllegalConstructedModelIdentifierException;

18
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java
View file

@ -12,15 +12,15 @@ import org.apache.jena.iri.IRI;
import org.apache.jena.iri.IRIFactory; import org.apache.jena.iri.IRIFactory;
import org.apache.jena.iri.Violation; import org.apache.jena.iri.Violation;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.query.Syntax; import org.apache.jena.query.Syntax;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants;
import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java
View file

@ -2,7 +2,7 @@
package edu.cornell.mannlib.vitro.webapp.visualization.visutils; package edu.cornell.mannlib.vitro.webapp.visualization.visutils;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;

14
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java
View file

@ -10,13 +10,13 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.query.Syntax; import org.apache.jena.query.Syntax;
import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants;
import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;

14
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java
View file

@ -7,13 +7,13 @@ import java.util.Map;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.Query; import org.apache.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution; import org.apache.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory; import org.apache.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory; import org.apache.jena.query.QueryFactory;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.query.Syntax; import org.apache.jena.query.Syntax;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants;
import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java
View file

@ -2,7 +2,7 @@
package edu.cornell.mannlib.vitro.webapp.visualization.visutils; package edu.cornell.mannlib.vitro.webapp.visualization.visutils;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java
View file

@ -5,7 +5,7 @@ import java.util.Map;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import com.hp.hpl.jena.query.Dataset; import org.apache.jena.query.Dataset;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

4
api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/VIVOListedIndividual.java
View file

@ -6,8 +6,8 @@ import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

4
api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/VIVOIndividualSearchResult.java
View file

@ -6,8 +6,8 @@ import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;

8
api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidIdDataGetter.java
View file

@ -11,10 +11,10 @@ import java.util.Map;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource; import org.apache.jena.rdf.model.Resource;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers; import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;

20
api/src/main/java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java
View file

@ -5,16 +5,16 @@ package org.vivoweb.reasoner.plugin;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.ontology.OntModel; import org.apache.jena.ontology.OntModel;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Property; import org.apache.jena.rdf.model.Property;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource; import org.apache.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import org.apache.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.rdf.model.Statement; import org.apache.jena.rdf.model.Statement;
import com.hp.hpl.jena.rdf.model.StmtIterator; import org.apache.jena.rdf.model.StmtIterator;
import com.hp.hpl.jena.vocabulary.RDF; import org.apache.jena.vocabulary.RDF;
import com.hp.hpl.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.RDFS;
import edu.cornell.mannlib.vitro.webapp.reasoner.ReasonerPlugin; import edu.cornell.mannlib.vitro.webapp.reasoner.ReasonerPlugin;
import edu.cornell.mannlib.vitro.webapp.reasoner.plugin.SimplePropertyAndTypeRule; import edu.cornell.mannlib.vitro.webapp.reasoner.plugin.SimplePropertyAndTypeRule;

2
api/src/main/java/org/vivoweb/webapp/sitemap/SiteMapServlet.java
View file

@ -2,7 +2,7 @@
package org.vivoweb.webapp.sitemap; package org.vivoweb.webapp.sitemap;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;

4
api/src/main/java/org/vivoweb/webapp/startup/JSONWrapperSetup.java
View file

@ -2,8 +2,8 @@
package org.vivoweb.webapp.startup; package org.vivoweb.webapp.startup;
import com.hp.hpl.jena.query.QuerySolution; import org.apache.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import org.apache.jena.query.ResultSet;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;

24
api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodesTest.java
View file

@ -2,10 +2,10 @@
package edu.cornell.mannlib.vitro.webapp.searchindex.extensions; package edu.cornell.mannlib.vitro.webapp.searchindex.extensions;
import static com.hp.hpl.jena.rdf.model.ResourceFactory.createPlainLiteral; import static org.apache.jena.rdf.model.ResourceFactory.createPlainLiteral;
import static com.hp.hpl.jena.rdf.model.ResourceFactory.createProperty; import static org.apache.jena.rdf.model.ResourceFactory.createProperty;
import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource; import static org.apache.jena.rdf.model.ResourceFactory.createResource;
import static com.hp.hpl.jena.rdf.model.ResourceFactory.createStatement; import static org.apache.jena.rdf.model.ResourceFactory.createStatement;
import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.WhichService.CONTENT; import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.WhichService.CONTENT;
import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.ALLTEXT; import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.ALLTEXT;
import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.ALLTEXTUNSTEMMED; import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.ALLTEXTUNSTEMMED;
@ -26,14 +26,14 @@ import org.junit.Test;
import stubs.edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccessStub; import stubs.edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccessStub;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Property; import org.apache.jena.rdf.model.Property;
import com.hp.hpl.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource; import org.apache.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.Statement; import org.apache.jena.rdf.model.Statement;
import com.hp.hpl.jena.vocabulary.RDF; import org.apache.jena.vocabulary.RDF;
import com.hp.hpl.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.RDFS;
import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;

12
api/src/test/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java
View file

@ -20,12 +20,12 @@ import org.junit.Test;
import stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBeanStub; import stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBeanStub;
import stubs.javax.servlet.ServletContextStub; import stubs.javax.servlet.ServletContextStub;
import com.hp.hpl.jena.ontology.OntModel; import org.apache.jena.ontology.OntModel;
import com.hp.hpl.jena.ontology.OntModelSpec; import org.apache.jena.ontology.OntModelSpec;
import com.hp.hpl.jena.rdf.model.Model; import org.apache.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Statement; import org.apache.jena.rdf.model.Statement;
import com.hp.hpl.jena.rdf.model.StmtIterator; import org.apache.jena.rdf.model.StmtIterator;
import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle; import edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle;

4
installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties
View file

@ -42,8 +42,8 @@ log4j.logger.org.semanticweb.owlapi.rdf.rdfxml.parser=WARN
log4j.logger.org.springframework=WARN log4j.logger.org.springframework=WARN
# suppress odd warnings from libraries # suppress odd warnings from libraries
log4j.logger.com.hp.hpl.jena.sdb.layout2.LoaderTuplesNodes=FATAL log4j.logger.org.apache.jena.sdb.layout2.LoaderTuplesNodes=FATAL
log4j.logger.com.hp.hpl.jena.sdb.sql.SDBConnection=ERROR log4j.logger.org.apache.jena.sdb.sql.SDBConnection=ERROR
log4j.logger.org.openjena.riot=FATAL log4j.logger.org.openjena.riot=FATAL
log4j.logger.org.apache.jena.riot=FATAL log4j.logger.org.apache.jena.riot=FATAL
log4j.logger.org.directwebremoting=FATAL log4j.logger.org.directwebremoting=FATAL

5
webapp/src/main/webapp/WEB-INF/web.xml
View file

@ -1557,11 +1557,6 @@
<taglib-location>/WEB-INF/tlds/vitroForm.tld</taglib-location> <taglib-location>/WEB-INF/tlds/vitroForm.tld</taglib-location>
</taglib> </taglib>
<taglib>
<taglib-uri>http://mannlib.cornell.edu/vitro/ListSparqlTag/0.1/</taglib-uri>
<taglib-location>/WEB-INF/tlds/ListSparqlTag.tld</taglib-location>
</taglib>
<taglib> <taglib>
<taglib-uri>http://jakarta.apache.org/taglibs/string-1.1</taglib-uri> <taglib-uri>http://jakarta.apache.org/taglibs/string-1.1</taglib-uri>
<taglib-location>/WEB-INF/tlds/taglibs-string.tld</taglib-location> <taglib-location>/WEB-INF/tlds/taglibs-string.tld</taglib-location>

456
webapp/src/main/webapp/counter.jsp
View file

@ -1,456 +0,0 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ 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.modelaccess.ModelAccess"%>
<% request.setAttribute("jenaOntModel", ModelAccess.on(getServletContext()).getOntModel()); %>
<div id="content">
<h2>Linkage Information</h2>
<ul>
<!--
Author-Resource
-->
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="inforauthorships">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX obo: <http://purl.obolibrary.org/obo/>
SELECT (count(?author) as ?counts) WHERE {
?author rdf:type core:Authorship .
?author core:relates ?infor .
?infor rdf:type obo:IAO_0000030 .
}
</sparql:select>
<c:forEach items="${inforauthorships.rows}" var="inforauthorship" varStatus="counter">
<li><a href="#">'Person'-'InformationResource' linkages</a> (${inforauthorship.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="inforauthors">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX obo: <http://purl.obolibrary.org/obo/>
SELECT (count(distinct ?author) as ?counts) WHERE {
?author core:relatedBy ?obj .
?author rdf:type foaf:Person .
?obj rdf:type core:Authorship .
?obj core:relates ?infor .
?infor rdf:type obo:IAO_0000030 .
}
</sparql:select>
<c:forEach items="${inforauthors.rows}" var="inforauthor" varStatus="counter">
<li><a href="#">'Person' entities which published 'InformationResource' entities</a> (${inforauthor.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="infors">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX obo: <http://purl.obolibrary.org/obo/>
SELECT (count(distinct ?infor) as ?counts) WHERE {
?subj core:relates ?infor .
?infor rdf:type obo:IAO_0000030 .
}
</sparql:select>
<c:forEach items="${infors.rows}" var="infor" varStatus="counter">
<li><a href="#">'InformationResource' entities</a> (${infor.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
</ul>
<ul>
<!--
Author-Conference_Paper
-->
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="confauthorships">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
SELECT (count(?author) as ?counts) WHERE {
?author rdf:type core:Authorship .
?author core:relates ?infor .
?infor rdf:type core:ConferencePaper .
}
</sparql:select>
<c:forEach items="${confauthorships.rows}" var="confauthorship" varStatus="counter">
<li><a href="#">'Person'-'ConferencePaper' linkages</a> (${confauthorship.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="confauthors">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
SELECT (count(distinct ?author) as ?counts) WHERE {
?author core:relatedBy ?obj .
?author rdf:type foaf:Person .
?obj rdf:type core:Authorship .
?obj core:relates ?infor .
?infor rdf:type core:ConferencePaper .
}
</sparql:select>
<c:forEach items="${confauthors.rows}" var="confauthor" varStatus="counter">
<li><a href="#">'Person' entities which published 'ConferencePaper' entities</a> (${confauthor.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="confs">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
SELECT (count(distinct ?infor) as ?counts) WHERE {
?subj core:relates ?infor .
?infor rdf:type core:ConferencePaper .
}
</sparql:select>
<c:forEach items="${confs.rows}" var="conf" varStatus="counter">
<li><a href="#">'ConferencePaper' entities</a> (${conf.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
</ul>
<ul>
<!--
Author-Academic_Article
-->
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="acaauthorships">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
SELECT (count(?author) as ?counts) WHERE {
?author rdf:type core:Authorship .
?author core:relates ?infor .
?infor rdf:type bibo:AcademicArticle .
}
</sparql:select>
<c:forEach items="${acaauthorships.rows}" var="acaauthorship" varStatus="counter">
<li><a href="#">'Person'-'AcademicArticle' linkages</a> (${acaauthorship.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="acaauthors">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
SELECT (count(distinct ?author) as ?counts) WHERE {
?author core:relatedBy ?obj .
?author rdf:type foaf:Person .
?obj rdf:type core:Authorship .
?obj core:relates ?infor .
?infor rdf:type bibo:AcademicArticle .
}
</sparql:select>
<c:forEach items="${acaauthors.rows}" var="acaauthor" varStatus="counter">
<li><a href="#">'Person' entities which published 'AcademicArticle' entities</a> (${acaauthor.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="acas">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
SELECT (count(distinct ?infor) as ?counts) WHERE {
?subj core:relates ?infor .
?infor rdf:type bibo:AcademicArticle .
}
</sparql:select>
<c:forEach items="${acas.rows}" var="aca" varStatus="counter">
<li><a href="#">'AcademicArticle' entities</a> (${aca.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
</ul>
<ul>
<!--
Investigator-Grant
-->
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="piships">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
SELECT (count(*) as ?counts) WHERE {
?grant core:relates ?pi .
?grant rdf:type core:Grant .
?pi rdf:type core:InvestigatorRole .
}
</sparql:select>
<c:forEach items="${piships.rows}" var="piship" varStatus="counter">
<li><a href="#">'Person'-'Grant' linkages</a> (${piship.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="pis">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
SELECT (count(distinct ?pi) as ?counts) WHERE {
?grant core:relates ?pi .
?grant rdf:type core:Grant .
?pi rdf:type core:InvestigatorRole .
}
</sparql:select>
<c:forEach items="${pis.rows}" var="pi" varStatus="counter">
<li><a href="#">'Person' entities which are (co-)investigators on 'Grant' entities</a> (${pi.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="grants">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
SELECT (count(distinct ?grant) as ?counts) WHERE {
?grant rdf:type core:Grant .
}
</sparql:select>
<c:forEach items="${grants.rows}" var="grant" varStatus="counter">
<li><a href="#">'Grant' entities</a> (${grant.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
</ul>
<ul>
<!--
Teacher-Course
-->
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="teachings">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX obo: <http://purl.obolibrary.org/obo/>
SELECT (count(*) as ?counts) WHERE {
?teacher obo:RO_0000053 ?obj .
?obj rdf:type core:teacherRole .
}
</sparql:select>
<c:forEach items="${teachings.rows}" var="teaching" varStatus="counter">
<li><a href="#">'Person'-'CourseSection' linkages</a> (${teaching.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="teachers">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX obo: <http://purl.obolibrary.org/obo/>
SELECT (count(distinct ?teacher) as ?counts) WHERE {
?teacher core:teaching ?obj .
?teacher obo:RO_0000053 ?obj .
?obj rdf:type core:teacherRole .
}
</sparql:select>
<c:forEach items="${teachers.rows}" var="teacher" varStatus="counter">
<li><a href="#">'Person' entities which teach 'CourseSection' entities</a> (${teacher.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="courses">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
SELECT (count(?course) as ?counts) WHERE {
?course rdf:type core:Course .
}
</sparql:select>
<c:forEach items="${courses.rows}" var="course" varStatus="counter">
<li><a href="#">'Course' entities</a> (${course.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
</ul>
<ul>
<!--
Co-Author Linkage
-->
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="coauthors">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX obo: <http://purl.obolibrary.org/obo/>
SELECT (count(*) as ?counts) WHERE {
?author1 rdf:type core:Authorship .
?author2 rdf:type core:Authorship .
?author1 core:relates ?infor .
?author2 core:relates ?infor .
?infor rdf:type obo:IAO_0000030 .
FILTER (str(?author1) < str(?author2))
}
</sparql:select>
<c:forEach items="${coauthors.rows}" var="coauthor" varStatus="counter">
<li><a href="#">Total co-author linkages</a> (${coauthor.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
<!--
Distinct Co-Author Linkage
-->
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="discoauthors">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX obo: <http://purl.obolibrary.org/obo/>
SELECT DISTINCT ?author1 ?author2 WHERE {
?author1 rdf:type core:Authorship .
?author2 rdf:type core:Authorship .
?author1 core:relates ?infor .
?author2 core:relates ?infor .
?infor rdf:type obo:IAO_0000030 .
FILTER (str(?author1) < str(?author2))
}
</sparql:select>
<li><a href="#">Unique co-author linkages</a> (${fn:length(discoauthors.rows)})</li>
</sparql:sparql>
</sparql:lock>
</ul>
<ul>
<!--
Co-Investigator Linkage
-->
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="copis">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
SELECT (count(*) as ?counts) WHERE {
?grant core:relates ?pi1 .
?pi1 rdf:type core:InvestigatorRole .
?grant core:relates ?pi2 .
?pi1 rdf:type core:InvestigatorRole .
FILTER (str(?pi1) < str(?pi2))
}
</sparql:select>
<c:forEach items="${copis.rows}" var="copi" varStatus="counter">
<li><a href="#">Total co-investigator linkages</a> (${copi.counts.string})</li>
</c:forEach>
</sparql:sparql>
</sparql:lock>
<!--
Distinct Co-Investigator Linkage
-->
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${jenaOntModel}" var="discopis">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
PREFIX bibo: <http://purl.org/ontology/bibo/>
PREFIX core: <http://vivoweb.org/ontology/core#>
SELECT DISTINCT ?pi1 ?pi2 WHERE {
?grant core:relates ?pi1 .
?pi1 rdf:type core:InvestigatorRole .
?grant core:relates ?pi2 .
?pi1 rdf:type core:InvestigatorRole .
FILTER (str(?pi1) < str(?pi2))
}
</sparql:select>
<li><a href="#">Unique co-investigator linkages</a> (${fn:length(discopis.rows)})</li>
</sparql:sparql>
</sparql:lock>
</ul>
</div>

Some files were not shown because too many files have changed in this diff Show more