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

Cosmetic changes: reformat, organize imports, remove commented code.

Browse source
This commit is contained in:
jeb228 2010-09-03 18:42:52 +00:00
parent 5a04657f35
commit e9fa47d7ed
1 changed files with 38 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

95
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Logout.java
View file

@ -2,74 +2,55 @@
package edu.cornell.mannlib.vitro.webapp.controller.edit; package edu.cornell.mannlib.vitro.webapp.controller.edit;
import javax.servlet.*; import javax.servlet.http.HttpServlet;
import javax.servlet.http.*; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
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 java.io.*;
import java.sql.*;
import java.util.*;
import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vedit.beans.LoginFormBean;
import edu.cornell.mannlib.vitro.webapp.beans.User; import edu.cornell.mannlib.vitro.webapp.beans.User;
import edu.cornell.mannlib.vitro.webapp.auth.policy.JenaNetidPolicy.ContextSetup;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.UserDao; import edu.cornell.mannlib.vitro.webapp.dao.UserDao;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.dao.jena.LogoutEvent; import edu.cornell.mannlib.vitro.webapp.dao.jena.LogoutEvent;
import edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep;
public class Logout extends HttpServlet /*implements SingleThreadModel*/ { public class Logout extends HttpServlet /* implements SingleThreadModel */{
private static final Log log = LogFactory.getLog(Logout.class.getName()); private static final Log log = LogFactory.getLog(Logout.class.getName());
public void doPost( HttpServletRequest request, HttpServletResponse response ) { public void doPost(HttpServletRequest request, HttpServletResponse response) {
try { try {
VitroRequest vreq = new VitroRequest(request);
VitroRequest vreq = new VitroRequest(request); HttpSession session = vreq.getSession();
HttpSession session = vreq.getSession(); if (session != null) {
if (session != null) { UserDao userDao = ((WebappDaoFactory) session
UserDao userDao = ((WebappDaoFactory)session.getServletContext().getAttribute("webappDaoFactory")).getUserDao(); .getServletContext().getAttribute("webappDaoFactory"))
LoginFormBean f = (LoginFormBean) session.getAttribute( "loginHandler" ); .getUserDao();
if (f != null) { LoginFormBean f = (LoginFormBean) session
User user = userDao.getUserByUsername(f.getLoginName()); .getAttribute("loginHandler");
if (user == null) { if (f != null) {
log.error("Unable to retrieve user " + f.getLoginName() + " from model"); User user = userDao.getUserByUsername(f.getLoginName());
} else { if (user == null) {
Authenticate.sendLoginNotifyEvent( new LogoutEvent( user.getURI() ), getServletContext(), session ); log.error("Unable to retrieve user " + f.getLoginName()
} + " from model");
} } else {
session.invalidate(); Authenticate.sendLoginNotifyEvent(
} new LogoutEvent(user.getURI()),
response.sendRedirect("./"); getServletContext(), session);
}
/* }
LoginFormBean f = (LoginFormBean) session.getAttribute( "loginHandler" ); session.invalidate();
//reset the login bean properties }
f.setLoginStatus( "logged out" ); response.sendRedirect("./");
f.setLoginRole( "1" ); } catch (Exception ex) {
// f.setLoginName( "" ); leave so users can see who they last logged in as log.error(ex, ex);
f.setLoginPassword( "" ); }
f.setErrorMsg( "loginPassword", "" ); // remove any error messages }
f.setErrorMsg( "loginUsername", "" ); // remove any error messages
f.setEmailAddress( "reset" );
f.setSessionId( "" );
// VitroRequestPrep.forceOutOfCuratorEditing(request);
//CuratorEditingUriFactory.clearFakeIdInSession( session );
*/
} catch (Exception ex) {
log.error( ex.getMessage() );
ex.printStackTrace();
}
}
public void doGet( HttpServletRequest request, HttpServletResponse response ) {
doPost(request, response);
}
}
public void doGet(HttpServletRequest request, HttpServletResponse response) {
doPost(request, response);
}
}