Fisheye: Tag afa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2 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
===================================================================
diff -u -r019e11f9b8c2198557291f6b4a2244328f22f263 -rafa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision 019e11f9b8c2198557291f6b4a2244328f22f263)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision afa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2)
@@ -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
===================================================================
diff -u -r019e11f9b8c2198557291f6b4a2244328f22f263 -rafa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision 019e11f9b8c2198557291f6b4a2244328f22f263)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision afa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2)
@@ -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
===================================================================
diff -u -rff60206f498b016a282bba4630b2cc4e4324ab21 -rafa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision ff60206f498b016a282bba4630b2cc4e4324ab21)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision afa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2)
@@ -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
===================================================================
diff -u -re49068e45839612d025d20b33368c7ca21346a6f -rafa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	(.../McMonitoringStarterAction.java)	(revision e49068e45839612d025d20b33368c7ca21346a6f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	(.../McMonitoringStarterAction.java)	(revision afa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2)
@@ -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
===================================================================
diff -u
--- lams_tool_lamc/web/403.jsp	(revision 0)
+++ lams_tool_lamc/web/403.jsp	(revision afa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2)
@@ -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
===================================================================
diff -u
--- lams_tool_lamc/web/404.jsp	(revision 0)
+++ lams_tool_lamc/web/404.jsp	(revision afa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2)
@@ -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/WEB-INF/struts-config.xml
===================================================================
diff -u -ref86b9bcf237dc6dc32989b19793d14acc46ef28 -rafa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision ef86b9bcf237dc6dc32989b19793d14acc46ef28)
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision afa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2)
@@ -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
===================================================================
diff -u -rfdb3e5c043522549d839142cfb3ef4e919913bbd -rafa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2
--- lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
+++ lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision afa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2)
@@ -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.
Index: lams_tool_lamc/web/error.jsp
===================================================================
diff -u
--- lams_tool_lamc/web/error.jsp	(revision 0)
+++ lams_tool_lamc/web/error.jsp	(revision afa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2)
@@ -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
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -rafa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2
--- lams_tool_lamc/web/login.jsp	(.../login.jsp)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_lamc/web/login.jsp	(.../login.jsp)	(revision afa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2)
@@ -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>