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:19 +00:00
parent 90a508808e
commit 2af6f22bd4
12 changed files with 60 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/AuthTestController.java
View file

@ -11,10 +11,9 @@ import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
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.ServletPolicyList; import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision; import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
@ -32,8 +31,7 @@ public class AuthTestController extends VitroHttpServlet {
public void doGet(HttpServletRequest req, HttpServletResponse res ) public void doGet(HttpServletRequest req, HttpServletResponse res )
throws IOException, ServletException{ throws IOException, ServletException{
super.doGet(req,res); super.doGet(req,res);
HttpSession session = req.getSession(false); IdentifierBundle ids = RequestIdentifiers.getIdBundleForRequest(req);
IdentifierBundle ids = ServletIdentifierBundleFactory.getIdBundleForRequest(req,session,getServletContext());
ServletOutputStream out = res.getOutputStream(); ServletOutputStream out = res.getOutputStream();
listIdentifiers(out,ids); listIdentifiers(out,ids);

14
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/AuthorizationHelper.java
View file

@ -3,14 +3,12 @@
package edu.cornell.mannlib.vitro.webapp.auth; package edu.cornell.mannlib.vitro.webapp.auth;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
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 edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle;
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;
@ -73,15 +71,7 @@ public class AuthorizationHelper {
} }
private IdentifierBundle getIdentifiers() { private IdentifierBundle getIdentifiers() {
HttpSession session = vreq.getSession(); return RequestIdentifiers.getIdBundleForRequest(vreq);
ServletContext context = session.getServletContext();
IdentifierBundle ids = ServletIdentifierBundleFactory
.getIdBundleForRequest(vreq, session, context);
if (ids == null) {
return new ArrayIdentifierBundle();
} else {
return ids;
}
} }
} }

13
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/SelfEditing2RoleIdentifierFactory.java
View file

@ -3,18 +3,10 @@
package edu.cornell.mannlib.vitro.webapp.auth.identifier; package edu.cornell.mannlib.vitro.webapp.auth.identifier;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.ontology.OntModel;
import edu.cornell.mannlib.vitro.webapp.auth.policy.RoleBasedPolicy.AuthRole; import edu.cornell.mannlib.vitro.webapp.auth.policy.RoleBasedPolicy.AuthRole;
import edu.cornell.mannlib.vitro.webapp.auth.policy.setup.SelfEditingPolicySetup;
import edu.cornell.mannlib.vitro.webapp.beans.User; import edu.cornell.mannlib.vitro.webapp.beans.User;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
@ -34,9 +26,10 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
public class SelfEditing2RoleIdentifierFactory implements public class SelfEditing2RoleIdentifierFactory implements
IdentifierBundleFactory { IdentifierBundleFactory {
public IdentifierBundle getIdentifierBundle(ServletRequest request, @Override
public IdentifierBundle getIdentifierBundle(ServletRequest request,
HttpSession session, ServletContext context) { HttpSession session, ServletContext context) {
IdentifierBundle whoToAuth = ServletIdentifierBundleFactory.getExistingIdBundle(request); IdentifierBundle whoToAuth = RequestIdentifiers.getIdBundleForRequest(request);
if( whoToAuth != null ){ if( whoToAuth != null ){
WebappDaoFactory wdf = (WebappDaoFactory)context.getAttribute("webappDaoFactory"); WebappDaoFactory wdf = (WebappDaoFactory)context.getAttribute("webappDaoFactory");
if( wdf == null ) if( wdf == null )

12
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/SetupFakeSelfEditingIdentifierFactory.java
View file

@ -2,7 +2,6 @@
package edu.cornell.mannlib.vitro.webapp.auth.identifier; package edu.cornell.mannlib.vitro.webapp.auth.identifier;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener; import javax.servlet.ServletContextListener;
@ -15,9 +14,8 @@ public class SetupFakeSelfEditingIdentifierFactory implements ServletContextList
private static final Log log = LogFactory.getLog(SetupFakeSelfEditingIdentifierFactory.class.getName()); private static final Log log = LogFactory.getLog(SetupFakeSelfEditingIdentifierFactory.class.getName());
public void contextInitialized(ServletContextEvent sce) { @Override
ServletContext sc = sce.getServletContext(); public void contextInitialized(ServletContextEvent sce) {
WebappDaoFactory wdf = (WebappDaoFactory)sce.getServletContext().getAttribute("webappDaoFactory"); WebappDaoFactory wdf = (WebappDaoFactory)sce.getServletContext().getAttribute("webappDaoFactory");
if( wdf == null ){ if( wdf == null ){
log.debug("SetupFakeSelfEditingIdentifierFactory: need a " + log.debug("SetupFakeSelfEditingIdentifierFactory: need a " +
@ -27,9 +25,11 @@ public class SetupFakeSelfEditingIdentifierFactory implements ServletContextList
} }
IdentifierBundleFactory ibfToAdd = new FakeSelfEditingIdentifierFactory(); IdentifierBundleFactory ibfToAdd = new FakeSelfEditingIdentifierFactory();
ServletIdentifierBundleFactory.addIdentifierBundleFactory(sc, ibfToAdd); ActiveIdentifierBundleFactories.addFactory(sce, ibfToAdd);
} }
public void contextDestroyed(ServletContextEvent sce) { @Override
public void contextDestroyed(ServletContextEvent sce) {
// Nothing to do.
} }
} }

10
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/UserToIndIdentifierFactorySetup.java
View file

@ -2,7 +2,6 @@
package edu.cornell.mannlib.vitro.webapp.auth.identifier; package edu.cornell.mannlib.vitro.webapp.auth.identifier;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener; import javax.servlet.ServletContextListener;
@ -23,18 +22,19 @@ import edu.cornell.mannlib.vitro.webapp.servlet.setup.AbortStartup;
public class UserToIndIdentifierFactorySetup implements ServletContextListener{ public class UserToIndIdentifierFactorySetup implements ServletContextListener{
private static final Log log = LogFactory.getLog(UserToIndIdentifierFactorySetup.class.getName()); private static final Log log = LogFactory.getLog(UserToIndIdentifierFactorySetup.class.getName());
@Override
public void contextInitialized(ServletContextEvent sce) { public void contextInitialized(ServletContextEvent sce) {
if (AbortStartup.isStartupAborted(sce.getServletContext())) { if (AbortStartup.isStartupAborted(sce.getServletContext())) {
return; return;
} }
ServletContext sc = sce.getServletContext(); ActiveIdentifierBundleFactories.addFactory(sce, new UserToIndIdentifierFactory());
ServletIdentifierBundleFactory log.info("Set up Identifier Factory UserToIndIdentifierFactory.");
.addIdentifierBundleFactory(sc, new UserToIndIdentifierFactory());
log.info("Set up Identifier Factory UserToIndIdentifierFactory.");
} }
@Override
public void contextDestroyed(ServletContextEvent arg0) { public void contextDestroyed(ServletContextEvent arg0) {
// Nothing to do.
} }
} }

16
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/JenaNetidPolicy.java
View file

@ -23,10 +23,10 @@ import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver; import com.thoughtworks.xstream.io.xml.DomDriver;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier; import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
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.SelfEditingIdentifierFactory; import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory.NetId; import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory.NetId;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization; import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.DefaultInconclusivePolicy; import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.DefaultInconclusivePolicy;
@ -39,8 +39,6 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.admin.RemoveUser;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.admin.ServerStatus; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.admin.ServerStatus;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.admin.UpdateTextIndex; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.admin.UpdateTextIndex;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.admin.UploadFile; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.admin.UploadFile;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.AdminRequestedAction;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.OntoRequestedAction;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ontology.CreateOwlClass; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ontology.CreateOwlClass;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ontology.DefineDataProperty; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ontology.DefineDataProperty;
@ -367,10 +365,8 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
* *
*/ */
public class ContextSetup implements ServletContextListener { public class ContextSetup implements ServletContextListener {
@Override
public void contextInitialized(ServletContextEvent sce) {
public void contextInitialized(ServletContextEvent sce) {
try{ try{
log.trace("Setting up JenaNetidPolicy"); log.trace("Setting up JenaNetidPolicy");
@ -383,14 +379,14 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
ServletPolicyList spl = ServletPolicyList.getPolicies(sce.getServletContext()); ServletPolicyList spl = ServletPolicyList.getPolicies(sce.getServletContext());
spl.add(jnip); spl.add(jnip);
SelfEditingIdentifierFactory niif =new SelfEditingIdentifierFactory(); ActiveIdentifierBundleFactories.addFactory(sce, new SelfEditingIdentifierFactory());
ServletIdentifierBundleFactory.addIdentifierBundleFactory(sce.getServletContext(), niif);
}catch(Exception e){ }catch(Exception e){
log.error("could not create AuthorizationFactory: " + e); log.error("could not create AuthorizationFactory: " + e);
e.printStackTrace(); e.printStackTrace();
} }
} }
public void contextDestroyed(ServletContextEvent sce) { /*nothing*/ } @Override
public void contextDestroyed(ServletContextEvent sce) { /*nothing*/ }
} }

14
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/CuratorEditingPolicySetup.java
View file

@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.auth.policy.setup;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashSet; import java.util.HashSet;
import java.util.ListIterator;
import java.util.Set; import java.util.Set;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
@ -20,12 +19,10 @@ import com.hp.hpl.jena.rdf.model.ResIterator;
import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import com.hp.hpl.jena.rdf.model.ResourceFactory;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.CuratorEditingIdentifierFactory; import edu.cornell.mannlib.vitro.webapp.auth.identifier.CuratorEditingIdentifierFactory;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundleFactory;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory;
import edu.cornell.mannlib.vitro.webapp.auth.policy.CuratorEditingPolicy; import edu.cornell.mannlib.vitro.webapp.auth.policy.CuratorEditingPolicy;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList; import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.VisitingPolicyIface;
import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean; import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
@ -44,7 +41,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
public class CuratorEditingPolicySetup implements ServletContextListener { public class CuratorEditingPolicySetup implements ServletContextListener {
private static final Log log = LogFactory.getLog(CuratorEditingPolicySetup.class.getName()); private static final Log log = LogFactory.getLog(CuratorEditingPolicySetup.class.getName());
public void contextInitialized(ServletContextEvent sce) { @Override
public void contextInitialized(ServletContextEvent sce) {
try{ try{
log.debug("Setting up CuratorEditingPolicy"); log.debug("Setting up CuratorEditingPolicy");
@ -54,8 +52,7 @@ public class CuratorEditingPolicySetup implements ServletContextListener {
ServletPolicyList.addPolicy(sce.getServletContext(), cep); ServletPolicyList.addPolicy(sce.getServletContext(), cep);
//need to put an IdentifierFactory for CuratorEditingIds into the ServletContext //need to put an IdentifierFactory for CuratorEditingIds into the ServletContext
IdentifierBundleFactory ibfToAdd = new CuratorEditingIdentifierFactory(); ActiveIdentifierBundleFactories.addFactory(sce, new CuratorEditingIdentifierFactory());
ServletIdentifierBundleFactory.addIdentifierBundleFactory(sce.getServletContext(), ibfToAdd);
log.debug( "Finished setting up CuratorEditingPolicy: " + cep ); log.debug( "Finished setting up CuratorEditingPolicy: " + cep );
}catch(Exception e){ }catch(Exception e){
@ -64,7 +61,8 @@ public class CuratorEditingPolicySetup implements ServletContextListener {
} }
} }
public void contextDestroyed(ServletContextEvent sce) { /*nothing*/ } @Override
public void contextDestroyed(ServletContextEvent sce) { /*nothing*/ }
public static CuratorEditingPolicy makeCuratorEditPolicyFromModel( Model model ){ public static CuratorEditingPolicy makeCuratorEditPolicyFromModel( Model model ){
CuratorEditingPolicy pol = null; CuratorEditingPolicy pol = null;

15
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/DbAdminEditingPolicySetup.java
View file

@ -3,7 +3,6 @@
package edu.cornell.mannlib.vitro.webapp.auth.policy.setup; package edu.cornell.mannlib.vitro.webapp.auth.policy.setup;
import java.util.HashSet; import java.util.HashSet;
import java.util.ListIterator;
import java.util.Set; import java.util.Set;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
@ -19,13 +18,10 @@ import com.hp.hpl.jena.rdf.model.ResIterator;
import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import com.hp.hpl.jena.rdf.model.ResourceFactory;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.DbAdminEditingIdentifierFactory; import edu.cornell.mannlib.vitro.webapp.auth.identifier.DbAdminEditingIdentifierFactory;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundleFactory;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory;
import edu.cornell.mannlib.vitro.webapp.auth.policy.DbAdminEditingPolicy; import edu.cornell.mannlib.vitro.webapp.auth.policy.DbAdminEditingPolicy;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList; import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.VisitingPolicyIface;
import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean; import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
@ -44,7 +40,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
public class DbAdminEditingPolicySetup implements ServletContextListener { public class DbAdminEditingPolicySetup implements ServletContextListener {
private static final Log log = LogFactory.getLog(DbAdminEditingPolicySetup.class.getName()); private static final Log log = LogFactory.getLog(DbAdminEditingPolicySetup.class.getName());
public void contextInitialized(ServletContextEvent sce) { @Override
public void contextInitialized(ServletContextEvent sce) {
try{ try{
log.debug("Setting up DbAdminEditingPolicy"); log.debug("Setting up DbAdminEditingPolicy");
@ -54,8 +51,7 @@ public class DbAdminEditingPolicySetup implements ServletContextListener {
ServletPolicyList.addPolicy(sce.getServletContext(), cep); ServletPolicyList.addPolicy(sce.getServletContext(), cep);
//need to put an IdentifierFactory for DbAdminEditingIds into the ServletContext //need to put an IdentifierFactory for DbAdminEditingIds into the ServletContext
IdentifierBundleFactory ibfToAdd = new DbAdminEditingIdentifierFactory(); ActiveIdentifierBundleFactories.addFactory(sce, new DbAdminEditingIdentifierFactory());
ServletIdentifierBundleFactory.addIdentifierBundleFactory(sce.getServletContext(), ibfToAdd);
log.debug( "Finished setting up DbAdminEditingPolicy: " + cep ); log.debug( "Finished setting up DbAdminEditingPolicy: " + cep );
}catch(Exception e){ }catch(Exception e){
@ -64,7 +60,8 @@ public class DbAdminEditingPolicySetup implements ServletContextListener {
} }
} }
public void contextDestroyed(ServletContextEvent sce) { /*nothing*/ } @Override
public void contextDestroyed(ServletContextEvent sce) { /*nothing*/ }
public static DbAdminEditingPolicy makeDbAdminEditPolicyFromModel( Model model ){ public static DbAdminEditingPolicy makeDbAdminEditPolicyFromModel( Model model ){
DbAdminEditingPolicy pol = null; DbAdminEditingPolicy pol = null;

16
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/EditorEditingPolicySetup.java
View file

@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.auth.policy.setup;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashSet; import java.util.HashSet;
import java.util.ListIterator;
import java.util.Set; import java.util.Set;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
@ -20,14 +19,10 @@ import com.hp.hpl.jena.rdf.model.ResIterator;
import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import com.hp.hpl.jena.rdf.model.ResourceFactory;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.EditorEditingIdentifierFactory; import edu.cornell.mannlib.vitro.webapp.auth.identifier.EditorEditingIdentifierFactory;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundleFactory;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory;
import edu.cornell.mannlib.vitro.webapp.auth.policy.EditorEditingPolicy; import edu.cornell.mannlib.vitro.webapp.auth.policy.EditorEditingPolicy;
import edu.cornell.mannlib.vitro.webapp.auth.policy.SelfEditingPolicy;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList; import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.VisitingPolicyIface;
import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean; import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
@ -46,7 +41,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
public class EditorEditingPolicySetup implements ServletContextListener { public class EditorEditingPolicySetup implements ServletContextListener {
private static final Log log = LogFactory.getLog(EditorEditingPolicySetup.class.getName()); private static final Log log = LogFactory.getLog(EditorEditingPolicySetup.class.getName());
public void contextInitialized(ServletContextEvent sce) { @Override
public void contextInitialized(ServletContextEvent sce) {
try{ try{
log.debug("Setting up EditorEditingPolicy"); log.debug("Setting up EditorEditingPolicy");
@ -56,8 +52,7 @@ public class EditorEditingPolicySetup implements ServletContextListener {
ServletPolicyList.addPolicy(sce.getServletContext(), cep); ServletPolicyList.addPolicy(sce.getServletContext(), cep);
//need to put an IdentifierFactory for EditorEditingIds into the ServletContext //need to put an IdentifierFactory for EditorEditingIds into the ServletContext
IdentifierBundleFactory ibfToAdd = new EditorEditingIdentifierFactory(); ActiveIdentifierBundleFactories.addFactory(sce, new EditorEditingIdentifierFactory());
ServletIdentifierBundleFactory.addIdentifierBundleFactory(sce.getServletContext(), ibfToAdd);
log.debug( "Finished setting up EditorEditingPolicy: " + cep ); log.debug( "Finished setting up EditorEditingPolicy: " + cep );
}catch(Exception e){ }catch(Exception e){
@ -66,7 +61,8 @@ public class EditorEditingPolicySetup implements ServletContextListener {
} }
} }
public void contextDestroyed(ServletContextEvent sce) { /*nothing*/ } @Override
public void contextDestroyed(ServletContextEvent sce) { /*nothing*/ }
public static EditorEditingPolicy makeEditorEditPolicyFromModel( Model model ){ public static EditorEditingPolicy makeEditorEditPolicyFromModel( Model model ){
EditorEditingPolicy pol = null; EditorEditingPolicy pol = null;

10
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/JenaNetidPolicySetup.java
View file

@ -10,8 +10,8 @@ import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.ontology.OntModel;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories;
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.ServletIdentifierBundleFactory;
import edu.cornell.mannlib.vitro.webapp.auth.policy.JenaNetidPolicy; import edu.cornell.mannlib.vitro.webapp.auth.policy.JenaNetidPolicy;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList; import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
@ -29,7 +29,8 @@ public class JenaNetidPolicySetup implements ServletContextListener {
private static final Log log = LogFactory.getLog(JenaNetidPolicySetup.class.getName()); private static final Log log = LogFactory.getLog(JenaNetidPolicySetup.class.getName());
public void contextInitialized(ServletContextEvent sce) { @Override
public void contextInitialized(ServletContextEvent sce) {
try{ try{
log.debug("Setting up JenaNetidPolicy"); log.debug("Setting up JenaNetidPolicy");
@ -37,7 +38,7 @@ public class JenaNetidPolicySetup implements ServletContextListener {
ServletPolicyList.addPolicy(sce.getServletContext(), jnip); ServletPolicyList.addPolicy(sce.getServletContext(), jnip);
SelfEditingIdentifierFactory niif =new SelfEditingIdentifierFactory(); SelfEditingIdentifierFactory niif =new SelfEditingIdentifierFactory();
ServletIdentifierBundleFactory.addIdentifierBundleFactory(sce.getServletContext(), niif); ActiveIdentifierBundleFactories.addFactory(sce, niif);
}catch(Exception e){ }catch(Exception e){
log.error("could not create AuthorizationFactory: " + e); log.error("could not create AuthorizationFactory: " + e);
@ -45,7 +46,8 @@ public class JenaNetidPolicySetup implements ServletContextListener {
} }
} }
public void contextDestroyed(ServletContextEvent sce) { @Override
public void contextDestroyed(ServletContextEvent sce) {
/*nothing*/ /*nothing*/
} }

13
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/SelfEditing2RoleIdentifierSetup.java
View file

@ -8,8 +8,8 @@ import javax.servlet.ServletContextListener;
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.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditing2RoleIdentifierFactory; import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditing2RoleIdentifierFactory;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory;
/** /**
* Add the SelfEditing2RoleIdentifier factory to the IdentifierFactory list * Add the SelfEditing2RoleIdentifier factory to the IdentifierFactory list
@ -29,17 +29,16 @@ public class SelfEditing2RoleIdentifierSetup implements ServletContextListener{
private static final Log log = LogFactory.getLog(SelfEditing2RoleIdentifierSetup.class.getName()); private static final Log log = LogFactory.getLog(SelfEditing2RoleIdentifierSetup.class.getName());
public void contextDestroyed(ServletContextEvent sce) { @Override
public void contextDestroyed(ServletContextEvent sce) {
//do nothing //do nothing
} }
public void contextInitialized(ServletContextEvent sce) { @Override
public void contextInitialized(ServletContextEvent sce) {
try{ try{
log.debug("Setting up SelfEditing2RoleIdentifier"); log.debug("Setting up SelfEditing2RoleIdentifier");
ActiveIdentifierBundleFactories.addFactory(sce, new SelfEditing2RoleIdentifierFactory());
SelfEditing2RoleIdentifierFactory niif =new SelfEditing2RoleIdentifierFactory();
ServletIdentifierBundleFactory.addIdentifierBundleFactory(sce.getServletContext(), niif);
log.debug( "SelfEditing2RoleIdentifier has been setup. " ); log.debug( "SelfEditing2RoleIdentifier has been setup. " );
}catch(Exception e){ }catch(Exception e){
log.error("could not run SelfEditing2RoleIdentifier: " + e); log.error("could not run SelfEditing2RoleIdentifier: " + e);

16
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/SelfEditingPolicySetup.java
View file

@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.auth.policy.setup;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashSet; import java.util.HashSet;
import java.util.ListIterator;
import java.util.Set; import java.util.Set;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
@ -15,17 +14,14 @@ 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 com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ResIterator; import com.hp.hpl.jena.rdf.model.ResIterator;
import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import com.hp.hpl.jena.rdf.model.ResourceFactory;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories;
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.ServletIdentifierBundleFactory;
import edu.cornell.mannlib.vitro.webapp.auth.policy.SelfEditingPolicy; import edu.cornell.mannlib.vitro.webapp.auth.policy.SelfEditingPolicy;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList; import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.VisitingPolicyIface;
import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean; import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
@ -51,16 +47,15 @@ public class SelfEditingPolicySetup implements ServletContextListener {
private static final Log log = LogFactory.getLog(SelfEditingPolicySetup.class.getName()); private static final Log log = LogFactory.getLog(SelfEditingPolicySetup.class.getName());
public static final String SELF_EDITING_POLICY_WAS_SETUP= "selfEditingPolicyWasSetup"; public static final String SELF_EDITING_POLICY_WAS_SETUP= "selfEditingPolicyWasSetup";
public void contextInitialized(ServletContextEvent sce) { @Override
public void contextInitialized(ServletContextEvent sce) {
try{ try{
log.debug("Setting up SelfEditingPolicy"); log.debug("Setting up SelfEditingPolicy");
OntModel model = (OntModel)sce.getServletContext().getAttribute("jenaOntModel"); OntModel model = (OntModel)sce.getServletContext().getAttribute("jenaOntModel");
replaceSelfEditing(sce.getServletContext(), model); replaceSelfEditing(sce.getServletContext(), model);
ActiveIdentifierBundleFactories.addFactory(sce, new SelfEditingIdentifierFactory());
SelfEditingIdentifierFactory niif =new SelfEditingIdentifierFactory();
ServletIdentifierBundleFactory.addIdentifierBundleFactory(sce.getServletContext(), niif);
sce.getServletContext().setAttribute(SELF_EDITING_POLICY_WAS_SETUP, Boolean.TRUE); sce.getServletContext().setAttribute(SELF_EDITING_POLICY_WAS_SETUP, Boolean.TRUE);
@ -71,7 +66,8 @@ public class SelfEditingPolicySetup implements ServletContextListener {
} }
} }
public void contextDestroyed(ServletContextEvent sce) { /*nothing*/ } @Override
public void contextDestroyed(ServletContextEvent sce) { /*nothing*/ }
public static SelfEditingPolicy makeSelfEditPolicyFromModel( OntModel model ){ public static SelfEditingPolicy makeSelfEditPolicyFromModel( OntModel model ){
SelfEditingPolicy pol = null; SelfEditingPolicy pol = null;