Author: agilliland
Date: Wed Jan 11 22:38:33 2006
New Revision: 368291
URL: http://svn.apache.org/viewcvs?rev=368291&view=rev
Log:
added new runtime prop "site.debugMode" which enables extra debugging.
error page should not show stacktraces by default. if debug mode is enabled
then error page will print stacktraces.
Modified:
incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/trunk/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
incubator/roller/trunk/web/errorBody.jsp
Modified:
incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties?rev=368291&r1=368290&r2=368291&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
(original)
+++ incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
Wed Jan 11 22:38:33 2006
@@ -263,6 +263,7 @@
configForm.searchIndexDir=Search Index Directory<br />(use ${user.home} for \
system property)
configForm.suspendPingProcessing=Suspend all ping processing?
+configForm.debugMode=Enable debug mode?
configForm.emailNotification=Email notification?
configForm.userSettings=User Settings
Modified: incubator/roller/trunk/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml?rev=368291&r1=368290&r2=368291&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
(original)
+++ incubator/roller/trunk/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml Wed
Jan 11 22:38:33 2006
@@ -51,6 +51,10 @@
<type>boolean</type>
<default-value>false</default-value>
</property-def>
+ <property-def name="site.debugMode" key="configForm.debugMode">
+ <type>boolean</type>
+ <default-value>false</default-value>
+ </property-def>
</display-group >
<!-- User Settings Group -->
Modified: incubator/roller/trunk/web/errorBody.jsp
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/errorBody.jsp?rev=368291&r1=368290&r2=368291&view=diff
==============================================================================
--- incubator/roller/trunk/web/errorBody.jsp (original)
+++ incubator/roller/trunk/web/errorBody.jsp Wed Jan 11 22:38:33 2006
@@ -1,13 +1,19 @@
<%@ include file="/taglibs.jsp" %>
-<% try { %>
+<%
+boolean debug =
org.roller.config.RollerRuntimeConfig.getBooleanProperty("site.debugMode");
+request.setAttribute("debug", new Boolean(debug));
+%>
+<h2 class="error"><fmt:message key="errorPage.title" /></h2>
+
+<c:choose>
+<c:when test="${debug}">
+
<c:set var="status_code"
value="${requestScope['javax.servlet.error.status_code']}" />
<c:set var="message"
value="${requestScope['javax.servlet.error.message']}" />
<c:set var="type" value="${requestScope['javax.servlet.error.type']}" />
<c:set var="exception"
value="${requestScope['javax.servlet.error.exception']}" />
-
-<h2 class="error"><fmt:message key="errorPage.title" /></h2>
<table width="80%" border="1px" style="border-collapse: collapse;">
<tr>
@@ -50,10 +56,13 @@
<br />
<br />
-<% } catch (Throwable t) { t.printStackTrace(); } %>
-
+</c:when>
+<c:otherwise>
+ <p><fmt:message key="errorPage.message" /></p>
+</c:otherwise>
+</c:choose>
