From 2af6f22bd46ec774da036d395961bc472ccda6db Mon Sep 17 00:00:00 2001 From: jeb228 Date: Tue, 8 Mar 2011 17:41:19 +0000 Subject: [PATCH] NIHVIVO-2211 Replace ServletIdentifierBundleFactory with ActiveIdentifierBundleFactories and RequestIdentifiers. --- .../vitro/webapp/auth/AuthTestController.java | 6 ++---- .../vitro/webapp/auth/AuthorizationHelper.java | 14 ++------------ .../SelfEditing2RoleIdentifierFactory.java | 13 +++---------- .../SetupFakeSelfEditingIdentifierFactory.java | 12 ++++++------ .../UserToIndIdentifierFactorySetup.java | 10 +++++----- .../webapp/auth/policy/JenaNetidPolicy.java | 16 ++++++---------- .../policy/setup/CuratorEditingPolicySetup.java | 14 ++++++-------- .../policy/setup/DbAdminEditingPolicySetup.java | 15 ++++++--------- .../policy/setup/EditorEditingPolicySetup.java | 16 ++++++---------- .../auth/policy/setup/JenaNetidPolicySetup.java | 10 ++++++---- .../setup/SelfEditing2RoleIdentifierSetup.java | 13 ++++++------- .../policy/setup/SelfEditingPolicySetup.java | 16 ++++++---------- 12 files changed, 60 insertions(+), 95 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/AuthTestController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/AuthTestController.java index 7b0f6f650..0bba54e34 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/AuthTestController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/AuthTestController.java @@ -11,10 +11,9 @@ import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; 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.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.ifaces.PolicyDecision; 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 ) throws IOException, ServletException{ super.doGet(req,res); - HttpSession session = req.getSession(false); - IdentifierBundle ids = ServletIdentifierBundleFactory.getIdBundleForRequest(req,session,getServletContext()); + IdentifierBundle ids = RequestIdentifiers.getIdBundleForRequest(req); ServletOutputStream out = res.getOutputStream(); listIdentifiers(out,ids); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/AuthorizationHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/AuthorizationHelper.java index 30fbc1574..55fe07223 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/AuthorizationHelper.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/AuthorizationHelper.java @@ -3,14 +3,12 @@ package edu.cornell.mannlib.vitro.webapp.auth; import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; 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.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.RequestPolicyList; import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList; @@ -73,15 +71,7 @@ public class AuthorizationHelper { } private IdentifierBundle getIdentifiers() { - HttpSession session = vreq.getSession(); - ServletContext context = session.getServletContext(); - IdentifierBundle ids = ServletIdentifierBundleFactory - .getIdBundleForRequest(vreq, session, context); - if (ids == null) { - return new ArrayIdentifierBundle(); - } else { - return ids; - } + return RequestIdentifiers.getIdBundleForRequest(vreq); } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/SelfEditing2RoleIdentifierFactory.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/SelfEditing2RoleIdentifierFactory.java index dcea81aa8..203726b44 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/SelfEditing2RoleIdentifierFactory.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/SelfEditing2RoleIdentifierFactory.java @@ -3,18 +3,10 @@ package edu.cornell.mannlib.vitro.webapp.auth.identifier; import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; import javax.servlet.ServletRequest; 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.setup.SelfEditingPolicySetup; import edu.cornell.mannlib.vitro.webapp.beans.User; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; @@ -34,9 +26,10 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; public class SelfEditing2RoleIdentifierFactory implements IdentifierBundleFactory { - public IdentifierBundle getIdentifierBundle(ServletRequest request, + @Override + public IdentifierBundle getIdentifierBundle(ServletRequest request, HttpSession session, ServletContext context) { - IdentifierBundle whoToAuth = ServletIdentifierBundleFactory.getExistingIdBundle(request); + IdentifierBundle whoToAuth = RequestIdentifiers.getIdBundleForRequest(request); if( whoToAuth != null ){ WebappDaoFactory wdf = (WebappDaoFactory)context.getAttribute("webappDaoFactory"); if( wdf == null ) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/SetupFakeSelfEditingIdentifierFactory.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/SetupFakeSelfEditingIdentifierFactory.java index a2d18c369..22590770b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/SetupFakeSelfEditingIdentifierFactory.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/SetupFakeSelfEditingIdentifierFactory.java @@ -2,7 +2,6 @@ package edu.cornell.mannlib.vitro.webapp.auth.identifier; -import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; @@ -15,9 +14,8 @@ public class SetupFakeSelfEditingIdentifierFactory implements ServletContextList private static final Log log = LogFactory.getLog(SetupFakeSelfEditingIdentifierFactory.class.getName()); - public void contextInitialized(ServletContextEvent sce) { - ServletContext sc = sce.getServletContext(); - + @Override + public void contextInitialized(ServletContextEvent sce) { WebappDaoFactory wdf = (WebappDaoFactory)sce.getServletContext().getAttribute("webappDaoFactory"); if( wdf == null ){ log.debug("SetupFakeSelfEditingIdentifierFactory: need a " + @@ -27,9 +25,11 @@ public class SetupFakeSelfEditingIdentifierFactory implements ServletContextList } 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. } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/UserToIndIdentifierFactorySetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/UserToIndIdentifierFactorySetup.java index 067fb5200..7ee015260 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/UserToIndIdentifierFactorySetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/UserToIndIdentifierFactorySetup.java @@ -2,7 +2,6 @@ package edu.cornell.mannlib.vitro.webapp.auth.identifier; -import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; @@ -23,18 +22,19 @@ import edu.cornell.mannlib.vitro.webapp.servlet.setup.AbortStartup; public class UserToIndIdentifierFactorySetup implements ServletContextListener{ private static final Log log = LogFactory.getLog(UserToIndIdentifierFactorySetup.class.getName()); + @Override public void contextInitialized(ServletContextEvent sce) { if (AbortStartup.isStartupAborted(sce.getServletContext())) { return; } - ServletContext sc = sce.getServletContext(); - ServletIdentifierBundleFactory - .addIdentifierBundleFactory(sc, new UserToIndIdentifierFactory()); - log.info("Set up Identifier Factory UserToIndIdentifierFactory."); + ActiveIdentifierBundleFactories.addFactory(sce, new UserToIndIdentifierFactory()); + log.info("Set up Identifier Factory UserToIndIdentifierFactory."); } + @Override public void contextDestroyed(ServletContextEvent arg0) { + // Nothing to do. } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/JenaNetidPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/JenaNetidPolicy.java index 583aa804f..13e41965f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/JenaNetidPolicy.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/JenaNetidPolicy.java @@ -23,10 +23,10 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import com.thoughtworks.xstream.XStream; 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.IdentifierBundle; 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.policy.ifaces.Authorization; 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.UpdateTextIndex; 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.ontology.CreateOwlClass; 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 void contextInitialized(ServletContextEvent sce) { + @Override + public void contextInitialized(ServletContextEvent sce) { try{ log.trace("Setting up JenaNetidPolicy"); @@ -383,14 +379,14 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti ServletPolicyList spl = ServletPolicyList.getPolicies(sce.getServletContext()); spl.add(jnip); - SelfEditingIdentifierFactory niif =new SelfEditingIdentifierFactory(); - ServletIdentifierBundleFactory.addIdentifierBundleFactory(sce.getServletContext(), niif); + ActiveIdentifierBundleFactories.addFactory(sce, new SelfEditingIdentifierFactory()); }catch(Exception e){ log.error("could not create AuthorizationFactory: " + e); e.printStackTrace(); } } - public void contextDestroyed(ServletContextEvent sce) { /*nothing*/ } + @Override + public void contextDestroyed(ServletContextEvent sce) { /*nothing*/ } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/CuratorEditingPolicySetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/CuratorEditingPolicySetup.java index 067eac751..8685ecabe 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/CuratorEditingPolicySetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/CuratorEditingPolicySetup.java @@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.auth.policy.setup; import java.util.EnumSet; import java.util.HashSet; -import java.util.ListIterator; import java.util.Set; 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.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.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.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.dao.VitroVocabulary; @@ -44,7 +41,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; public class CuratorEditingPolicySetup implements ServletContextListener { private static final Log log = LogFactory.getLog(CuratorEditingPolicySetup.class.getName()); - public void contextInitialized(ServletContextEvent sce) { + @Override + public void contextInitialized(ServletContextEvent sce) { try{ log.debug("Setting up CuratorEditingPolicy"); @@ -54,8 +52,7 @@ public class CuratorEditingPolicySetup implements ServletContextListener { ServletPolicyList.addPolicy(sce.getServletContext(), cep); //need to put an IdentifierFactory for CuratorEditingIds into the ServletContext - IdentifierBundleFactory ibfToAdd = new CuratorEditingIdentifierFactory(); - ServletIdentifierBundleFactory.addIdentifierBundleFactory(sce.getServletContext(), ibfToAdd); + ActiveIdentifierBundleFactories.addFactory(sce, new CuratorEditingIdentifierFactory()); log.debug( "Finished setting up CuratorEditingPolicy: " + cep ); }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 ){ CuratorEditingPolicy pol = null; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/DbAdminEditingPolicySetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/DbAdminEditingPolicySetup.java index 659a35c3f..951a8a134 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/DbAdminEditingPolicySetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/DbAdminEditingPolicySetup.java @@ -3,7 +3,6 @@ package edu.cornell.mannlib.vitro.webapp.auth.policy.setup; import java.util.HashSet; -import java.util.ListIterator; import java.util.Set; 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.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.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.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.dao.VitroVocabulary; @@ -44,7 +40,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; public class DbAdminEditingPolicySetup implements ServletContextListener { private static final Log log = LogFactory.getLog(DbAdminEditingPolicySetup.class.getName()); - public void contextInitialized(ServletContextEvent sce) { + @Override + public void contextInitialized(ServletContextEvent sce) { try{ log.debug("Setting up DbAdminEditingPolicy"); @@ -54,8 +51,7 @@ public class DbAdminEditingPolicySetup implements ServletContextListener { ServletPolicyList.addPolicy(sce.getServletContext(), cep); //need to put an IdentifierFactory for DbAdminEditingIds into the ServletContext - IdentifierBundleFactory ibfToAdd = new DbAdminEditingIdentifierFactory(); - ServletIdentifierBundleFactory.addIdentifierBundleFactory(sce.getServletContext(), ibfToAdd); + ActiveIdentifierBundleFactories.addFactory(sce, new DbAdminEditingIdentifierFactory()); log.debug( "Finished setting up DbAdminEditingPolicy: " + cep ); }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 ){ DbAdminEditingPolicy pol = null; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/EditorEditingPolicySetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/EditorEditingPolicySetup.java index 0163415bc..30101f26f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/EditorEditingPolicySetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/EditorEditingPolicySetup.java @@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.auth.policy.setup; import java.util.EnumSet; import java.util.HashSet; -import java.util.ListIterator; import java.util.Set; 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.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.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.SelfEditingPolicy; 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.dao.VitroVocabulary; @@ -46,7 +41,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; public class EditorEditingPolicySetup implements ServletContextListener { private static final Log log = LogFactory.getLog(EditorEditingPolicySetup.class.getName()); - public void contextInitialized(ServletContextEvent sce) { + @Override + public void contextInitialized(ServletContextEvent sce) { try{ log.debug("Setting up EditorEditingPolicy"); @@ -56,8 +52,7 @@ public class EditorEditingPolicySetup implements ServletContextListener { ServletPolicyList.addPolicy(sce.getServletContext(), cep); //need to put an IdentifierFactory for EditorEditingIds into the ServletContext - IdentifierBundleFactory ibfToAdd = new EditorEditingIdentifierFactory(); - ServletIdentifierBundleFactory.addIdentifierBundleFactory(sce.getServletContext(), ibfToAdd); + ActiveIdentifierBundleFactories.addFactory(sce, new EditorEditingIdentifierFactory()); log.debug( "Finished setting up EditorEditingPolicy: " + cep ); }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 ){ EditorEditingPolicy pol = null; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/JenaNetidPolicySetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/JenaNetidPolicySetup.java index 286e66520..29810e6de 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/JenaNetidPolicySetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/JenaNetidPolicySetup.java @@ -10,8 +10,8 @@ import org.apache.commons.logging.LogFactory; 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.ServletIdentifierBundleFactory; import edu.cornell.mannlib.vitro.webapp.auth.policy.JenaNetidPolicy; 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()); - public void contextInitialized(ServletContextEvent sce) { + @Override + public void contextInitialized(ServletContextEvent sce) { try{ log.debug("Setting up JenaNetidPolicy"); @@ -37,7 +38,7 @@ public class JenaNetidPolicySetup implements ServletContextListener { ServletPolicyList.addPolicy(sce.getServletContext(), jnip); SelfEditingIdentifierFactory niif =new SelfEditingIdentifierFactory(); - ServletIdentifierBundleFactory.addIdentifierBundleFactory(sce.getServletContext(), niif); + ActiveIdentifierBundleFactories.addFactory(sce, niif); }catch(Exception 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*/ } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/SelfEditing2RoleIdentifierSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/SelfEditing2RoleIdentifierSetup.java index 2a7f93376..001aa5608 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/SelfEditing2RoleIdentifierSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/SelfEditing2RoleIdentifierSetup.java @@ -8,8 +8,8 @@ import javax.servlet.ServletContextListener; import org.apache.commons.logging.Log; 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.ServletIdentifierBundleFactory; /** * 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()); - public void contextDestroyed(ServletContextEvent sce) { + @Override + public void contextDestroyed(ServletContextEvent sce) { //do nothing } - public void contextInitialized(ServletContextEvent sce) { + @Override + public void contextInitialized(ServletContextEvent sce) { try{ log.debug("Setting up SelfEditing2RoleIdentifier"); - - SelfEditing2RoleIdentifierFactory niif =new SelfEditing2RoleIdentifierFactory(); - ServletIdentifierBundleFactory.addIdentifierBundleFactory(sce.getServletContext(), niif); - + ActiveIdentifierBundleFactories.addFactory(sce, new SelfEditing2RoleIdentifierFactory()); log.debug( "SelfEditing2RoleIdentifier has been setup. " ); }catch(Exception e){ log.error("could not run SelfEditing2RoleIdentifier: " + e); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/SelfEditingPolicySetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/SelfEditingPolicySetup.java index ce124437c..a1271ee60 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/SelfEditingPolicySetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/SelfEditingPolicySetup.java @@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.auth.policy.setup; import java.util.EnumSet; import java.util.HashSet; -import java.util.ListIterator; import java.util.Set; import javax.servlet.ServletContext; @@ -15,17 +14,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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.Resource; 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.ServletIdentifierBundleFactory; 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.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.dao.VitroVocabulary; @@ -51,16 +47,15 @@ public class SelfEditingPolicySetup implements ServletContextListener { private static final Log log = LogFactory.getLog(SelfEditingPolicySetup.class.getName()); public static final String SELF_EDITING_POLICY_WAS_SETUP= "selfEditingPolicyWasSetup"; - public void contextInitialized(ServletContextEvent sce) { + @Override + public void contextInitialized(ServletContextEvent sce) { try{ log.debug("Setting up SelfEditingPolicy"); OntModel model = (OntModel)sce.getServletContext().getAttribute("jenaOntModel"); replaceSelfEditing(sce.getServletContext(), model); - - SelfEditingIdentifierFactory niif =new SelfEditingIdentifierFactory(); - ServletIdentifierBundleFactory.addIdentifierBundleFactory(sce.getServletContext(), niif); + ActiveIdentifierBundleFactories.addFactory(sce, new SelfEditingIdentifierFactory()); 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 ){ SelfEditingPolicy pol = null;