Update of /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/error
In directory
james.mmbase.org:/tmp/cvs-serv13255/cmsc/edit-webapp/src/webapp/error
Modified Files:
500.jsp senderror.jsp
Log Message:
CMSC-1019 - Sending stacktraces in email gets trimmed
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/error
See also: http://www.mmbase.org/jira/browse/CMSC-1019
Index: 500.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/error/500.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- 500.jsp 11 Jun 2007 14:17:53 -0000 1.6
+++ 500.jsp 17 Jul 2008 12:48:25 -0000 1.7
@@ -1,8 +1,8 @@
-<[EMAIL PROTECTED] language="java" contentType="text/html;charset=UTF-8"%>
-<[EMAIL PROTECTED] isErrorPage="true"%>
-<[EMAIL PROTECTED] file="globals.jsp"%>
-<[EMAIL PROTECTED] import="java.io.*,java.text.*"%>
-<%!
+<[EMAIL PROTECTED] language="java" contentType="text/html;charset=UTF-8"
+%><[EMAIL PROTECTED] isErrorPage="true"
+%><[EMAIL PROTECTED] file="globals.jsp"
+%><[EMAIL PROTECTED] import="java.io.*,java.text.*"
+%><%!
Logger log = Logging.getLoggerInstance("ERROR-JSP");
/** the date + time long format */
@@ -25,6 +25,8 @@
long ticket = System.currentTimeMillis();
String msg = net.sf.mmapps.commons.util.HttpUtil.getErrorInfo(request,
exception, ticket, version);
+ request.setAttribute("msg", msg);
+
String message = "";
if (exception != null) {
@@ -49,7 +51,7 @@
<form action="<c:url value='/error/senderror.jsp' />" method="post">
<input type="hidden" name="messagetype" value="500" />
<input type="hidden" name="ticket" value="<%= ticket %>" />
- <input type="hidden" name="message" value="<%= msg %>" />
+ <input type="hidden" name="message" value="<c:out value="${msg}"/>" />
</form>
<p><a href="javascript:document.forms[0].submit();"><fmt:message
key="exception.500.send" /></a></p>
@@ -64,9 +66,9 @@
}
}
</script>
-<P>
+<p>
<a href="javascript:showError();"><fmt:message
key="exception.500.showerror" /></a>
-</P>
+</p>
<div id="errordiv" style="display:none">
<pre><%= getDateTimeString(ticket) %> - <%= message %></pre>
<br /><br />
Index: senderror.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/error/senderror.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- senderror.jsp 11 Jun 2007 14:17:53 -0000 1.2
+++ senderror.jsp 17 Jul 2008 12:48:25 -0000 1.3
@@ -25,10 +25,8 @@
log.error(wr.toString());
}
%>
-<html>
-<head>
-</head>
-<body>
- Error has been submitted.
-</body>
-</html>
\ No newline at end of file
+<c:set var="title" scope="request">Error is submitted</c:set>
+<[EMAIL PROTECTED] file="header.jsp"%>
+<p>Error has been submitted properly.</p>
+<p>Thank you!</p>
+<[EMAIL PROTECTED] file="footer.jsp"%>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
