Index: lams_admin/conf/xdoclet/web-security.xml
===================================================================
diff -u -r15950781969db9a3d394e63a30616ef8d9adc57b -r5dba2691521c5588d623e6494ff5685b1e8ea41a
--- lams_admin/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 15950781969db9a3d394e63a30616ef8d9adc57b)
+++ lams_admin/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 5dba2691521c5588d623e6494ff5685b1e8ea41a)
@@ -17,6 +17,7 @@
 		<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>
 
Index: lams_tool_forum/conf/xdoclet/web-security.xml
===================================================================
diff -u -r6bb2802253132bb7da7aa0e9dba50f94dd617f3a -r5dba2691521c5588d623e6494ff5685b1e8ea41a
--- lams_tool_forum/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 6bb2802253132bb7da7aa0e9dba50f94dd617f3a)
+++ lams_tool_forum/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 5dba2691521c5588d623e6494ff5685b1e8ea41a)
@@ -1,4 +1,4 @@
-	<!--  Security Constraint -->
+  	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>
 	    	<web-resource-name>Secure Content</web-resource-name>
@@ -23,7 +23,6 @@
     		<role-name>AUTHOR</role-name>
     	</auth-constraint>
     </security-constraint>
-    
     <security-constraint>
 	   	<web-resource-collection>
 	    	<web-resource-name>Staff Content</web-resource-name>
@@ -54,8 +53,6 @@
     		<role-name>ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
-    
-    
     <security-constraint>
 	   	<web-resource-collection>
 	    	<web-resource-name>LAMS System Adminstrator Content</web-resource-name>
@@ -65,7 +62,6 @@
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
-    
 	<!--  some combine role security setting -->
     <security-constraint>
 	   	<web-resource-collection>
@@ -81,11 +77,43 @@
     	</auth-constraint>
     </security-constraint>
 
+  <!-- ======================================================== -->
+	<!--  Security Roles -->
+    <!-- ======================================================== -->
+	<security-role>
+		<description>Student</description>
+		<role-name>LEARNER</role-name>
+	</security-role>
+	<security-role>
+		<description>Student</description>
+		<role-name>TEACHER</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can create/modify a learning design</description>
+		<role-name>AUTHOR</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can running and monitoring a learning session</description>
+		<role-name>STAFF</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can add/remove users to the system, set up classes of users for sessions</description>
+		<role-name>ADMIN</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can add/remove users to the system, set up classes of users for sessions</description>
+		<role-name>SYSADMIN</role-name>
+	</security-role>
 	<!--  Login Configuration -->
   	<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>
Index: lams_tool_sbmt/conf/xdoclet/web-security.xml
===================================================================
diff -u -reb34584421f5dd5cb2a537c66826cd4da3e52cc8 -r5dba2691521c5588d623e6494ff5685b1e8ea41a
--- lams_tool_sbmt/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision eb34584421f5dd5cb2a537c66826cd4da3e52cc8)
+++ lams_tool_sbmt/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 5dba2691521c5588d623e6494ff5685b1e8ea41a)
@@ -71,11 +71,44 @@
     	</auth-constraint>
     </security-constraint>
 
+  <!-- ======================================================== -->
+	<!--  Security Roles -->
+    <!-- ======================================================== -->
+	<security-role>
+		<description>Student</description>
+		<role-name>LEARNER</role-name>
+	</security-role>
+	<security-role>
+		<description>Student</description>
+		<role-name>TEACHER</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can create/modify a learning design</description>
+		<role-name>AUTHOR</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can running and monitoring a learning session</description>
+		<role-name>STAFF</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can add/remove users to the system, set up classes of users for sessions</description>
+		<role-name>ADMIN</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can add/remove users to the system, set up classes of users for sessions</description>
+		<role-name>SYSADMIN</role-name>
+	</security-role>
+	
 	<!--  Login Configuration -->
   	<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>