Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r84af64052b65a5a8f91e42f58f03e8362c5eb3de -r41e3420d7cd50147599cb873f5695203fc6e17e4
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
@@ -33,11 +33,6 @@
 				classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
 	</param-value>
 </context-param>
-<listener>
-	<listener-class>
-		org.springframework.web.context.ContextLoaderListener
-	</listener-class>
-</listener>	
 
     <!--
     To use non XDoclet filters, create a filters.xml file that
@@ -53,11 +48,14 @@
     project's merge dir.
     -->
 
-    <!--
-    To use non XDoclet listeners, create a listeners.xml file that
-    contains the additional listeners and place it in your
-    project's merge dir.
-    -->
+  <listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+	<listener-class>
+ 		org.lamsfoundation.lams.web.SessionListener
+ 	</listener-class>
+</listener>	
 
  <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
@@ -248,24 +246,31 @@
     <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
 </taglib>
 
-   <!--
-   To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
-   Organize web-security.xml following this DTD slice:
+  <security-constraint>
+	<display-name>SecurityConstraint</display-name>
+	<web-resource-collection>
+		<web-resource-name>STK</web-resource-name>
+		<url-pattern>/*</url-pattern>
+		<http-method>DELETE</http-method>
+		<http-method>GET</http-method>
+		<http-method>POST</http-method>
+		<http-method>PUT</http-method>
+	</web-resource-collection>
+	<auth-constraint>
+		<role-name>SYSADMIN</role-name>
+	</auth-constraint>
+</security-constraint>
+<security-role>
+	<description>SYSADMIN</description>
+	<role-name>SYSADMIN</role-name>
+</security-role>	
+<login-config>
+	<auth-method>FORM</auth-method>
+	<realm-name>LAMS</realm-name>
+	<form-login-config>
+		<form-login-page>/login.jsp</form-login-page>
+		<form-error-page>/login.jsp?failed=y</form-error-page>
+	</form-login-config>
+</login-config>
 
-   <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
-   <!ELEMENT web-resource-collection (web-resource-name, description?, url-pattern*, http-method*)>
-   <!ELEMENT web-resource-name (#PCDATA)>
-   <!ELEMENT url-pattern (#PCDATA)>
-   <!ELEMENT http-method (#PCDATA)>
-   <!ELEMENT user-data-constraint (description?, transport-guarantee)>
-   <!ELEMENT transport-guarantee (#PCDATA)>
-
-   <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
-   <!ELEMENT auth-method (#PCDATA)>
-   <!ELEMENT realm-name (#PCDATA)>
-   <!ELEMENT form-login-config (form-login-page, form-error-page)>
-   <!ELEMENT form-login-page (#PCDATA)>
-   <!ELEMENT form-error-page (#PCDATA)>
-   -->
-
 </web-app>