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:42:26 +00:00
parent ae500851da
commit 15e815d949
6 changed files with 13 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/web/admin/showids.jsp
View file

@ -1,13 +1,13 @@
<%-- $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$ --%>
<%@page <%@page
import="edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory"%> import="edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers"%>
<%@page <%@page
import="java.util.List"%> import="java.util.List"%>
<% <%
List idb = ServletIdentifierBundleFactory.getIdBundleForRequest(request, session, application); List idb = RequestIdentifiers.getIdBundleForRequest(request);
out.write("<html><body>"); out.write("<html><body>");
out.write("<h2>Identifiers in effect: </h2>"); out.write("<h2>Identifiers in effect: </h2>");

1
webapp/web/edit/forms/propDelete.jsp
View file

@ -2,7 +2,6 @@
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle"%> <%@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.SelfEditing"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory"%> <%@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.auth.identifier.RoleIdentifier"%>

1
webapp/web/edit/n3Delete.jsp
View file

@ -31,7 +31,6 @@
<%@page import="org.apache.commons.fileupload.disk.DiskFileItemFactory"%> <%@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.dao.jena.event.EditEvent"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle"%> <%@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.SelfEditingIdentifierFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.RoleIdentifier"%> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.RoleIdentifier"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditN3Utils"%> <%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditN3Utils"%>

1
webapp/web/edit/processDatapropRdfForm.jsp
View file

@ -24,7 +24,6 @@
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.RdfLiteralHash"%> <%@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.beans.DataProperty"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle"%> <%@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.SelfEditingIdentifierFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.RoleIdentifier"%> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.RoleIdentifier"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent"%> <%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent"%>

1
webapp/web/edit/processRdfForm2.jsp
View file

@ -32,7 +32,6 @@
<%@page import="org.apache.commons.fileupload.disk.DiskFileItemFactory"%> <%@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.dao.jena.event.EditEvent"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle"%> <%@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.SelfEditingIdentifierFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.RoleIdentifier"%> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.RoleIdentifier"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditN3Utils"%> <%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditN3Utils"%>

24
webapp/web/edit/selfeditcheck.jsp
View file

@ -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.NetId"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory"%> <%@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.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.ArrayIdentifierBundle"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle"%> <%@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="java.io.IOException"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundleFactory"%> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundleFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList"%> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList"%>
@ -26,26 +26,12 @@
<h1>SelfEditing Sanity Check</h1> <h1>SelfEditing Sanity Check</h1>
<h3>Is there a Factory that will create self editing identifiers?</h3>
<%
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 %>
<h3>Is there a self editing policy in the context?</h3> <h3>Is there a self editing policy in the context?</h3>
<% <%
ServletPolicyList spl = ServletPolicyList.getPolicies(application); ServletPolicyList spl = ServletPolicyList.getPolicies(application);
SelfEditingPolicy sePolicy = null; SelfEditingPolicy sePolicy = null;
ListIterator it = spl.listIterator(); ListIterator it = spl.listIterator();
found = "Could not find a SelfEditingPolicy"; String found = "Could not find a SelfEditingPolicy";
while(it.hasNext()){ while(it.hasNext()){
PolicyIface p = (PolicyIface)it.next(); PolicyIface p = (PolicyIface)it.next();
if( p instanceof SelfEditingPolicy ){ if( p instanceof SelfEditingPolicy ){
@ -70,8 +56,7 @@ if( user != null && user.length() > 0){
SelfEditingIdentifierFactory.SelfEditing selfEditingId = null; SelfEditingIdentifierFactory.SelfEditing selfEditingId = null;
IdentifierBundle ib = null; IdentifierBundle ib = null;
if( user != null && user.length() > 0){ if( user != null && user.length() > 0){
ib = sibf.getIdentifierBundle(request,session,application); ib = RequestIdentifiers.getIdBundleForRequest(request);
if( ib != null ) {
for( Object obj : ib){ for( Object obj : ib){
if( obj instanceof SelfEditingIdentifierFactory.SelfEditing ) if( obj instanceof SelfEditingIdentifierFactory.SelfEditing )
selfEditingId = (SelfEditingIdentifierFactory.SelfEditing) obj; selfEditingId = (SelfEditingIdentifierFactory.SelfEditing) obj;
@ -80,9 +65,6 @@ if( user != null && user.length() > 0){
found = "found a SelfEditingId " + selfEditingId.getValue(); found = "found a SelfEditingId " + selfEditingId.getValue();
else else
found = "Cound not find a SelfEditingId"; found = "Cound not find a SelfEditingId";
}else{
found = "Could not get any identififers";
}
%> %>
<%= found %> <%= found %>
<%}else{%> <%}else{%>