Index: lams_tool_sbmt/conf/xdoclet/error-pages.xml
===================================================================
diff -u -rcfcd445868e0ba8f15be9dffdbd1e2b1ea062816 -rfaf64b3f7ac476bd6932d00a5ce8143a940d3943
--- lams_tool_sbmt/conf/xdoclet/error-pages.xml	(.../error-pages.xml)	(revision cfcd445868e0ba8f15be9dffdbd1e2b1ea062816)
+++ lams_tool_sbmt/conf/xdoclet/error-pages.xml	(.../error-pages.xml)	(revision faf64b3f7ac476bd6932d00a5ce8143a940d3943)
@@ -1,4 +1,13 @@
-<error-page>
-	<error-code>403</error-code>
-	<location>/403.html</location>
-</error-page>
\ No newline at end of file
+    <error-page>
+        <error-code>500</error-code>
+        <location>/error.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>403</error-code>
+        <location>/403.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>404</error-code>
+        <location>/404.jsp</location>
+    </error-page>
+    
\ No newline at end of file
Index: lams_tool_sbmt/conf/xdoclet/global-exceptions.xml
===================================================================
diff -u
--- lams_tool_sbmt/conf/xdoclet/global-exceptions.xml	(revision 0)
+++ lams_tool_sbmt/conf/xdoclet/global-exceptions.xml	(revision faf64b3f7ac476bd6932d00a5ce8143a940d3943)
@@ -0,0 +1,8 @@
+<global-exceptions>
+  <exception
+    handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
+    key="error.system"
+    path="/error.jsp"
+    scope="request"
+    type="java.lang.Exception"/>
+</global-exceptions>
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
diff -u -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888 -rfaf64b3f7ac476bd6932d00a5ce8143a940d3943
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision faf64b3f7ac476bd6932d00a5ce8143a940d3943)
@@ -70,11 +70,6 @@
  *                validate="true"
  * 
  * @struts.action-forward name="success" path="/authoring/authoring.jsp"
- * @struts.action-exception 
- * 				type="org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException" 
- * 				key="authoring.exception"
- * 				path="/authoring/authoring.jsp"
-
  */
 public class AuthoringAction extends LamsDispatchAction {
 	private Logger log = Logger.getLogger(AuthoringAction.class);
Index: lams_tool_sbmt/web/403.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/403.jsp	(revision 0)
+++ lams_tool_sbmt/web/403.jsp	(revision faf64b3f7ac476bd6932d00a5ce8143a940d3943)
@@ -0,0 +1,6 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-core" prefix="c" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<c:redirect url="${lams}errorpages/403.jsp"/>
\ No newline at end of file
Index: lams_tool_sbmt/web/404.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/404.jsp	(revision 0)
+++ lams_tool_sbmt/web/404.jsp	(revision faf64b3f7ac476bd6932d00a5ce8143a940d3943)
@@ -0,0 +1,8 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-core" prefix="c" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<c:redirect url="${lams}errorpages/404.jsp"/>
+
+
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888 -rfaf64b3f7ac476bd6932d00a5ce8143a940d3943
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision faf64b3f7ac476bd6932d00a5ce8143a940d3943)
@@ -68,10 +68,14 @@
   </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
-  <!--
-    Define your exceptions in a file called global-exceptions.xml and place
-    it in your merge directory.
-  -->
+  <global-exceptions>
+  <exception
+    handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
+    key="error.system"
+    path="/error.jsp"
+    scope="request"
+    type="java.lang.Exception"/>
+</global-exceptions>
 
   <!-- ========== Global Forward Definitions =================================== -->
   <!--
@@ -180,11 +184,6 @@
       unknown="false"
       validate="true"
     >
-      <exception
-        key="authoring.exception"
-        type="org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException"
-        path="/authoring/authoring.jsp"
-      />
       <forward
         name="success"
         path="/authoring/authoring.jsp"
Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
diff -u -r9afc72ff4f6555b8a6133cb29d597303d12ca5a0 -rfaf64b3f7ac476bd6932d00a5ce8143a940d3943
--- lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision 9afc72ff4f6555b8a6133cb29d597303d12ca5a0)
+++ lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision faf64b3f7ac476bd6932d00a5ce8143a940d3943)
@@ -152,10 +152,18 @@
    <!ELEMENT mime-mapping (extension, mime-type)>
    -->
 
-  <error-page>
-	<error-code>403</error-code>
-	<location>/403.html</location>
-</error-page>
+      <error-page>
+        <error-code>500</error-code>
+        <location>/error.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>403</error-code>
+        <location>/403.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>404</error-code>
+        <location>/404.jsp</location>
+    </error-page>
 
   	<jsp-config>
 		<!--  ======================================================== -->	
@@ -278,12 +286,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>
 
Index: lams_tool_sbmt/web/error.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/error.jsp	(revision 0)
+++ lams_tool_sbmt/web/error.jsp	(revision faf64b3f7ac476bd6932d00a5ce8143a940d3943)
@@ -0,0 +1,63 @@
+<%@ page language="java" isErrorPage="true" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<%-- Catch JSP Servlet Exception --%>
+<%
+if (exception != null) {
+%>
+<c:set var="errorMessage">
+	<%=exception.getMessage()%>
+</c:set>
+<c:set var="errorName">
+	<%=exception.getClass().getName()%>
+</c:set>
+<%
+		java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream();
+		java.io.PrintStream os = new java.io.PrintStream(bos);
+		exception.printStackTrace(os);
+		String stack = new String(bos.toByteArray());
+%>
+<c:set var="errorStack">
+	<%=stack%>
+</c:set>
+<%
+} else if ((Exception) request.getAttribute("javax.servlet.error.exception") != null) {
+%>
+
+<c:set var="errorMessage">
+	<%=((Exception) request.getAttribute("javax.servlet.error.exception")).getMessage()%>
+</c:set>
+<c:set var="errorName">
+	<%=((Exception) request.getAttribute("javax.servlet.error.exception")).getMessage()
+									.getClass().getName()%>
+</c:set>
+<%
+		java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream();
+		java.io.PrintStream os = new java.io.PrintStream(bos);
+		((Exception) request.getAttribute("javax.servlet.error.exception")).printStackTrace(os);
+		String stack = new String(bos.toByteArray());
+%>
+<c:set var="errorStack">
+	<%=stack%>
+</c:set>
+<%
+}
+%>
+<form action="${lams}errorpages/error.jsp" method="post" id="errorForm">
+	<input type="hidden" name="errorName" value="${errorName}"/>
+	<input type="hidden" name="errorMessage" value="${errorMessage}"/>
+	<input type="hidden" name="errorStack" value="${errorStack}"/>
+</form>
+
+<script type="text/javascript">
+
+if(window.top != null)
+	document.getElementById("errorForm").target = "_parent";
+document.getElementById("errorForm").submit();
+
+</script>
\ No newline at end of file
Index: lams_tool_sbmt/web/login.jsp
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -rfaf64b3f7ac476bd6932d00a5ce8143a940d3943
--- lams_tool_sbmt/web/login.jsp	(.../login.jsp)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_sbmt/web/login.jsp	(.../login.jsp)	(revision faf64b3f7ac476bd6932d00a5ce8143a940d3943)
@@ -1,21 +1,12 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-core" prefix="c" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<script type="text/javascript">
+	if(window.top != null){
+		window.top.location.href = "${lams}index.jsp";
+	}else
+		location.href = "${lams}index.jsp";
+</script>
 
-<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
-<%
-String path = request.getContextPath();
-String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
-%>
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <base href="<%=basePath%>">
-    
-    <title>System logon required</title>
-
-  </head>
-  
-  <body>
-	You need login <a href="/lams/index.jsp">here</a>.
-
-  </body>
-</html>