Index: lams_admin/conf/xdoclet/error-pages.xml
===================================================================
diff -u
--- lams_admin/conf/xdoclet/error-pages.xml	(revision 0)
+++ lams_admin/conf/xdoclet/error-pages.xml	(revision 22e9389aaada5dc91833d762a79f8051bca172c4)
@@ -0,0 +1,13 @@
+    <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_admin/conf/xdoclet/global-exceptions.xml
===================================================================
diff -u -r9814f2366d250be66cddf5395df506b1ccfda53b -r22e9389aaada5dc91833d762a79f8051bca172c4
--- lams_admin/conf/xdoclet/global-exceptions.xml	(.../global-exceptions.xml)	(revision 9814f2366d250be66cddf5395df506b1ccfda53b)
+++ lams_admin/conf/xdoclet/global-exceptions.xml	(.../global-exceptions.xml)	(revision 22e9389aaada5dc91833d762a79f8051bca172c4)
@@ -1,8 +1,8 @@
 <global-exceptions>
   <exception
-    handler="org.lamsfoundation.lams.admin.web.StrutsExceptionHandler"
+    handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
     key="error.system"
-    path=".error"
+    path="/error.jsp"
     scope="request"
     type="java.lang.Exception"/>
 </global-exceptions>
\ No newline at end of file
Fisheye: Tag 22e9389aaada5dc91833d762a79f8051bca172c4 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/StrutsExceptionHandler.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/403.jsp
===================================================================
diff -u
--- lams_admin/web/403.jsp	(revision 0)
+++ lams_admin/web/403.jsp	(revision 22e9389aaada5dc91833d762a79f8051bca172c4)
@@ -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_admin/web/404.jsp
===================================================================
diff -u
--- lams_admin/web/404.jsp	(revision 0)
+++ lams_admin/web/404.jsp	(revision 22e9389aaada5dc91833d762a79f8051bca172c4)
@@ -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_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r5a7b31fd5f98e009cd77634aa9b310e047a28716 -r22e9389aaada5dc91833d762a79f8051bca172c4
--- lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 5a7b31fd5f98e009cd77634aa9b310e047a28716)
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 22e9389aaada5dc91833d762a79f8051bca172c4)
@@ -25,17 +25,20 @@
 	<form-property name="name" type="java.lang.String" />
 	<form-property name="code" type="java.lang.String" />
 	<form-property name="description" type="java.lang.String" />
-	<form-property name="localeLanguage" type="java.lang.String" />
-	<form-property name="localeCountry" type="java.lang.String" />
+	<form-property name="localeId" type="java.lang.Byte" initial="1"/>
 	<form-property name="typeId" type="java.lang.Integer" />
 	<form-property name="stateId" type="java.lang.Integer" />
+	<form-property name="courseAdminCanAddNewUsers" type="java.lang.Boolean" initial="false"/>
+	<form-property name="courseAdminCanBrowseAllUsers" type="java.lang.Boolean" initial="false"/>
+	<form-property name="courseAdminCanChangeStatusOfCourse" type="java.lang.Boolean" initial="false"/>
 </form-bean>
 
 <form-bean name="UserForm" type="org.apache.struts.action.DynaActionForm">
     <form-property name="orgId" type="java.lang.Integer" />
 	<form-property name="userId" type="java.lang.Integer" />
 	<form-property name="login" type="java.lang.String" />
 	<form-property name="password" type="java.lang.String" />
+	<form-property name="password2" type="java.lang.String" />
 	<form-property name="title" type="java.lang.String" />
 	<form-property name="firstName" type="java.lang.String" />
 	<form-property name="lastName" type="java.lang.String" />
@@ -50,21 +53,22 @@
 	<form-property name="mobilePhone" type="java.lang.String" />
 	<form-property name="fax" type="java.lang.String" />
 	<form-property name="email" type="java.lang.String" />
-	<form-property name="localeLanguage" type="java.lang.String" />
-	<form-property name="localeCountry" type="java.lang.String" />
-	<form-property name="learner" type="java.lang.String" />
-	<form-property name="author" type="java.lang.String" />
-	<form-property name="staff" type="java.lang.String" />
-	<form-property name="admin" type="java.lang.String" />
-	<form-property name="manager" type="java.lang.String" />
+	<form-property name="localeId" type="java.lang.Byte" />
+    <form-property name="roles" type="java.lang.String[]" />
 </form-bean>
 
+<form-bean name="UserOrgForm" type="org.apache.struts.action.DynaActionForm">
+    <form-property name="orgId" type="java.lang.Integer" />
+    <form-property name="orgName" type="java.lang.String" />
+    <form-property name="userIds" type="java.lang.String[]" />
+</form-bean>
+
   </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
   <global-exceptions>
   <exception
-    handler="org.apache.struts.action.ExceptionHandler"
+    handler="org.lamsfoundation.lams.admin.web.StrutsExceptionHandler"
     key="error.system"
     path=".error"
     scope="request"
@@ -155,6 +159,21 @@
       />
     </action>
     <action
+      path="/userorgsave"
+      type="org.lamsfoundation.lams.admin.web.UserOrgSaveAction"
+      name="UserOrgForm"
+      scope="request"
+      input=".userorg"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/usersave"
       type="org.lamsfoundation.lams.admin.web.UserSaveAction"
       name="UserForm"
@@ -209,6 +228,20 @@
         redirect="false"
       />
     </action>
+    <action
+      path="/userorg"
+      type="org.lamsfoundation.lams.admin.web.UserOrgAction"
+      name="UserOrgForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="userorg"
+        path=".userorg"
+        redirect="false"
+      />
+    </action>
 
        <action
       path="/sysadminstart"
Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -r2e52e987bf6ae69837591be63656829abacf4872 -r22e9389aaada5dc91833d762a79f8051bca172c4
--- lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 2e52e987bf6ae69837591be63656829abacf4872)
+++ lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 22e9389aaada5dc91833d762a79f8051bca172c4)
@@ -14,12 +14,7 @@
 	<param-name>contextConfigLocation</param-name>
 	<param-value>
 		classpath:/org/lamsfoundation/lams/applicationContext.xml
-		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
 	</param-value>
 </context-param>
 
@@ -88,12 +83,6 @@
 </listener>
 
  <servlet>
-	<servlet-name>context</servlet-name>
-	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
-<servlet>
     <servlet-name>action</servlet-name>
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
     <init-param>
@@ -112,7 +101,7 @@
       <param-name>validate</param-name>
       <param-value>true</param-value>
     </init-param>
-    <load-on-startup>2</load-on-startup>
+    <load-on-startup>1</load-on-startup>
 </servlet>
 
   <servlet-mapping>
@@ -217,7 +206,8 @@
 			<url-pattern>/*</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>ADMIN</role-name>
+    	    <role-name>COURSE MANAGER</role-name>
+    		<role-name>COURSE ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -228,7 +218,19 @@
 		<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>
 
+    <!--  Security Roles -->
+    <security-role>
+		<role-name>COURSE MANAGER</role-name>
+	</security-role>
+   	<security-role>
+		<role-name>COURSE ADMIN</role-name>
+	</security-role>
+	<security-role>
+		<role-name>SYSADMIN</role-name>
+	</security-role>
+
 </web-app>
Index: lams_admin/web/error.jsp
===================================================================
diff -u -r6829247f52d40e15bc4c03aa50f94b03d506edc4 -r22e9389aaada5dc91833d762a79f8051bca172c4
--- lams_admin/web/error.jsp	(.../error.jsp)	(revision 6829247f52d40e15bc4c03aa50f94b03d506edc4)
+++ lams_admin/web/error.jsp	(.../error.jsp)	(revision 22e9389aaada5dc91833d762a79f8051bca172c4)
@@ -1,16 +1,63 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ 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>
 
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%-- 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) {
+%>
 
-<table width="80%" algin="center" valign="middle">
-<tr>
-	<td width="30%" align="left"><img src="<lams:LAMSURL/>/images/error.jpg" /></td>
-	<td></td>
-</tr>
-<tr>
-	<td colspan=2 align=center>
-		<html:errors/>
-	</td>
-</tr>
-</table>
\ No newline at end of file
+<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_admin/web/login.jsp
===================================================================
diff -u -r52f3ab1ab2051d0d28ca7d7f96dd28ed08624aa8 -r22e9389aaada5dc91833d762a79f8051bca172c4
--- lams_admin/web/login.jsp	(.../login.jsp)	(revision 52f3ab1ab2051d0d28ca7d7f96dd28ed08624aa8)
+++ lams_admin/web/login.jsp	(.../login.jsp)	(revision 22e9389aaada5dc91833d762a79f8051bca172c4)
@@ -1,24 +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>
-
-    <!--
-    <link rel="stylesheet" type="text/css" href="styles.css">
-    -->
-  </head>
-  
-  <body>
-	You need login <a href="/lams/index.jsp">here</a>.
-
-  </body>
-</html>