Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/CustomStrutsExceptionHandler.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java,v
diff -u -r1.32 -r1.33
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	23 Jul 2006 22:53:27 -0000	1.32
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	25 Jul 2006 05:16:26 -0000	1.33
@@ -93,23 +93,6 @@
       		parameter="method"
       		unknown="false"
       		validate="false">
-	
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			      		
-
 	  	<forward
 		    name="loadLearner"
 		    path="/learning/AnswersContent.jsp"
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v
diff -u -r1.57 -r1.58
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	23 Jul 2006 22:53:27 -0000	1.57
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	25 Jul 2006 05:16:26 -0000	1.58
@@ -104,22 +104,6 @@
 	      	unknown="false"
    			input="/learningIndex.jsp"> 
 
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			   			
-
 	  	<forward
 		    name="loadLearner"
 		    path="/learning/AnswersContent.jsp"
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v
diff -u -r1.25 -r1.26
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	24 Jun 2006 23:36:32 -0000	1.25
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	25 Jul 2006 05:16:26 -0000	1.26
@@ -72,22 +72,6 @@
       		unknown="false"
       		validate="true"> 
 
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path=".mcErrorBox"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path=".mcErrorBox"
-	        scope="request"
-	      />	         			      		
-
 	  	<forward
 		    name="loadMonitoring"
 		    path=".monitoringContent"
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java,v
diff -u -r1.34 -r1.35
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	21 Jul 2006 20:09:32 -0000	1.34
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	25 Jul 2006 05:16:26 -0000	1.35
@@ -59,22 +59,6 @@
    			type="org.lamsfoundation.lams.tool.mc.web.McMonitoringStarterAction" 
    			name="McMonitoringForm" 
    			input=".monitoringStarter"> 
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path=".mcErrorBox"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path=".mcErrorBox"
-	        scope="request"
-	      />	         			   			
    			
 	  	<forward
 		    name="loadMonitoring"
Index: lams_tool_lamc/web/403.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/403.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/403.jsp	25 Jul 2006 05:16: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_tool_lamc/web/404.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/404.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/404.jsp	25 Jul 2006 05:16: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_tool_lamc/web/error.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/error.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/error.jsp	25 Jul 2006 05:16: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_tool_lamc/web/login.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/login.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/web/login.jsp	6 Jul 2006 04:37:54 -0000	1.4
+++ lams_tool_lamc/web/login.jsp	25 Jul 2006 05:16:26 -0000	1.5
@@ -1,21 +1,12 @@
-<%@ page language="java" import="java.util.*" pageEncoding="UTF-8" contentType="text/html;charset=utf-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>
+<script type="text/javascript">
+	if(window.top != null){
+		window.top.location.href = "${lams}index.jsp";
+	}else
+		location.href = "${lams}index.jsp";
+</script>
 
-<%
-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>
Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/struts-config.xml,v
diff -u -r1.52 -r1.53
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	23 Jul 2006 14:55:12 -0000	1.52
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	25 Jul 2006 05:16:26 -0000	1.53
@@ -12,13 +12,12 @@
 	
   	<!-- ========== Global Exception Definitions =================================== -->
 	<global-exceptions>
-	      <exception
-	        key="error.system.mc"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.util.CustomStrutsExceptionHandler"
-	        path="/SystemErrorContent.jsp"
-	        scope="request"
-	      />
+	  <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 =================================== -->
@@ -34,23 +33,6 @@
    			name="McAuthoringForm" 
 	      	scope="session"
    			input="/index.jsp"> 
-	
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			
-
 	  	<forward
 		    name="load"
 		    path="/authoring/AuthoringMaincontent.jsp"
@@ -102,23 +84,6 @@
 	      	scope="session"
     	  	input="/authoring/AuthoringMaincontent.jsp"
       		parameter="dispatch">
-	
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			      		
-    	
 	      <forward
 	        name="load"
 	        path="/authoring/AuthoringMaincontent.jsp"
@@ -157,23 +122,7 @@
    			type="org.lamsfoundation.lams.tool.mc.web.McDLStarterAction" 
    			name="McAuthoringForm" 
    			input="/index.jsp"> 
-	
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />
 
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			   			
-
 	  	<forward
 		    name="load"
 		    path="/authoring/AuthoringMaincontent.jsp"
@@ -203,22 +152,6 @@
 	      	unknown="false"
    			input="/learningIndex.jsp"> 
 
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			   			
-
 	  	<forward
 		    name="loadLearner"
 		    path="/learning/AnswersContent.jsp"
@@ -278,23 +211,7 @@
       		parameter="method"
       		unknown="false"
       		validate="false">
-	
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />
 
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			      		
-
 	  	<forward
 		    name="loadLearner"
 		    path="/learning/AnswersContent.jsp"
@@ -360,22 +277,6 @@
       		validate="false"
    			input="/monitoringIndex.jsp"> 
 
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			   			
-   			
 	  	<forward
 		    name="loadMonitoring"
 		    path="/monitoring/MonitoringMaincontent.jsp"
@@ -411,23 +312,6 @@
       		parameter="method"
       		unknown="false"
       		validate="false"> 
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			      		
-
 	  	<forward
 		    name="loadMonitoring"
 		    path="/monitoring/MonitoringMaincontent.jsp"
@@ -476,13 +360,7 @@
 		      unknown="false"
 		      validate="false"
 	    >
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			      		
+         			      		
 	      <forward
 	        name="exportPortfolio"
 	        path="/exportPortfolio.jsp"
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/web.xml,v
diff -u -r1.20 -r1.21
--- lams_tool_lamc/web/WEB-INF/web.xml	30 Jun 2006 07:05:48 -0000	1.20
+++ lams_tool_lamc/web/WEB-INF/web.xml	25 Jul 2006 05:16:26 -0000	1.21
@@ -145,11 +145,20 @@
    	<session-config>
       	<session-timeout>120</session-timeout>
    	</session-config>
-   
+   	
     <error-page>
-		<error-code>403</error-code>
-		<location>/403.html</location>
-	</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>
+    
    
    <!--
    To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/CustomStrutsExceptionHandler.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java,v
diff -u -r1.11 -r1.12
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	2 Jul 2006 13:31:20 -0000	1.11
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	25 Jul 2006 05:22:38 -0000	1.12
@@ -94,23 +94,6 @@
       unknown="false"
       validate="true"
     >
-    
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-	    
 	  	<forward
 	        name="load"
 	        path="/AuthoringMaincontent.jsp"
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v
diff -u -r1.39 -r1.40
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	14 Jul 2006 05:02:38 -0000	1.39
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	25 Jul 2006 05:22:38 -0000	1.40
@@ -113,22 +113,6 @@
    		type="org.lamsfoundation.lams.tool.qa.web.QaLearningStarterAction" 
    		name="QaLearningForm" input="/learningIndex.jsp"> 
    			
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-
 	  	<forward
 		    name="loadLearner"
 		    path="/learning/AnswersContent.jsp"
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java,v
diff -u -r1.36 -r1.37
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	5 Jun 2006 21:01:15 -0000	1.36
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	25 Jul 2006 05:22:38 -0000	1.37
@@ -65,23 +65,7 @@
 		parameter="method"
 		unknown="false"
 		validate="false">
-		
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-		
+
 	  	<forward
 		    name="loadMonitoring"
 		    path="/monitoring/MonitoringMaincontent.jsp"
Index: lams_tool_laqa/web/403.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/403.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/403.jsp	25 Jul 2006 05:22:38 -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_tool_laqa/web/404.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/404.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/404.jsp	25 Jul 2006 05:22:38 -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_tool_laqa/web/error.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/error.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/error.jsp	25 Jul 2006 05:22:38 -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_tool_laqa/web/login.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/login.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_laqa/web/login.jsp	6 Jul 2006 04:37:26 -0000	1.6
+++ lams_tool_laqa/web/login.jsp	25 Jul 2006 05:22:38 -0000	1.7
@@ -1,41 +1,12 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
+<%@ 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>
 
-  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" 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>
Index: lams_tool_laqa/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/struts-config.xml,v
diff -u -r1.31 -r1.32
--- lams_tool_laqa/web/WEB-INF/struts-config.xml	14 Jul 2006 05:02:38 -0000	1.31
+++ lams_tool_laqa/web/WEB-INF/struts-config.xml	25 Jul 2006 05:22:38 -0000	1.32
@@ -20,20 +20,13 @@
 	</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
-	        key="error.exception.QaApplication"
-	        type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-	        handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-	        path="/SystemErrorContent.jsp"
-	        scope="request"
-	      />
+	  <exception
+	    handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
+	    key="error.system"
+	    path="/error.jsp"
+	    scope="request"
+	    type="java.lang.Exception"/>
 	</global-exceptions>
 
 
@@ -56,22 +49,6 @@
 		validate="false"
     >
 
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-	    
 	    <forward
 			name="load"
 			path="/AuthoringMaincontent.jsp"
@@ -114,22 +91,6 @@
       validate="false"
     >
     
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-	    
 	  	<forward
 	        name="load"
 	        path="/AuthoringMaincontent.jsp"
@@ -171,22 +132,6 @@
     	validate="false"
    		input="/learningIndex.jsp"> 
    			
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-
 	  	<forward
 		    name="loadLearner"
 		    path="/learning/AnswersContent.jsp"
@@ -246,22 +191,6 @@
       unknown="false"
       validate="false">
 
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-
       	<forward
 		    name="loadLearner"
 		    path="/learning/AnswersContent.jsp"	        
@@ -327,22 +256,6 @@
 	scope="session"
    	input="/index.jsp"> 
 
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-
 	  	<forward
 		    name="load"
           	path="/AuthoringMaincontent.jsp"
@@ -377,22 +290,6 @@
 		unknown="false"
 		validate="true">
 		
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-		
 	  	<forward
 			name="loadMonitoring"
 			path="/monitoring/MonitoringMaincontent.jsp"
@@ -421,22 +318,6 @@
 	      unknown="false"
 	      validate="true">
 	      
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-	      
 	  	<forward
 			name="loadMonitoring"
 			path="/monitoring/MonitoringMaincontent.jsp"
Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/web.xml,v
diff -u -r1.23 -r1.24
--- lams_tool_laqa/web/WEB-INF/web.xml	30 Jun 2006 07:05:48 -0000	1.23
+++ lams_tool_laqa/web/WEB-INF/web.xml	25 Jul 2006 05:22:38 -0000	1.24
@@ -150,10 +150,18 @@
    	</session-config>
    
     <error-page>
-		<error-code>403</error-code>
-		<location>/403.html</location>
-	</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>
+       
    <!--
    To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
    Organize mime-mappings.xml following this DTD slice: