Index: lams_admin/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_admin/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_admin/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,19 +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()%> @@ -52,19 +56,23 @@ <% } +} %> - + Index: lams_central/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_central/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_central/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -2,6 +2,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" %> + @@ -14,7 +16,8 @@ <%-- 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()%> @@ -53,18 +56,21 @@ <% } +} %> Index: lams_central/web/errorpages/error.jsp =================================================================== diff -u -r922d964930c59e4d55f2b5dde8df784b30384f6f -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_central/web/errorpages/error.jsp (.../error.jsp) (revision 922d964930c59e4d55f2b5dde8df784b30384f6f) +++ lams_central/web/errorpages/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -19,6 +19,7 @@ function closeWin() { window.close(); } + function showHide() { if (Element.visible("messageDetail")) { $("showButt").innerHTML = ""; @@ -28,6 +29,7 @@ Element.show("messageDetail"); } } + Index: lams_common/src/java/org/lamsfoundation/lams/web/util/CustomStrutsExceptionHandler.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_common/src/java/org/lamsfoundation/lams/web/util/CustomStrutsExceptionHandler.java (.../CustomStrutsExceptionHandler.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/web/util/CustomStrutsExceptionHandler.java (.../CustomStrutsExceptionHandler.java) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -35,6 +35,8 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ExceptionHandler; import org.apache.struts.config.ExceptionConfig; +import org.lamsfoundation.lams.util.Configuration; +import org.lamsfoundation.lams.util.ConfigurationKeys; /** * @author Jacky @@ -73,16 +75,19 @@ // Construct the forward object forward = new ActionForward(path); - String errorMessage = ex.getMessage() == null ? UNKNOWN_EXCEPTION : ex.getMessage(); - request.setAttribute("errorMessage", errorMessage); - request.setAttribute("errorName", ex.getClass().getName()); ByteArrayOutputStream bos = new ByteArrayOutputStream(); PrintStream os = new PrintStream(bos); ex.printStackTrace(os); String errorStack = new String(bos.toByteArray()); - request.setAttribute("errorStack", errorStack); logger.fatal(errorStack); - + + if ( Configuration.getAsBoolean(ConfigurationKeys.ERROR_STACK_TRACE) ) { + String errorMessage = ex.getMessage() == null ? UNKNOWN_EXCEPTION : ex.getMessage(); + request.setAttribute("errorMessage", errorMessage); + request.setAttribute("errorName", ex.getClass().getName()); + request.setAttribute("errorStack", errorStack); + } + // process the exception as normal return forward; } Index: lams_gradebook/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_gradebook/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_gradebook/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,19 +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()%> @@ -52,18 +56,21 @@ <% } +} %> - + Index: lams_learning/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_learning/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_learning/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()%> @@ -49,20 +56,23 @@ <% } +} %> - + - + Index: lams_monitoring/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_monitoring/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_monitoring/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()%> @@ -49,20 +56,23 @@ <% } +} %> - + - + Index: lams_tool_assessment/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_assessment/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_assessment/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()%> @@ -49,20 +56,23 @@ <% } +} %> - + - + Index: lams_tool_bbb/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_bbb/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_bbb/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,38 +1,23 @@ -<%-- -Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) -License Information: http://lamsfoundation.org/licensing/lams/2.0/ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - http://www.gnu.org/licenses/gpl.txt ---%> - - - <%@ 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()%> @@ -71,18 +56,21 @@ <% } +} %> - + Index: lams_tool_chat/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_chat/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_chat/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,17 +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()%> @@ -50,18 +56,21 @@ <% } +} %> - + Index: lams_tool_daco/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_daco/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_daco/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,17 +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()%> @@ -50,20 +56,23 @@ <% } +} %> - + - + Index: lams_tool_doku/web/error.jsp =================================================================== diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_doku/web/error.jsp (.../error.jsp) (revision b15a3b889da23ac048a689fc2d661df42571b229) +++ lams_tool_doku/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,17 +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()%> @@ -50,20 +56,23 @@ <% } +} %> - + - + Index: lams_tool_forum/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_forum/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_forum/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,18 +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()%> @@ -51,18 +56,21 @@ <% } +} %> - + Index: lams_tool_gmap/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_gmap/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_gmap/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,39 +1,23 @@ -<%-- -Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) -License Information: http://lamsfoundation.org/licensing/lams/2.0/ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - http://www.gnu.org/licenses/gpl.txt ---%> - - - - <%@ 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()%> @@ -72,18 +56,21 @@ <% } +} %> - + Index: lams_tool_images/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_images/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_images/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,17 +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()%> @@ -50,20 +56,23 @@ <% } +} %> - + - + Index: lams_tool_imscc/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_imscc/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_imscc/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,17 +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()%> @@ -50,20 +56,23 @@ <% } +} %> - + - + Index: lams_tool_kaltura/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_kaltura/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_kaltura/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,39 +1,23 @@ -<%-- -Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) -License Information: http://lamsfoundation.org/licensing/lams/2.0/ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - http://www.gnu.org/licenses/gpl.txt ---%> - - - - <%@ 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()%> @@ -72,18 +56,21 @@ <% } +} %> - + Index: lams_tool_lamc/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_lamc/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_lamc/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,38 +1,23 @@ -<%-- -Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) -License Information: http://lamsfoundation.org/licensing/lams/2.0/ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - http://www.gnu.org/licenses/gpl.txt ---%> - - - - - <%@ 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()%> @@ -71,20 +56,23 @@ <% } +} %> - + Index: lams_tool_laqa/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_laqa/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_laqa/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,38 +1,23 @@ -<%-- -Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) -License Information: http://lamsfoundation.org/licensing/lams/2.0/ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - http://www.gnu.org/licenses/gpl.txt ---%> - - - - - <%@ 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()%> @@ -71,20 +56,23 @@ <% } +} %> - + - + Index: lams_tool_larsrc/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_larsrc/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_larsrc/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,17 +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()%> @@ -50,20 +56,23 @@ <% } +} %> - + - + Index: lams_tool_leader/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_leader/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_leader/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,39 +1,23 @@ -<%-- -Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) -License Information: http://lamsfoundation.org/licensing/lams/2.0/ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - http://www.gnu.org/licenses/gpl.txt ---%> - - - - <%@ 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()%> @@ -72,18 +56,21 @@ <% } +} %> - + Index: lams_tool_mindmap/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_mindmap/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_mindmap/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,39 +1,23 @@ -<%-- -Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) -License Information: http://lamsfoundation.org/licensing/lams/2.0/ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - http://www.gnu.org/licenses/gpl.txt ---%> - - - - <%@ 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()%> @@ -72,18 +56,21 @@ <% } +} %> - + 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%> <% - } +} +} %> - + + - - + - + - + Index: lams_tool_notebook/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_notebook/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_notebook/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,39 +1,23 @@ -<%-- -Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) -License Information: http://lamsfoundation.org/licensing/lams/2.0/ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - http://www.gnu.org/licenses/gpl.txt ---%> - - - - <%@ 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()%> @@ -72,18 +56,21 @@ <% } +} %> - + Index: lams_tool_pixlr/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_pixlr/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_pixlr/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,39 +1,23 @@ -<%-- -Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) -License Information: http://lamsfoundation.org/licensing/lams/2.0/ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - http://www.gnu.org/licenses/gpl.txt ---%> - - - - <%@ 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()%> @@ -72,18 +56,21 @@ <% } +} %> - + Index: lams_tool_preview/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_preview/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_preview/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,17 +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()%> @@ -50,20 +56,23 @@ <% } +} %> - + - + Index: lams_tool_sbmt/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_sbmt/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_sbmt/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,17 +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()%> @@ -50,20 +56,23 @@ <% } +} %> - + - + Index: lams_tool_scratchie/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_scratchie/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_scratchie/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,17 +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()%> @@ -50,20 +56,23 @@ <% } +} %> - + - + Index: lams_tool_scribe/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_scribe/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_scribe/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,17 +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()%> @@ -50,20 +56,23 @@ <% } +} %> - + - + Index: lams_tool_spreadsheet/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_spreadsheet/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_spreadsheet/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,17 +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()%> @@ -50,20 +56,23 @@ <% } +} %> - + - + Index: lams_tool_survey/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_survey/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_survey/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,17 +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()%> @@ -50,20 +56,23 @@ <% } +} %> - + - + Index: lams_tool_task/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_task/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_task/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,17 +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()%> @@ -50,20 +56,23 @@ <% } +} %> - + - + Index: lams_tool_vote/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_vote/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_vote/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,38 +1,23 @@ -<%-- -Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) -License Information: http://lamsfoundation.org/licensing/lams/2.0/ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - http://www.gnu.org/licenses/gpl.txt ---%> - - - - - <%@ 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()%> @@ -71,20 +56,23 @@ <% } +} %> - + - + Index: lams_tool_wiki/web/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_tool_wiki/web/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_wiki/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -1,39 +1,23 @@ -<%-- -Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) -License Information: http://lamsfoundation.org/licensing/lams/2.0/ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - http://www.gnu.org/licenses/gpl.txt ---%> - - - - <%@ 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()%> @@ -72,18 +56,21 @@ <% } +} %> - + Index: lams_www/web/error.jsp =================================================================== diff -u -ra86e7d7663a6093c0369048074e955ba9762ba77 -rac9c27fe43c7732c0cb2a48b5470e6b9ac6397af --- lams_www/web/error.jsp (.../error.jsp) (revision a86e7d7663a6093c0369048074e955ba9762ba77) +++ lams_www/web/error.jsp (.../error.jsp) (revision ac9c27fe43c7732c0cb2a48b5470e6b9ac6397af) @@ -2,6 +2,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" %> + @@ -14,7 +16,8 @@ <%-- 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()%> @@ -53,18 +56,21 @@ <% } +} %>