Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/CustomStrutsExceptionHandler.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/web/403.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/403.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_vote/web/403.jsp	25 Jul 2006 05:26:57 -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_vote/web/404.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/404.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_vote/web/404.jsp	25 Jul 2006 05:26:57 -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_vote/web/error.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/error.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_vote/web/error.jsp	25 Jul 2006 05:26:57 -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_vote/web/login.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/login.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_vote/web/login.jsp	6 Jul 2006 04:33:37 -0000	1.2
+++ lams_tool_vote/web/login.jsp	25 Jul 2006 05:26:57 -0000	1.3
@@ -1,22 +1,12 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-core" prefix="c" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<script type="text/javascript">
+	if(window.top != null){
+		window.top.location.href = "${lams}index.jsp";
+	}else
+		location.href = "${lams}index.jsp";
+</script>
 
 
-<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
-<%
-String path = request.getContextPath();
-String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
-%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <base href="<%=basePath%>">
-    
-    <title>System logon required</title>
-
-  </head>
-  
-  <body>
-	You need login <a href="/lams/index.jsp">here</a>.
-
-  </body>
-</html>
Index: lams_tool_vote/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/struts-config.xml,v
diff -u -r1.21 -r1.22
--- lams_tool_vote/web/WEB-INF/struts-config.xml	14 Jul 2006 04:50:05 -0000	1.21
+++ lams_tool_vote/web/WEB-INF/struts-config.xml	25 Jul 2006 05:26:57 -0000	1.22
@@ -12,15 +12,15 @@
 	
   	<!-- ========== Global Exception Definitions =================================== -->
 	<global-exceptions>
-	      <exception
-	        key="error.exception.VoteApplication"
-	        type="org.lamsfoundation.lams.tool.vote.VoteApplicationException"
-	        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 =================================== -->
    	<global-forwards>
 		<forward name="starter" path="/authoringStarter"/>   
@@ -35,22 +35,6 @@
 	      	scope="session"
    			input="/index.jsp"> 
 	
-		<exception
-	        key="error.exception.VoteApplication"
-	        type="org.lamsfoundation.lams.tool.vote.VoteApplicationException"
-	        handler="org.lamsfoundation.lams.tool.vote.web.CustomStrutsExceptionHandler"
-	        path="/VoteErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.VoteApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.vote.web.CustomStrutsExceptionHandler"
-	        path="/VoteErrorBox.jsp"
-	        scope="request"
-	      />	         			
-
 	  	<forward
 		    name="load"
 		    path="/authoring/AuthoringMaincontent.jsp"
@@ -102,23 +86,7 @@
 	      	scope="session"
     	  	input="/authoring/AuthoringMaincontent.jsp"
       		parameter="dispatch">
-	
-		<exception
-	        key="error.exception.VoteApplication"
-	        type="org.lamsfoundation.lams.tool.vote.VoteApplicationException"
-	        handler="org.lamsfoundation.lams.tool.vote.web.CustomStrutsExceptionHandler"
-	        path="/VoteErrorBox.jsp"
-	        scope="request"
-	      />
 
-		<exception
-	        key="error.exception.VoteApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.vote.web.CustomStrutsExceptionHandler"
-	        path="/VoteErrorBox.jsp"
-	        scope="request"
-	      />	         			
-    	
 	      <forward
 	        name="load"
 	        path="/authoring/AuthoringMaincontent.jsp"
@@ -157,22 +125,6 @@
    			name="VoteAuthoringForm" 
    			input="/index.jsp"> 
 	
-		<exception
-	        key="error.exception.VoteApplication"
-	        type="org.lamsfoundation.lams.tool.vote.VoteApplicationException"
-	        handler="org.lamsfoundation.lams.tool.vote.web.CustomStrutsExceptionHandler"
-	        path="/VoteErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.VoteApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.vote.web.CustomStrutsExceptionHandler"
-	        path="/VoteErrorBox.jsp"
-	        scope="request"
-	      />	
-
 	      <forward
 	        name="load"
 	        path="/authoring/AuthoringMaincontent.jsp"
@@ -196,22 +148,6 @@
 	      	unknown="false"
    			input="/learningIndex.jsp"> 
 
-		<exception
-	        key="error.exception.VoteApplication"
-	        type="org.lamsfoundation.lams.tool.vote.VoteApplicationException"
-	        handler="org.lamsfoundation.lams.tool.vote.web.CustomStrutsExceptionHandler"
-	        path="/VoteErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.VoteApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.vote.web.CustomStrutsExceptionHandler"
-	        path="/VoteErrorBox.jsp"
-	        scope="request"
-	      />	         			
-
 	  	<forward
 		    name="loadLearner"
 		    path="/learning/AnswersContent.jsp"
@@ -291,22 +227,6 @@
       		input="/learning/AnswersContent.jsp"
       		parameter="dispatch">
       		
-		<exception
-	        key="error.exception.VoteApplication"
-	        type="org.lamsfoundation.lams.tool.vote.VoteApplicationException"
-	        handler="org.lamsfoundation.lams.tool.vote.web.CustomStrutsExceptionHandler"
-	        path="/VoteErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.VoteApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.vote.web.CustomStrutsExceptionHandler"
-	        path="/VoteErrorBox.jsp"
-	        scope="request"
-	      />	         			
-
 	  	<forward
 		    name="loadLearner"
 		    path="/learning/AnswersContent.jsp"
@@ -382,22 +302,6 @@
       		validate="false"
    			input="/monitoringIndex.jsp"> 
 
-		<exception
-	        key="error.exception.VoteApplication"
-	        type="org.lamsfoundation.lams.tool.vote.VoteApplicationException"
-	        handler="org.lamsfoundation.lams.tool.vote.web.CustomStrutsExceptionHandler"
-	        path="/VoteErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.VoteApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.vote.web.CustomStrutsExceptionHandler"
-	        path="/VoteErrorBox.jsp"
-	        scope="request"
-	      />	      
-	      
 	  	<forward
 			name="loadMonitoring"
 			path="/monitoring/MonitoringMaincontent.jsp"
@@ -428,22 +332,6 @@
       		parameter="method"
       		unknown="false"
       		validate="false"> 
-
-		<exception
-	        key="error.exception.VoteApplication"
-	        type="org.lamsfoundation.lams.tool.vote.VoteApplicationException"
-	        handler="org.lamsfoundation.lams.tool.vote.web.CustomStrutsExceptionHandler"
-	        path="/VoteErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.VoteApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.vote.web.CustomStrutsExceptionHandler"
-	        path="/VoteErrorBox.jsp"
-	        scope="request"
-	      />	         			
 	      
 	  	<forward
 			name="loadMonitoring"
Index: lams_tool_vote/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/web.xml,v
diff -u -r1.9 -r1.10
--- lams_tool_vote/web/WEB-INF/web.xml	30 Jun 2006 07:05:48 -0000	1.9
+++ lams_tool_vote/web/WEB-INF/web.xml	25 Jul 2006 05:26:57 -0000	1.10
@@ -178,11 +178,19 @@
    	</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: