Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rc819f2a958c500be2c37059a1781b8c145557310 -r21991bdc561db26de7c7e0687a10b2c2d7743074
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision c819f2a958c500be2c37059a1781b8c145557310)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 21991bdc561db26de7c7e0687a10b2c2d7743074)
@@ -152,9 +152,10 @@
 sysadmin.timeoutUrl  =Timeout URL
 sysadmin.integrated.servers  =integrated server(s) in total
 sysadmin.server.add  =Add new server
-sysadmin.maintain.session  =Session list
+sysadmin.maintain.session  =Maintain sessions
 sysadmin.maintain.session.login  =Login
 sysadmin.maintain.session.id  =Session ID
+sysadmin.maintain.session.delete  =Delete
 sysadmin.organisation.create  =Create one
 sysadmin.organisation.select  =Please select...
 sysadmin.login.text  =Update login page text:
Fisheye: Tag 21991bdc561db26de7c7e0687a10b2c2d7743074 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SessionListAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SessionMaintainAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SessionMaintainAction.java	(revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SessionMaintainAction.java	(revision 21991bdc561db26de7c7e0687a10b2c2d7743074)
@@ -0,0 +1,54 @@
+/****************************************************************
+ * Copyright (C) 2006 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+package org.lamsfoundation.lams.admin.web.action;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.session.SessionManager;
+
+/**
+ * @author Marcin Cieslak
+ */
+public class SessionMaintainAction extends LamsDispatchAction {
+
+    public ActionForward list(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	request.setAttribute("sessions", SessionManager.getLoginToSessionIDMappings());
+	return mapping.findForward("sessionmaintain");
+    }
+
+    public ActionForward delete(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	String login = request.getParameter("login");
+	if (StringUtils.isNotBlank(login)) {
+	    SessionManager.removeSessionByLogin(login, true);
+	}
+	return list(mapping, form, request, response);
+    }
+}
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
===================================================================
diff -u -rc819f2a958c500be2c37059a1781b8c145557310 -r21991bdc561db26de7c7e0687a10b2c2d7743074
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java	(.../SysAdminStartAction.java)	(revision c819f2a958c500be2c37059a1781b8c145557310)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java	(.../SysAdminStartAction.java)	(revision 21991bdc561db26de7c7e0687a10b2c2d7743074)
@@ -63,7 +63,7 @@
 	    links.add(new LinkBean("ltiConsumerManagement.do", "label.manage.tool.consumers"));
 	    links.add(new LinkBean("toolcontentlist.do", "sysadmin.tool.management"));
 	    links.add(new LinkBean("themeManagement.do", "admin.themes.title"));
-	    links.add(new LinkBean("sessionlist.do", "sysadmin.maintain.session"));
+	    links.add(new LinkBean("sessionmaintain.do?method=list", "sysadmin.maintain.session"));
 	    groupedLinks.add(new Object[]{AdminConstants.START_CONFIG_LINKS,links});
 
 	    links = new ArrayList<LinkBean>();
Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
diff -u -rc819f2a958c500be2c37059a1781b8c145557310 -r21991bdc561db26de7c7e0687a10b2c2d7743074
--- lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision c819f2a958c500be2c37059a1781b8c145557310)
+++ lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 21991bdc561db26de7c7e0687a10b2c2d7743074)
@@ -892,14 +892,15 @@
       />
     </action>
     <action
-      path="/sessionlist"
-      type="org.lamsfoundation.lams.admin.web.action.SessionListAction"
+      path="/sessionmaintain"
+      type="org.lamsfoundation.lams.admin.web.action.SessionMaintainAction"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="sessionlist"
-        path=".sessionlist"
+        name="sessionmaintain"
+        path=".sessionmaintain"
         redirect="false"
       />
     </action>
Index: lams_admin/web/WEB-INF/tiles-defs.xml
===================================================================
diff -u -rc819f2a958c500be2c37059a1781b8c145557310 -r21991bdc561db26de7c7e0687a10b2c2d7743074
--- lams_admin/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision c819f2a958c500be2c37059a1781b8c145557310)
+++ lams_admin/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision 21991bdc561db26de7c7e0687a10b2c2d7743074)
@@ -185,9 +185,9 @@
 		<put name="content" value="serverlist.jsp" />	
 	</definition>
 	
-	<definition name=".sessionlist" path="/template.jsp">
+	<definition name=".sessionmaintain" path="/template.jsp">
 		<put name="title" value="sysadmin.maintain.session"/>
-		<put name="content" value="sessionlist.jsp" />	
+		<put name="content" value="sessionmaintain.jsp" />	
 	</definition>
 
 	<definition name=".servermaintain" path="/template.jsp">
Fisheye: Tag 21991bdc561db26de7c7e0687a10b2c2d7743074 refers to a dead (removed) revision in file `lams_admin/web/sessionlist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/sessionmaintain.jsp
===================================================================
diff -u
--- lams_admin/web/sessionmaintain.jsp	(revision 0)
+++ lams_admin/web/sessionmaintain.jsp	(revision 21991bdc561db26de7c7e0687a10b2c2d7743074)
@@ -0,0 +1,22 @@
+<%@ include file="/taglibs.jsp"%>
+
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+
+<table class="table table-striped">
+	<tr>
+		<th><fmt:message key="sysadmin.maintain.session.login" /></th>
+		<th><fmt:message key="sysadmin.maintain.session.id" /></th>
+		<th></th>
+	</tr>
+	<c:forEach items="${sessions}" var="ses">
+	<tr>
+		<td><c:out value="${ses.key}" /></td>
+		<td><c:out value="${ses.value}" /></td>
+		<td>
+			<a href="<lams:LAMSURL/>/admin/sessionmaintain.do?method=delete&login=${ses.key}" class="btn btn-default">
+				<fmt:message key="sysadmin.maintain.session.delete" />
+			</a>
+		</td>
+	</tr>
+	</c:forEach>
+</table>
\ No newline at end of file