Index: lams_central/conf/xdoclet/error-pages.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/error-pages.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_central/conf/xdoclet/error-pages.xml	25 Jul 2006 06:02:28 -0000	1.1
@@ -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_central/conf/xdoclet/global-exceptions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/global-exceptions.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_central/conf/xdoclet/global-exceptions.xml	25 Jul 2006 06:02:28 -0000	1.1
@@ -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_central/web/403.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/Attic/403.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_central/web/403.jsp	25 Jul 2006 06:02:28 -0000	1.1
@@ -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_central/web/404.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/Attic/404.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_central/web/404.jsp	25 Jul 2006 06:02:28 -0000	1.1
@@ -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_central/web/error.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/error.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_central/web/error.jsp	25 Jul 2006 06:02:28 -0000	1.1
@@ -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_central/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.22 -r1.23
--- lams_central/web/WEB-INF/lams.tld	14 Jul 2006 05:07:07 -0000	1.22
+++ lams_central/web/WEB-INF/lams.tld	25 Jul 2006 06:02:28 -0000	1.23
@@ -310,8 +310,5 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-	<tag-file>
-	    <name>DefineLater</name>
-		<path>/WEB-INF/tags/DefineLater.tag</path>
-   	</tag-file>  
+
 </taglib>
Index: lams_central/web/css/default.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/Attic/default.css,v
diff -u -r1.10 -r1.11
--- lams_central/web/css/default.css	1 Jul 2006 12:48:30 -0000	1.10
+++ lams_central/web/css/default.css	25 Jul 2006 06:02:28 -0000	1.11
@@ -40,10 +40,10 @@
 	padding-top:25px; }
 
 h2 {color:#47bc23; 
-font-size:14px; 
-margin-left:10px; 
-margin-bottom:0px; 
-margin-top:10px; }; 
+	font-size:14px; 
+	margin-left:10px; 
+	margin-bottom:0px; 
+	margin-top:10px; } 
 
 
 h4 {color:#47bc23; font-size:11px;}
@@ -435,19 +435,19 @@
 	 }
 
 table.chosengrouping tr { 
-	valign:top
+	vertical-align:top
 }
 
 table.chosengrouping th { 
 	padding:0px; 
 	font-size:11px;
-	align:center;
+	text-align:center;
 }
 
 table.chosengrouping td { 
 	padding:0px; 
 	font-size:11px;
-	align:center;
+	text-align:center;
 }
 
 table.chosengrouping td p{ 
Index: lams_learning/conf/xdoclet/error-pages.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/error-pages.xml,v
diff -u -r1.2 -r1.3
--- lams_learning/conf/xdoclet/error-pages.xml	23 Jun 2006 07:58:00 -0000	1.2
+++ lams_learning/conf/xdoclet/error-pages.xml	25 Jul 2006 06:01:51 -0000	1.3
@@ -1 +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_learning/conf/xdoclet/global-exceptions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/global-exceptions.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_learning/conf/xdoclet/global-exceptions.xml	25 Jul 2006 06:01:51 -0000	1.1
@@ -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 1.3 refers to a dead (removed) revision in file `lams_learning/src/java/org/lamsfoundation/lams/learning/util/CustomStrutsExceptionHandler.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/Attic/DummyLearnerAction.java,v
diff -u -r1.11 -r1.12
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java	12 Jul 2006 04:47:55 -0000	1.11
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java	25 Jul 2006 06:01:51 -0000	1.12
@@ -54,10 +54,6 @@
  * @struts:action path="/dummylearner" 
  *                parameter="method" 
  *                validate="false"
- * @struts.action-exception key="error.system.learner" scope="request"
- *                          type="org.lamsfoundation.lams.learning.service.LearnerServiceException"
- *                          path=".systemError"
- * 							handler="org.lamsfoundation.lams.learning.util.CustomStrutsExceptionHandler"
  * @struts:action-forward name="controlActivity" path="/dummyControlFrame.jsp"
  * @struts:action-forward name="displayActivity" path="/DisplayActivity.do"
  * 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java,v
diff -u -r1.11 -r1.12
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java	12 Jul 2006 04:47:55 -0000	1.11
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java	25 Jul 2006 06:01:51 -0000	1.12
@@ -74,10 +74,6 @@
  * 				  path="/gate" 
  *                parameter="method" 
  *                validate="false"
- * @struts.action-exception key="error.system.learner" scope="request"
- *                          type="org.lamsfoundation.lams.learning.service.LearnerServiceException"
- *                          path=".systemError"
- * 							handler="org.lamsfoundation.lams.learning.util.CustomStrutsExceptionHandler"
  * 
  * @struts:action-forward name="permissionGate" path=".permissionGate"
  * @struts:action-forward name="scheduleGate" path=".scheduleGate"
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java,v
diff -u -r1.21 -r1.22
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	12 Jul 2006 04:47:56 -0000	1.21
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	25 Jul 2006 06:01:51 -0000	1.22
@@ -70,10 +70,6 @@
  * 				  path="/grouping" 
  *                parameter="method" 
  *                validate="false"
- * @struts.action-exception key="error.system.learner" scope="request"
- *                          type="org.lamsfoundation.lams.learning.service.LearnerServiceException"
- *                          path=".systemError"
- * 							handler="org.lamsfoundation.lams.learning.util.CustomStrutsExceptionHandler"
  * @struts:action-forward name="viewGroup" path="/grouping.do?method=viewGrouping"
  * @struts:action-forward name="showGroup" path=".showgroup"
  * @struts:action-forward name="waitGroup" path=".waitgroup"
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java,v
diff -u -r1.32 -r1.33
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	25 Jul 2006 01:22:48 -0000	1.32
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	25 Jul 2006 06:01:51 -0000	1.33
@@ -81,10 +81,6 @@
  * @struts:action path="/learner" 
  *                parameter="method" 
  *                validate="false"
- * @struts.action-exception key="error.system.learner" scope="request"
- *                          type="org.lamsfoundation.lams.learning.service.LearnerServiceException"
- *                          path=".systemError"
- * 							handler="org.lamsfoundation.lams.learning.util.CustomStrutsExceptionHandler"
  * @struts:action-forward name="displayActivity" path="/DisplayActivity.do" 
  * ----------------XDoclet Tags--------------------
  * 
Index: lams_learning/web/403.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/403.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_learning/web/403.jsp	25 Jul 2006 06:01:51 -0000	1.1
@@ -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_learning/web/404.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/404.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_learning/web/404.jsp	25 Jul 2006 06:01:51 -0000	1.1
@@ -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_learning/web/error.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/error.jsp,v
diff -u -r1.7 -r1.8
--- lams_learning/web/error.jsp	1 Jul 2006 12:49:10 -0000	1.7
+++ lams_learning/web/error.jsp	25 Jul 2006 06:01:51 -0000	1.8
@@ -1,58 +1,63 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
+<%@ 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>
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
+<%-- 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) {
+%>
 
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-  USA
-
-  http://www.gnu.org/licenses/gpl.txt
---%>
-
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ page import="org.apache.struts.action.Action" %>
+<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>
 <%
-String cprotocol = request.getProtocol();
-if(cprotocol.startsWith("HTTPS")){
-	cprotocol = "https://";
-}else{
-	cprotocol = "http://";
+		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>
+<%
 }
-String pathToShare = cprotocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/..";
 %>
+<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">
 
-	<h1 class="no-tabs-below">&nbsp;</h1>
-	<div id="header-no-tabs-learner">
+if(window.top != null)
+	document.getElementById("errorForm").target = "_parent";
+document.getElementById("errorForm").submit();
 
-	</div><!--closes header-->
-
-	<div id="content-learner">
-
-		<logic:messagesPresent> 
-			<p><img src="<%=pathToShare%>/images/error.jpg" alt='<fmt:message key="error.title"/>'/></p>
-			 <html:messages id="error" message="false"> 
-				 <P class="warning"><c:out value="${error}" escapeXml="false"/></p>
-			 </html:messages> 
-		</logic:messagesPresent>
-
-	</div>  <!--closes content-->
-
-
-	<div id="footer-learner">
-	</div><!--closes footer-->
-
-
+</script>
\ No newline at end of file
Index: lams_learning/web/login.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/login.jsp,v
diff -u -r1.4 -r1.5
--- lams_learning/web/login.jsp	23 Jun 2006 07:58:00 -0000	1.4
+++ lams_learning/web/login.jsp	25 Jul 2006 06:01:51 -0000	1.5
@@ -1,38 +1,12 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-  USA
-
-  http://www.gnu.org/licenses/gpl.txt
---%>
-
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%
-String path = request.getContextPath();
-String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
-%>
+<%@ 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>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-  </head>
-  
-  <body>
-  	<fmt:message key="error.message.login"/>
-  </body>
-</html>
+
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/web.xml,v
diff -u -r1.27 -r1.28
--- lams_learning/web/WEB-INF/web.xml	1 Jul 2006 12:49:10 -0000	1.27
+++ lams_learning/web/WEB-INF/web.xml	25 Jul 2006 06:01:52 -0000	1.28
@@ -110,12 +110,6 @@
 		<servlet-name>exportDownload</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.learning.export.web.action.ExportDownloadServlet</servlet-class>
 	</servlet>
-	<servlet>
-		<description>Tool does not support portfolio exports</description>
-		<display-name>Export Portfolio Unavailable</display-name>
-		<servlet-name>exportNotSupported</servlet-name>
-		<servlet-class>org.lamsfoundation.lams.learning.export.web.action.ExportNotSupportedServlet</servlet-class>
-	</servlet>
 
   <servlet-mapping>
 	<servlet-name>action</servlet-name>
@@ -132,11 +126,6 @@
 		<url-pattern>/exportDownload</url-pattern>
 </servlet-mapping>
 
-<servlet-mapping>
-	<servlet-name>exportNotSupported</servlet-name>
-	<url-pattern>/exportNotSupported</url-pattern>
-</servlet-mapping>
-
    <servlet-mapping>
       <servlet-name>groupingExportPortfolio</servlet-name>
       <url-pattern>/groupingExportPortfolio</url-pattern>
Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.30 -r1.31
--- lams_learning/web/WEB-INF/struts/struts-config.xml	1 Jul 2006 12:49:10 -0000	1.30
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	25 Jul 2006 06:01:51 -0000	1.31
@@ -108,16 +108,6 @@
         path="/DisplayActivity.do"
         redirect="false"
       />
-      <forward
-        name="welcome"
-        path=".welcome"
-        redirect="false"
-      />
-      <forward
-        name="exit"
-        path="/exit.do"
-        redirect="false"
-      />
     </action>
     <action
       path="/DisplayToolActivity"
@@ -321,9 +311,6 @@
 <action path="/content"
 	type="org.apache.struts.actions.ForwardAction"
 	parameter=".welcome" />
-<action path="/exit"
-	type="org.apache.struts.actions.ForwardAction"
-	parameter=".exit" />
 <action path="/requestDisplay"
 	type="org.apache.struts.actions.ForwardAction"
 	parameter=".requestDisplay"/>
Index: lams_monitoring/conf/xdoclet/error-pages.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/xdoclet/error-pages.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_monitoring/conf/xdoclet/error-pages.xml	25 Jul 2006 06:07:26 -0000	1.1
@@ -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_monitoring/conf/xdoclet/global-exceptions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/xdoclet/global-exceptions.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_monitoring/conf/xdoclet/global-exceptions.xml	25 Jul 2006 06:07:26 -0000	1.1
@@ -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_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/Attic/DummyMonitoringAction.java,v
diff -u -r1.25 -r1.26
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java	19 Jun 2006 05:41:27 -0000	1.25
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java	25 Jul 2006 06:07:26 -0000	1.26
@@ -67,10 +67,6 @@
  * 				  name="DummyForm"
  *                parameter="method" 
  *                validate="false"
- * @struts.action-exception key="error.system.monitor" scope="request"
- *                          type="org.lamsfoundation.lams.monitoring.service.MonitoringServiceException"
- *                          path=".systemError"
- * 							handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
  * @struts:action-forward name="detail" path="/dummyDetail.jsp"
  * @struts:action-forward name="start" path="/dummyStart.jsp"
  * @struts:action-forward name="started" path="/dummyStarted.jsp"
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java,v
diff -u -r1.13 -r1.14
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java	19 Jul 2006 02:34:54 -0000	1.13
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java	25 Jul 2006 06:07:26 -0000	1.14
@@ -75,10 +75,6 @@
  *                parameter="method" 
  * 				  scope="session"
  *                validate="false"
- * @struts.action-exception key="error.system.monitor" scope="request"
- *                          type="org.lamsfoundation.lams.monitoring.service.MonitoringServiceException"
- *                          path=".systemError"
- * 							handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
  * @struts:action-forward name="viewSynchGate" path=".viewSynchGate"
  * @struts:action-forward name="viewPermissionGate" path=".viewPermissionGate"
  * @struts:action-forward name="viewScheduleGate" path=".viewScheduleGate"
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java,v
diff -u -r1.2 -r1.3
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java	12 Jul 2006 05:18:14 -0000	1.2
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java	25 Jul 2006 06:07:26 -0000	1.3
@@ -72,14 +72,6 @@
 * @struts:action path="/grouping" 
 *                parameter="method" 
 *                validate="false"
-* @struts.action-exception key="error.system.monitor" scope="request"
-*                          type="org.lamsfoundation.lams.monitoring.service.MonitoringServiceException"
-*                          path=".systemError"
-* 							handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
-* @struts.action-exception key="error.system.monitor" scope="request"
-*                          type="org.lamsfoundation.lams.lesson.service.LessonServiceException"
-*                          path=".systemError"
-* 							handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
 * @struts.action-forward name = "chosenGrouping" path = "/grouping/chosenGrouping.jsp"
 * @struts.action-forward name = "viewGroups" path = ".viewGroups"
 * 
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v
diff -u -r1.40 -r1.41
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	25 Jul 2006 06:04:16 -0000	1.40
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	25 Jul 2006 06:07:26 -0000	1.41
@@ -64,10 +64,6 @@
  * @struts:action path="/monitoring" 
  *                parameter="method" 
  *                validate="false"
- * @struts.action-exception key="error.system.monitor" scope="request"
- *                          type="org.lamsfoundation.lams.monitoring.service.MonitoringServiceException"
- *                          path=".systemError"
- * 							handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
  * @struts.action-forward name = "previewdeleted" path = "/previewdeleted.jsp"
  * @struts.action-forward name = "notsupported" path = ".notsupported"
  * 
Index: lams_monitoring/web/403.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/403.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_monitoring/web/403.jsp	25 Jul 2006 06:07:26 -0000	1.1
@@ -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_monitoring/web/404.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/404.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_monitoring/web/404.jsp	25 Jul 2006 06:07:26 -0000	1.1
@@ -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_monitoring/web/error.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/error.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_monitoring/web/error.jsp	25 Jul 2006 06:07:26 -0000	1.1
@@ -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_monitoring/web/login.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/login.jsp,v
diff -u -r1.1 -r1.2
--- lams_monitoring/web/login.jsp	23 Jun 2006 07:53:38 -0000	1.1
+++ lams_monitoring/web/login.jsp	25 Jul 2006 06:07:26 -0000	1.2
@@ -1,38 +1,12 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-  USA
-
-  http://www.gnu.org/licenses/gpl.txt
---%>
-
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%
-String path = request.getContextPath();
-String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
-%>
+<%@ 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>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-  </head>
-  
-  <body>
-  	<fmt:message key="error.message.login"/>
-  </body>
-</html>
+