Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/AdminAction.java =================================================================== diff -u -r19c9010eff6be2e29657beed94349a978088650f -ra575014b02a693b4686e958f883e3eb00f9b0861 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/AdminAction.java (.../AdminAction.java) (revision 19c9010eff6be2e29657beed94349a978088650f) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/AdminAction.java (.../AdminAction.java) (revision a575014b02a693b4686e958f883e3eb00f9b0861) @@ -29,8 +29,8 @@ import org.lamsfoundation.lams.usermanagement.util.ExcelUserImportFileParser; import org.lamsfoundation.lams.usermanagement.util.AdminPreparer; import org.lamsfoundation.lams.usermanagement.service.UserManagementService; -import org.lamsfoundation.lams.web.HttpSessionManager; -import org.lamsfoundation.lams.web.AttributeNames; +import org.lamsfoundation.lams.web.util.AttributeNames; +import org.lamsfoundation.lams.web.util.HttpSessionManager; import org.lamsfoundation.lams.util.UploadFileUtil; import org.lamsfoundation.lams.usermanagement.web.UserActionForm; Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/OrganisationAction.java =================================================================== diff -u -r19c9010eff6be2e29657beed94349a978088650f -ra575014b02a693b4686e958f883e3eb00f9b0861 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/OrganisationAction.java (.../OrganisationAction.java) (revision 19c9010eff6be2e29657beed94349a978088650f) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/OrganisationAction.java (.../OrganisationAction.java) (revision a575014b02a693b4686e958f883e3eb00f9b0861) @@ -26,7 +26,7 @@ import org.lamsfoundation.lams.usermanagement.UserOrganisation; import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; import org.lamsfoundation.lams.usermanagement.OrganisationType; -import org.lamsfoundation.lams.web.HttpSessionManager; +import org.lamsfoundation.lams.web.util.HttpSessionManager; /** * @author Fei Yang Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/UserAction.java =================================================================== diff -u -r19c9010eff6be2e29657beed94349a978088650f -ra575014b02a693b4686e958f883e3eb00f9b0861 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/UserAction.java (.../UserAction.java) (revision 19c9010eff6be2e29657beed94349a978088650f) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/UserAction.java (.../UserAction.java) (revision a575014b02a693b4686e958f883e3eb00f9b0861) @@ -28,7 +28,7 @@ import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; import org.lamsfoundation.lams.usermanagement.service.UserManagementService; import org.lamsfoundation.lams.usermanagement.util.AdminPreparer; -import org.lamsfoundation.lams.web.HttpSessionManager; +import org.lamsfoundation.lams.web.util.HttpSessionManager; /** Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/UsersAddAction.java =================================================================== diff -u -re492b26493063bca3a73c31c590f987bf6e89cdc -ra575014b02a693b4686e958f883e3eb00f9b0861 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/UsersAddAction.java (.../UsersAddAction.java) (revision e492b26493063bca3a73c31c590f987bf6e89cdc) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/UsersAddAction.java (.../UsersAddAction.java) (revision a575014b02a693b4686e958f883e3eb00f9b0861) @@ -27,7 +27,7 @@ import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.UserOrganisation; import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; -import org.lamsfoundation.lams.web.HttpSessionManager; +import org.lamsfoundation.lams.web.util.HttpSessionManager; /** * @author Fei Yang Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/UsersRemoveAction.java =================================================================== diff -u -r19c9010eff6be2e29657beed94349a978088650f -ra575014b02a693b4686e958f883e3eb00f9b0861 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/UsersRemoveAction.java (.../UsersRemoveAction.java) (revision 19c9010eff6be2e29657beed94349a978088650f) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/UsersRemoveAction.java (.../UsersRemoveAction.java) (revision a575014b02a693b4686e958f883e3eb00f9b0861) @@ -17,7 +17,7 @@ import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.service.UserManagementService; import org.lamsfoundation.lams.usermanagement.util.AdminPreparer; -import org.lamsfoundation.lams.web.HttpSessionManager; +import org.lamsfoundation.lams.web.util.HttpSessionManager; /** * @author Fei Yang Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java (revision a575014b02a693b4686e958f883e3eb00f9b0861) @@ -0,0 +1,39 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ +package org.lamsfoundation.lams.web.util; + +/** + *
+ * View Source + *
+ * + * @author Fei Yang + */ +public class AttributeNames { + + public static final String ADMIN_ORGANISATION = "organisation"; + public static final String ADMIN_PARENT_ACCESS = "parentAccess"; + public static final String ADMIN_USER = "user"; + public static final String ADMIN_ERR_MSG = "errormsg"; + +} Index: lams_common/src/java/org/lamsfoundation/lams/web/util/HttpSessionManager.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/web/util/HttpSessionManager.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/web/util/HttpSessionManager.java (revision a575014b02a693b4686e958f883e3eb00f9b0861) @@ -0,0 +1,136 @@ +package org.lamsfoundation.lams.web.util; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Enumeration; + +import javax.servlet.ServletContext; +import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpSessionEvent; + +import org.apache.log4j.Logger; + +import org.lamsfoundation.lams.util.Configuration; +import org.lamsfoundation.lams.util.ConfigurationKeys; + + +/** + * It is used to manage HttpSession according to lams configuration (in lams.xml file). + * There are 2 configuration items related to it. + * One is AllowMultipleLogin, the other is UserInactiveTimeout + *+ * When running with the test harness, need to set a configuration parameter allowMultipleLogins=true + * This disables the invalidation of older + * duplicated sessions - so that the poll and application test threads will run together. + * It shouldn't be run with this set to true in production as not all the sessions are + * tracked properly - only one session is tracked for each user. + *
+ * Why isn't this class a servlet rather than a singleton? Because it doesn't directly + * serve data back to a webpage - its primary function is to return data to the controller. + * Yet it is in the "web" part of the system, so there + * is some argument for it being a servlet. An advantage of it being a servlet would be + * that we could probably make it directly a listener (rather than having a listener + * which calls this class), and we wouldn't need the test servlet ReportHttpSessionDataServlet + * to dump the current status to a webpage. + * + * @author Fei Yang + * + */ +public class HttpSessionManager +{ + private static Logger log = Logger.getLogger(HttpSessionManager.class); + + private static HttpSessionManager realMe = null; + + private static ServletContext context = null; //for UniversalLoginModule to use + + private Map HttpSessionsByLogin = null; // allows checking for two sessions + private int timeout;//in seconds + private boolean allowMultipleLogin; // must only be true for the test harness. + + private HttpSessionManager() + { + HttpSessionsByLogin = Collections.synchronizedMap(new HashMap()); + + timeout = Configuration.getAsInt(ConfigurationKeys.INACTIVE_TIME); + + allowMultipleLogin = Configuration.getAsBoolean(ConfigurationKeys.ALLOW_MULTIPLE_LOGIN); + } + + public static HttpSessionManager getInstance() + { + if (realMe == null) + realMe= new HttpSessionManager(); + + return realMe; + } + + /** + * Get the user http session. + */ + public HttpSession getHttpSessionByLogin(String login) + { + return (HttpSession)HttpSessionsByLogin.get(login); + } + + /** + * Update the user record + */ + public void updateHttpSessionByLogin(HttpSession session, String login) + { + if(!allowMultipleLogin) + { + if (login == null || session == null) + return; + HttpSession oldSession = (HttpSession)HttpSessionsByLogin.get(login); + if (oldSession != null) + { + if(oldSession.getId().equals(session.getId())) + return; + try + { + copySessionAttributes(oldSession,session); + oldSession.invalidate(); + }catch(IllegalStateException e) + { + //it's already invalidated + //do nothing + } + } + HttpSessionsByLogin.put(login,session); + } + } + + private void copySessionAttributes(HttpSession oldSession,HttpSession session) + { + Enumeration enu = oldSession.getAttributeNames(); + while(enu.hasMoreElements()) + { + String name = (String)enu.nextElement(); + session.setAttribute(name,oldSession.getAttribute(name)); + } + } + + public ServletContext getServletContext() + { + return context; + } + + /** + * Matches sessionCreated in SessionListener, which implements the + * HttpSessionListener interface. SessionListener passes the session event + * to here. Can't be accessed directly (ie defined in web.xml) in this class as + * this class is a singleton and the creation method is private. + */ + public void sessionCreated(HttpSessionEvent se) + { + if (se == null) + return; + HttpSession session= se.getSession(); + session.setMaxInactiveInterval(timeout); + context = session.getServletContext(); + } +} + + \ No newline at end of file