diff --git a/webapp/web/admin/showids.jsp b/webapp/web/admin/showids.jsp
index 10f39b26d..5bfa0a611 100644
--- a/webapp/web/admin/showids.jsp
+++ b/webapp/web/admin/showids.jsp
@@ -1,13 +1,13 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%@page
- import="edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory"%>
+ import="edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers"%>
<%@page
import="java.util.List"%>
<%
- List idb = ServletIdentifierBundleFactory.getIdBundleForRequest(request, session, application);
+ List idb = RequestIdentifiers.getIdBundleForRequest(request);
out.write("");
out.write("Identifiers in effect:
");
diff --git a/webapp/web/edit/forms/propDelete.jsp b/webapp/web/edit/forms/propDelete.jsp
index e2bf17fe5..b7d671be2 100644
--- a/webapp/web/edit/forms/propDelete.jsp
+++ b/webapp/web/edit/forms/propDelete.jsp
@@ -2,7 +2,6 @@
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle"%>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory.SelfEditing"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.RoleIdentifier"%>
diff --git a/webapp/web/edit/n3Delete.jsp b/webapp/web/edit/n3Delete.jsp
index b5452451b..d51ca703b 100644
--- a/webapp/web/edit/n3Delete.jsp
+++ b/webapp/web/edit/n3Delete.jsp
@@ -31,7 +31,6 @@
<%@page import="org.apache.commons.fileupload.disk.DiskFileItemFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle"%>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.RoleIdentifier"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditN3Utils"%>
diff --git a/webapp/web/edit/processDatapropRdfForm.jsp b/webapp/web/edit/processDatapropRdfForm.jsp
index a2b5fbea9..591208aff 100644
--- a/webapp/web/edit/processDatapropRdfForm.jsp
+++ b/webapp/web/edit/processDatapropRdfForm.jsp
@@ -24,7 +24,6 @@
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.RdfLiteralHash"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.beans.DataProperty"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle"%>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.RoleIdentifier"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent"%>
diff --git a/webapp/web/edit/processRdfForm2.jsp b/webapp/web/edit/processRdfForm2.jsp
index e7a86fb9f..bbaf193c1 100644
--- a/webapp/web/edit/processRdfForm2.jsp
+++ b/webapp/web/edit/processRdfForm2.jsp
@@ -32,7 +32,6 @@
<%@page import="org.apache.commons.fileupload.disk.DiskFileItemFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle"%>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.RoleIdentifier"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditN3Utils"%>
diff --git a/webapp/web/edit/selfeditcheck.jsp b/webapp/web/edit/selfeditcheck.jsp
index 5a16f6a20..36e2ce950 100644
--- a/webapp/web/edit/selfeditcheck.jsp
+++ b/webapp/web/edit/selfeditcheck.jsp
@@ -10,9 +10,9 @@
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory.NetId"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory.SelfEditing"%>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle"%>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers"%>
<%@page import="java.io.IOException"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundleFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList"%>
@@ -26,26 +26,12 @@
SelfEditing Sanity Check
-Is there a Factory that will create self editing identifiers?
-<%
- ServletIdentifierBundleFactory sibf = ServletIdentifierBundleFactory.getIdentifierBundleFactory(application);
-String found = "Self editing identifier factory found.";
-for( IdentifierBundleFactory ibf : sibf ){
- if( ibf instanceof SelfEditingIdentifierFactory ){
- found = "Found a self editing identifier factory.";
- break;
- }
-}
-%>
-<%= found %>
-
-
Is there a self editing policy in the context?
<%
ServletPolicyList spl = ServletPolicyList.getPolicies(application);
SelfEditingPolicy sePolicy = null;
ListIterator it = spl.listIterator();
-found = "Could not find a SelfEditingPolicy";
+String found = "Could not find a SelfEditingPolicy";
while(it.hasNext()){
PolicyIface p = (PolicyIface)it.next();
if( p instanceof SelfEditingPolicy ){
@@ -70,19 +56,15 @@ if( user != null && user.length() > 0){
SelfEditingIdentifierFactory.SelfEditing selfEditingId = null;
IdentifierBundle ib = null;
if( user != null && user.length() > 0){
- ib = sibf.getIdentifierBundle(request,session,application);
- if( ib != null ) {
- for( Object obj : ib){
- if( obj instanceof SelfEditingIdentifierFactory.SelfEditing )
- selfEditingId = (SelfEditingIdentifierFactory.SelfEditing) obj;
- }
- if( selfEditingId != null )
- found = "found a SelfEditingId " + selfEditingId.getValue();
- else
- found = "Cound not find a SelfEditingId";
- }else{
- found = "Could not get any identififers";
- }
+ ib = RequestIdentifiers.getIdBundleForRequest(request);
+ for( Object obj : ib){
+ if( obj instanceof SelfEditingIdentifierFactory.SelfEditing )
+ selfEditingId = (SelfEditingIdentifierFactory.SelfEditing) obj;
+ }
+ if( selfEditingId != null )
+ found = "found a SelfEditingId " + selfEditingId.getValue();
+ else
+ found = "Cound not find a SelfEditingId";
%>
<%= found %>
<%}else{%>