Index: lams_tool_nb/web/error.jsp
===================================================================
diff -u -r8b5940710ceac2c67320a1954dea1c58120c78b1 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af
--- lams_tool_nb/web/error.jsp (.../error.jsp) (revision 8b5940710ceac2c67320a1954dea1c58120c78b1)
+++ lams_tool_nb/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af)
@@ -1,16 +1,23 @@
-
-
<%@ 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"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+
+
+
+
+
<%-- Catch JSP Servlet Exception --%>
+<%-- The javascript method checkForErrorScreen in error.js is coded to match this page exactly.
+---- If you change this page, please change the javascript. --%>
<%
- if (exception != null) {
+if ( Configuration.getAsBoolean(ConfigurationKeys.ERROR_STACK_TRACE) ) {
+if (exception != null ) {
%>
<%=exception.getMessage()%>
@@ -19,7 +26,7 @@
<%=exception.getClass().getName()%>
<%
- java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream();
+ 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());
@@ -28,48 +35,44 @@
<%=stack%>
<%
- } else if ((Exception) request
- .getAttribute("javax.servlet.error.exception") != null) {
+} else if ((Exception) request.getAttribute("javax.servlet.error.exception") != null) {
%>
- <%=((Exception) request
- .getAttribute("javax.servlet.error.exception"))
- .getMessage()%>
+ <%=((Exception) request.getAttribute("javax.servlet.error.exception")).getMessage()%>
- <%=((Exception) request
- .getAttribute("javax.servlet.error.exception"))
- .getMessage().getClass().getName()%>
+ <%=((Exception) request.getAttribute("javax.servlet.error.exception")).getMessage()
+ .getClass().getName()%>
<%
- java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream();
+ 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);
+ ((Exception) request.getAttribute("javax.servlet.error.exception")).printStackTrace(os);
String stack = new String(bos.toByteArray());
%>
<%=stack%>
<%
- }
+}
+}
%>
-
+
+
-
-
+
-
+
-
+