Index: lams_tool_nb/conf/xdoclet/error-pages.xml
===================================================================
diff -u -r29baacd1af7a166e0422d2c3b9c151735dace993 -re2a59c50e8e06ff895161c92e5d9eb74aadc446a
--- lams_tool_nb/conf/xdoclet/error-pages.xml	(.../error-pages.xml)	(revision 29baacd1af7a166e0422d2c3b9c151735dace993)
+++ lams_tool_nb/conf/xdoclet/error-pages.xml	(.../error-pages.xml)	(revision e2a59c50e8e06ff895161c92e5d9eb74aadc446a)
@@ -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_nb/conf/xdoclet/global-exceptions.xml
===================================================================
diff -u
--- lams_tool_nb/conf/xdoclet/global-exceptions.xml	(revision 0)
+++ lams_tool_nb/conf/xdoclet/global-exceptions.xml	(revision e2a59c50e8e06ff895161c92e5d9eb74aadc446a)
@@ -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
Fisheye: Tag e2a59c50e8e06ff895161c92e5d9eb74aadc446a refers to a dead (removed) revision in file `lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/CustomStrutsExceptionHandler.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java
===================================================================
diff -u -reac1a7689dc88e224668832952fc27c8b732a8a9 -re2a59c50e8e06ff895161c92e5d9eb74aadc446a
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java	(.../NbAuthoringAction.java)	(revision eac1a7689dc88e224668832952fc27c8b732a8a9)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java	(.../NbAuthoringAction.java)	(revision e2a59c50e8e06ff895161c92e5d9eb74aadc446a)
@@ -81,15 +81,6 @@
  * @struts:action path="/authoring" name="NbAuthoringForm" scope="request"
  * 				  type="org.lamsfoundation.lams.tool.noticeboard.web.NbAuthoringAction"
  *                parameter="method" validate="true" input="/author_page.jsp"
- * 
- * @struts.action-exception key="error.exception.NbApplication" scope="request"
- *                          type="org.lamsfoundation.lams.tool.noticeboard.NbApplicationException"
- *                          path=".error"
- *                          handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
- * @struts.action-exception key="error.exception.NbApplication" scope="request"
- *                          type="java.lang.NullPointerException"
- *                          path=".error"
- *                          handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
  *
  * @struts:action-forward name="authoringContent" path="/authoring/authoring.jsp"
  * @struts:action-forward name="displayMessage" path=".message"
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportAction.java
===================================================================
diff -u -reac1a7689dc88e224668832952fc27c8b732a8a9 -re2a59c50e8e06ff895161c92e5d9eb74aadc446a
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportAction.java	(.../NbExportAction.java)	(revision eac1a7689dc88e224668832952fc27c8b732a8a9)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportAction.java	(.../NbExportAction.java)	(revision e2a59c50e8e06ff895161c92e5d9eb74aadc446a)
@@ -56,10 +56,6 @@
  * 
  * @struts:action path="/exportPortfolio" name="NbExportForm" scope="request" type="org.lamsfoundation.lams.tool.noticeboard.web.NbExportAction"
  *                validate="false" parameter="mode"
- * @struts.action-exception key="error.exception.NbApplication" scope="request"
- *                          type="org.lamsfoundation.lams.tool.noticeboard.NbApplicationException"
- *                          path=".error"
- *                          handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
  * @struts:action-forward name="exportPortfolio" path="/exportPortfolio.jsp"
  * ----------------XDoclet Tags--------------------
  */
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java
===================================================================
diff -u -reac1a7689dc88e224668832952fc27c8b732a8a9 -re2a59c50e8e06ff895161c92e5d9eb74aadc446a
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java	(.../NbLearnerAction.java)	(revision eac1a7689dc88e224668832952fc27c8b732a8a9)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java	(.../NbLearnerAction.java)	(revision e2a59c50e8e06ff895161c92e5d9eb74aadc446a)
@@ -73,10 +73,6 @@
  * 
  * @struts:action path="/learner" name="NbLearnerForm" scope="request" type="org.lamsfoundation.lams.tool.noticeboard.web.NbLearnerAction"
  *                input=".learnerContent" validate="false" parameter="method"
- * @struts.action-exception key="error.exception.NbApplication" scope="request"
- *                type="org.lamsfoundation.lams.tool.noticeboard.NbApplicationException"
- *                path=".error"
- *                handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
  * @struts:action-forward name="displayLearnerContent" path=".learnerContent"
  * ----------------XDoclet Tags--------------------
  */
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java
===================================================================
diff -u -reac1a7689dc88e224668832952fc27c8b732a8a9 -re2a59c50e8e06ff895161c92e5d9eb74aadc446a
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java	(.../NbLearnerStarterAction.java)	(revision eac1a7689dc88e224668832952fc27c8b732a8a9)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java	(.../NbLearnerStarterAction.java)	(revision e2a59c50e8e06ff895161c92e5d9eb74aadc446a)
@@ -69,10 +69,6 @@
  * 
  * @struts:action path="/starter/learner" name="NbLearnerForm" scope="request" type="org.lamsfoundation.lams.tool.noticeboard.web.NbLearnerStarterAction"
  *               validate="false" parameter="mode"
- * @struts.action-exception key="error.exception.NbApplication" scope="request"
- *                          type="org.lamsfoundation.lams.tool.noticeboard.NbApplicationException"
- *                          path=".error"
- *                          handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
  * @struts:action-forward name="displayLearnerContent" path=".learnerContent"
  * @struts:action-forward name="displayMessage" path=".message"
  * @struts:action-forward name="defineLater" path=".defineLater"
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java
===================================================================
diff -u -reac1a7689dc88e224668832952fc27c8b732a8a9 -re2a59c50e8e06ff895161c92e5d9eb74aadc446a
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	(.../NbMonitoringAction.java)	(revision eac1a7689dc88e224668832952fc27c8b732a8a9)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	(.../NbMonitoringAction.java)	(revision e2a59c50e8e06ff895161c92e5d9eb74aadc446a)
@@ -61,14 +61,6 @@
  * 
  * @struts:action path="/monitoring" name="NbMonitoringForm" scope="request" type="org.lamsfoundation.lams.tool.noticeboard.web.NbMonitoringAction"
  *                input=".monitoringContent" validate="false" parameter="method"
- * @struts.action-exception key="error.exception.NbApplication" scope="request"
- *                          type="org.lamsfoundation.lams.tool.noticeboard.NbApplicationException"
- *                          path=".error"
- *                          handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
- * @struts.action-exception key="error.exception.NbApplication" scope="request"
- *                          type="java.lang.NullPointerException"
- *                          path=".error"
- *                          handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
  * @struts:action-forward name="monitorPage" path="/monitoring/monitoring.jsp"
  * ----------------XDoclet Tags--------------------
  */
Fisheye: Tag e2a59c50e8e06ff895161c92e5d9eb74aadc446a refers to a dead (removed) revision in file `lams_tool_nb/web/403.html'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_nb/web/403.jsp
===================================================================
diff -u
--- lams_tool_nb/web/403.jsp	(revision 0)
+++ lams_tool_nb/web/403.jsp	(revision e2a59c50e8e06ff895161c92e5d9eb74aadc446a)
@@ -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_nb/web/404.jsp
===================================================================
diff -u
--- lams_tool_nb/web/404.jsp	(revision 0)
+++ lams_tool_nb/web/404.jsp	(revision e2a59c50e8e06ff895161c92e5d9eb74aadc446a)
@@ -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_nb/web/WEB-INF/struts-config.xml
===================================================================
diff -u -reac1a7689dc88e224668832952fc27c8b732a8a9 -re2a59c50e8e06ff895161c92e5d9eb74aadc446a
--- lams_tool_nb/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision eac1a7689dc88e224668832952fc27c8b732a8a9)
+++ lams_tool_nb/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision e2a59c50e8e06ff895161c92e5d9eb74aadc446a)
@@ -37,10 +37,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 =================================== -->
   <global-forwards>
@@ -59,13 +63,6 @@
       unknown="false"
       validate="false"
     >
-      <exception
-        key="error.exception.NbApplication"
-        type="org.lamsfoundation.lams.tool.noticeboard.NbApplicationException"
-        handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
-        path=".error"
-        scope="request"
-      />
       <forward
         name="displayLearnerContent"
         path=".learnerContent"
@@ -99,20 +96,6 @@
       unknown="false"
       validate="true"
     >
-      <exception
-        key="error.exception.NbApplication"
-        type="org.lamsfoundation.lams.tool.noticeboard.NbApplicationException"
-        handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
-        path=".error"
-        scope="request"
-      />
-      <exception
-        key="error.exception.NbApplication"
-        type="java.lang.NullPointerException"
-        handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
-        path=".error"
-        scope="request"
-      />
       <forward
         name="authoringContent"
         path="/authoring/authoring.jsp"
@@ -133,13 +116,6 @@
       unknown="false"
       validate="false"
     >
-      <exception
-        key="error.exception.NbApplication"
-        type="org.lamsfoundation.lams.tool.noticeboard.NbApplicationException"
-        handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
-        path=".error"
-        scope="request"
-      />
       <forward
         name="exportPortfolio"
         path="/exportPortfolio.jsp"
@@ -156,20 +132,6 @@
       unknown="false"
       validate="false"
     >
-      <exception
-        key="error.exception.NbApplication"
-        type="org.lamsfoundation.lams.tool.noticeboard.NbApplicationException"
-        handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
-        path=".error"
-        scope="request"
-      />
-      <exception
-        key="error.exception.NbApplication"
-        type="java.lang.NullPointerException"
-        handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
-        path=".error"
-        scope="request"
-      />
       <forward
         name="monitorPage"
         path="/monitoring/monitoring.jsp"
@@ -186,13 +148,6 @@
       unknown="false"
       validate="false"
     >
-      <exception
-        key="error.exception.NbApplication"
-        type="org.lamsfoundation.lams.tool.noticeboard.NbApplicationException"
-        handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
-        path=".error"
-        scope="request"
-      />
       <forward
         name="displayLearnerContent"
         path=".learnerContent"
Index: lams_tool_nb/web/WEB-INF/web.xml
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -re2a59c50e8e06ff895161c92e5d9eb74aadc446a
--- lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision e2a59c50e8e06ff895161c92e5d9eb74aadc446a)
@@ -145,10 +145,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>
 		<!--  ======================================================== -->	
Index: lams_tool_nb/web/error.jsp
===================================================================
diff -u
--- lams_tool_nb/web/error.jsp	(revision 0)
+++ lams_tool_nb/web/error.jsp	(revision e2a59c50e8e06ff895161c92e5d9eb74aadc446a)
@@ -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_nb/web/login.jsp
===================================================================
diff -u -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 -re2a59c50e8e06ff895161c92e5d9eb74aadc446a
--- lams_tool_nb/web/login.jsp	(.../login.jsp)	(revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80)
+++ lams_tool_nb/web/login.jsp	(.../login.jsp)	(revision e2a59c50e8e06ff895161c92e5d9eb74aadc446a)
@@ -1,15 +1,12 @@
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ 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>
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <base href="<lams:WebAppURL/>">
-    <title>System logon required</title>
-	<lams:css/>
-  </head>
-  
-  <body>
-	You need login <a href="<lams:LAMSURL/>">here</a>.
 
-  </body>
-</html>