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

NIHVIVO-2211 Replace ServletIdentifierBundleFactory with ActiveIdentifierBundleFactories and RequestIdentifiers.

Browse source
This commit is contained in:
jeb228 2011-03-08 17:41:47 +00:00
parent 2af6f22bd4
commit ae500851da
7 changed files with 18 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

3
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/N3MultiPartUpload.java
View file

@ -276,8 +276,7 @@ public class N3MultiPartUpload extends VitroHttpServlet {
} }
if (postUploadSuccess) { if (postUploadSuccess) {
/* **** Save the models for all the files **** */ /* **** Save the models for all the files **** */
String editorUri = EditN3Utils.getEditorUri(request, String editorUri = EditN3Utils.getEditorUri(request);
session, application);
Lock lock = null; Lock lock = null;
try { try {
lock = jenaOntModel.getLock(); lock = jenaOntModel.getLock();

5
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java
View file

@ -7,7 +7,6 @@ import java.io.StringReader;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import javax.servlet.ServletContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -77,9 +76,7 @@ public class PrimitiveRdfEdit extends VitroAjaxController {
return; return;
} }
String editorUri = EditN3Utils.getEditorUri(vreq);
ServletContext sc = getServletContext();
String editorUri = EditN3Utils.getEditorUri(vreq, vreq.getSession(false), sc);
try { try {
processChanges( additions, retractions, getWriteModel(vreq),getQueryModel(vreq), editorUri); processChanges( additions, retractions, getWriteModel(vreq),getQueryModel(vreq), editorUri);
} catch (Exception e) { } catch (Exception e) {

4
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditConfiguration.java
View file

@ -29,7 +29,7 @@ import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import com.hp.hpl.jena.rdf.model.ResourceFactory;
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.ServletIdentifierBundleFactory; import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.UserToIndIdentifierFactory; import edu.cornell.mannlib.vitro.webapp.auth.identifier.UserToIndIdentifierFactory;
import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral; import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral;
@ -256,7 +256,7 @@ public class EditConfiguration {
throw new Error("EditConfiguration.addSystemValues() needs a session"); throw new Error("EditConfiguration.addSystemValues() needs a session");
/* ********** Get URI of a logged in user ************** */ /* ********** Get URI of a logged in user ************** */
IdentifierBundle ids = ServletIdentifierBundleFactory.getIdBundleForRequest(request,request.getSession(),context); IdentifierBundle ids = RequestIdentifiers.getIdBundleForRequest(request);
List<String> userUris = List<String> userUris =
UserToIndIdentifierFactory.getIndividualsForUser(ids); UserToIndIdentifierFactory.getIndividualsForUser(ids);

31
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3Utils.java
View file

@ -2,38 +2,23 @@
package edu.cornell.mannlib.vitro.webapp.edit.n3editing; package edu.cornell.mannlib.vitro.webapp.edit.n3editing;
import java.util.Calendar;
import java.util.Date;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
import com.hp.hpl.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Property;
import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.rdf.model.Statement;
import com.hp.hpl.jena.shared.Lock;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.RoleIdentifier;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
import edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep;
import org.apache.xerces.util.XMLChar; import org.apache.xerces.util.XMLChar;
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.RoleIdentifier;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory;
import edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep;
public class EditN3Utils { public class EditN3Utils {
public static String getEditorUri(HttpServletRequest request, HttpSession session, ServletContext context){ public static String getEditorUri(HttpServletRequest request){
String editorUri = "Unknown N3 Editor"; String editorUri = "Unknown N3 Editor";
boolean selfEditing = VitroRequestPrep.isSelfEditing(request); boolean selfEditing = VitroRequestPrep.isSelfEditing(request);
IdentifierBundle ids = IdentifierBundle ids =
ServletIdentifierBundleFactory.getIdBundleForRequest(request,session,context); RequestIdentifiers.getIdBundleForRequest(request);
if( selfEditing ) if( selfEditing )
editorUri = SelfEditingIdentifierFactory.getSelfEditingUri(ids); editorUri = SelfEditingIdentifierFactory.getSelfEditingUri(ids);

12
webapp/src/edu/cornell/mannlib/vitro/webapp/filters/VitroRequestPrep.java
View file

@ -20,14 +20,12 @@ 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.DataSource;
import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.query.DatasetFactory;
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.SelfEditingIdentifierFactory; import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory.SelfEditing; import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory.SelfEditing;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory;
import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel; import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.Portal;
@ -45,7 +43,6 @@ import edu.cornell.mannlib.vitro.webapp.flags.FlagException;
import edu.cornell.mannlib.vitro.webapp.flags.PortalFlag; import edu.cornell.mannlib.vitro.webapp.flags.PortalFlag;
import edu.cornell.mannlib.vitro.webapp.flags.RequestToAuthFlag; import edu.cornell.mannlib.vitro.webapp.flags.RequestToAuthFlag;
import edu.cornell.mannlib.vitro.webapp.flags.SunsetFlag; import edu.cornell.mannlib.vitro.webapp.flags.SunsetFlag;
import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase;
/** /**
* This sets up several objects in the Request scope for each * This sets up several objects in the Request scope for each
@ -429,12 +426,7 @@ public class VitroRequestPrep implements Filter {
return false; return false;
} }
ServletContext sc = session.getServletContext(); IdentifierBundle idBundle = RequestIdentifiers.getIdBundleForRequest(request);
IdentifierBundle idBundle = ServletIdentifierBundleFactory.getIdBundleForRequest(request, session, sc);
if (idBundle == null) {
return false;
}
SelfEditing selfId = SelfEditingIdentifierFactory.getSelfEditingIdentifier(idBundle); SelfEditing selfId = SelfEditingIdentifierFactory.getSelfEditingIdentifier(idBundle);
if (selfId == null) { if (selfId == null) {
return false; return false;

12
webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/PropertyEditLinks.java
View file

@ -21,7 +21,7 @@ import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.StmtIterator; import com.hp.hpl.jena.rdf.model.StmtIterator;
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.ServletIdentifierBundleFactory; import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyList; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyList;
import edu.cornell.mannlib.vitro.webapp.auth.policy.RequestPolicyList; import edu.cornell.mannlib.vitro.webapp.auth.policy.RequestPolicyList;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList; import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
@ -99,15 +99,7 @@ public class PropertyEditLinks extends TagSupport{
} }
} }
IdentifierBundle ids = (IdentifierBundle)ServletIdentifierBundleFactory IdentifierBundle ids = RequestIdentifiers.getIdBundleForRequest(pageContext.getRequest());
.getIdBundleForRequest(pageContext.getRequest(),
pageContext.getSession(),
pageContext.getServletContext());
if( ids == null ){
log.error("No IdentifierBundle objects for request");
return SKIP_BODY;
}
Individual entity = (Individual)pageContext.getRequest().getAttribute("entity"); Individual entity = (Individual)pageContext.getRequest().getAttribute("entity");
LinkStruct[] links = null; LinkStruct[] links = null;

10
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/EditingPolicyHelper.java
View file

@ -7,9 +7,8 @@ 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 edu.cornell.mannlib.vedit.beans.LoginStatusBean;
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.ServletIdentifierBundleFactory; import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyList; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyList;
import edu.cornell.mannlib.vitro.webapp.auth.policy.RequestPolicyList; import edu.cornell.mannlib.vitro.webapp.auth.policy.RequestPolicyList;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList; import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
@ -46,12 +45,7 @@ public class EditingPolicyHelper {
} }
private void setIds() { private void setIds() {
ids = (IdentifierBundle)ServletIdentifierBundleFactory ids = RequestIdentifiers.getIdBundleForRequest(vreq);
.getIdBundleForRequest(vreq, vreq.getSession(), servletContext);
if (ids == null) {
log.error("No IdentifierBundle objects for request");
}
} }
protected boolean isAuthorizedAction(RequestedAction action) { protected boolean isAuthorizedAction(RequestedAction action) {