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

NIHVIVO-736 transitioning from LoginFormBean to LoginStatusBean.

Browse source
This commit is contained in:
jeb228 2010-10-08 19:10:44 +00:00
parent 660775ed54
commit 172f7589c1
8 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,11 +2,11 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<%@ page import="edu.cornell.mannlib.vedit.beans.LoginFormBean" %> <%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
<% <%
if(session == null || !LoginFormBean.loggedIn(request, LoginFormBean.CURATOR)) { if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.CURATOR)) {
%><c:redirect url="<%= Controllers.LOGIN %>" /><% %><c:redirect url="<%= Controllers.LOGIN %>" /><%
} }

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

@ -2,13 +2,13 @@
<%@page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep"%> <%@page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
<%@page import="edu.cornell.mannlib.vedit.beans.LoginFormBean"%> <%@page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean"%>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
<% <%
if (session == null || !LoginFormBean.loggedIn(request, LoginFormBean.DBA)) { if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.DBA)) {
%><c:redirect url="<%= Controllers.LOGIN %>" /><% %><c:redirect url="<%= Controllers.LOGIN %>" /><%
} }

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

@ -1,6 +1,6 @@
<%-- $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 import="edu.cornell.mannlib.vedit.beans.LoginFormBean" %> <%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
<%@ page import="org.apache.log4j.*" %> <%@ page import="org.apache.log4j.*" %>
<%@ page import="java.util.*" %> <%@ page import="java.util.*" %>
@ -15,7 +15,7 @@
based on work by Volker Mentzner. --%> based on work by Volker Mentzner. --%>
<% <%
if (session == null || !LoginFormBean.loggedIn(request, LoginFormBean.DBA)) { if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.DBA)) {
%><c:redirect url="<%= Controllers.LOGIN %>" /><% %><c:redirect url="<%= Controllers.LOGIN %>" /><%
} }

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

@ -2,11 +2,11 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<%@ page import="edu.cornell.mannlib.vedit.beans.LoginFormBean" %> <%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
<% <%
if(session == null || !LoginFormBean.loggedIn(request, LoginFormBean.CURATOR)) { if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.CURATOR)) {
%><c:redirect url="/siteAdmin"></c:redirect><% %><c:redirect url="/siteAdmin"></c:redirect><%
} }

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

@ -2,11 +2,11 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<%@ page import="edu.cornell.mannlib.vedit.beans.LoginFormBean" %> <%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
<% <%
if(session == null || !LoginFormBean.loggedIn(request, LoginFormBean.CURATOR)) { if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.CURATOR)) {
%><c:redirect url="<%= Controllers.LOGIN %>" /><% %><c:redirect url="<%= Controllers.LOGIN %>" /><%
} }

5
webapp/web/admin/syncSesame.jsp
View file

@ -9,7 +9,7 @@
<%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.JenaBaseDao"%> <%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.JenaBaseDao"%>
<%@page import="java.io.InputStream"%> <%@page import="java.io.InputStream"%>
<%@page import="java.util.Properties"%> <%@page import="java.util.Properties"%>
<%@page import="edu.cornell.mannlib.vedit.beans.LoginFormBean"%> <%@page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
@ -32,8 +32,7 @@
%> %>
<% <%
if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.DBA)) {
if(session == null || !LoginFormBean.loggedIn(request, LoginFormBean.DBA)) {
%> %>
<c:redirect url="<%= Controllers.LOGIN %>" /> <c:redirect url="<%= Controllers.LOGIN %>" />
<% <%

8
webapp/web/admin/temporaryLogin.jsp
View file

@ -1,6 +1,6 @@
<%-- $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 import="edu.cornell.mannlib.vedit.beans.LoginFormBean" %> <%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
<%@ page import="com.hp.hpl.jena.rdf.model.*" %> <%@ page import="com.hp.hpl.jena.rdf.model.*" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %>
@ -11,7 +11,7 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<% if(session == null || !LoginFormBean.loggedIn(request, LoginFormBean.CURATOR)) { <% if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.CURATOR)) {
%><c:redirect url="<%= Controllers.LOGIN %>" /><% %><c:redirect url="<%= Controllers.LOGIN %>" /><%
} }
@ -22,7 +22,7 @@
FakeSelfEditingIdentifierFactory.clearFakeIdInSession( session ); FakeSelfEditingIdentifierFactory.clearFakeIdInSession( session );
FakeSelfEditingIdentifierFactory.putFakeIdInSession( netid , session ); FakeSelfEditingIdentifierFactory.putFakeIdInSession( netid , session );
// don't want to do this because would affect the whole session // don't want to do this because would affect the whole session
// if(LoginFormBean.loggedIn(request, LoginFormBean.CURATOR)) { // if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.CURATOR)) {
// CuratorEditingPolicySetup.removeAllCuratorEditingPolicies(getServletConfig().getServletContext()); // CuratorEditingPolicySetup.removeAllCuratorEditingPolicies(getServletConfig().getServletContext());
//} %> //} %>
<jsp:forward page="/edit/login.jsp"/> <jsp:forward page="/edit/login.jsp"/>
@ -32,7 +32,7 @@
VitroRequestPrep.forceOutOfSelfEditing(request); VitroRequestPrep.forceOutOfSelfEditing(request);
FakeSelfEditingIdentifierFactory.clearFakeIdInSession( session ); FakeSelfEditingIdentifierFactory.clearFakeIdInSession( session );
// don't want to do this because would affect the whole session // don't want to do this because would affect the whole session
// if(LoginFormBean.loggedIn(request, LoginFormBean.CURATOR)) { // if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.CURATOR)) {
// CuratorEditingPolicySetup.replaceCuratorEditing(getServletConfig().getServletContext(),(Model)application.getAttribute("jenaOntModel")); // CuratorEditingPolicySetup.replaceCuratorEditing(getServletConfig().getServletContext(),(Model)application.getAttribute("jenaOntModel"));
//} //}
%><c:redirect url="/"></c:redirect><% %><c:redirect url="/"></c:redirect><%

1
webapp/web/admin/testnetid.jsp
View file

@ -5,7 +5,6 @@
<%@ page import="com.hp.hpl.jena.shared.Lock" %> <%@ page import="com.hp.hpl.jena.shared.Lock" %>
<%@ page import="com.thoughtworks.xstream.XStream" %> <%@ page import="com.thoughtworks.xstream.XStream" %>
<%@ page import="com.thoughtworks.xstream.io.xml.DomDriver" %> <%@ page import="com.thoughtworks.xstream.io.xml.DomDriver" %>
<%@ page import="edu.cornell.mannlib.vedit.beans.LoginFormBean" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %>