Index: lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java
===================================================================
diff -u -r0240d8e22e9a8027666408290fbb8eec4b3c1421 -r1cb0a71e02dc3057928c5e3dc641d557fe00b77f
--- lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java	(.../UniversalLoginModule.java)	(revision 0240d8e22e9a8027666408290fbb8eec4b3c1421)
+++ lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java	(.../UniversalLoginModule.java)	(revision 1cb0a71e02dc3057928c5e3dc641d557fe00b77f)
@@ -9,33 +9,35 @@
  *  
  */
 
-import java.security.acl.Group;
 import java.security.Principal;
-import javax.security.auth.Subject;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.login.FailedLoginException;
-
-import javax.naming.NamingException;
-import javax.security.auth.login.LoginException;
-import javax.naming.InitialContext;
-
+import java.security.acl.Group;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.login.FailedLoginException;
+import javax.security.auth.login.LoginException;
+import javax.servlet.http.HttpSession;
 import javax.sql.DataSource;
-import java.util.*;
 
-import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
-
 import org.apache.log4j.Logger;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-import org.springframework.web.context.WebApplicationContext;
+import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
+import org.lamsfoundation.lams.usermanagement.AuthenticationMethodParameter;
+import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
-import org.lamsfoundation.lams.web.SharedSession;
+import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.HttpSessionManager;
-import org.lamsfoundation.lams.usermanagement.*;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 
 public class UniversalLoginModule extends UsernamePasswordLoginModule {
 	private static Logger log = Logger.getLogger(UniversalLoginModule.class);
@@ -149,8 +151,8 @@
 				}
 				//if login is valid, register userDTO into session.
 				if(isValid){
-					SharedSession sharedSess = SharedSession.getInstance(HttpSessionManager.getInstance().getServletContext());
-					sharedSess.setAttribute(AttributeNames.USER,user.getUserDTO());					
+					HttpSession sharedsession = SessionManager.getSession(); 
+					sharedsession.setAttribute(AttributeNames.USER,user.getUserDTO());					
 				}
 			} catch (Exception e) {
 				e.printStackTrace();