Author: ajaquith
Date: Fri Feb 26 05:16:19 2010
New Revision: 916570
URL: http://svn.apache.org/viewvc?rev=916570&view=rev
Log:
Moved top-level Error.jsp into the templates directory.
Added:
incubator/jspwiki/trunk/src/WebContent/templates/default/Error.jsp
Removed:
incubator/jspwiki/trunk/src/WebContent/Error.jsp
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/Search.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Wiki.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Workflow.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Install.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/InstallSuccess.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/AttachmentsTab.jsp
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/Error.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Error.jsp?rev=916570&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Error.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Error.jsp Fri Feb
26 05:16:19 2010
@@ -0,0 +1,65 @@
+<%--
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--%>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s" %>
+<%@ page isErrorPage="true" %>
+<s:useActionBean beanclass="org.apache.wiki.action.MessageActionBean"
event="error" id="error" />
+<s:layout-render name="${templates['layout/StaticLayout.jsp']}">
+
+ <s:layout-component name="headTitle">
+ Error
+ </s:layout-component>
+
+ <s:layout-component name="pageTitle">
+ Error
+ </s:layout-component>
+
+ <s:layout-component name="content">
+ <h3>JSPWiki has detected an error</h3>
+ <dl>
+ <dt><b>Error</b></dt>
+ <dd>${error.message}</dd>
+ <dt><b>Cause</b></dt>
+ <dd>${error.realCause.class.name}</dd>
+ <dt><b>Detailed message</b></dt>
+ <dd>${error.realCause.message}</dd>
+ <dt><b>Place where detected</b></dt>
+ <dd>${error.throwingMethod}</dd>
+ </dl>
+ <p>
+ If you have changed the templates, please do check them. This error
message
+ may show up because of that. If you have not changed them, and you are
+ either installing JSPWiki for the first time or have changed
configuration,
+ then you might want to check your configuration files. If you are
absolutely sure
+ that JSPWiki was running quite okay or you can't figure out what is going
+ on, then by all means, come over to <a
href="http://www.jspwiki.org/";>jspwiki.org</a>
+ and tell us. There is more information in the log file (like the full
stack trace,
+ which you should add to any error report).
+ </p>
+ <p>
+ And don't worry - it's just a computer program. Nothing really
+ serious is probably going on: at worst you can lose a few nights
+ sleep. It's not like it's the end of the world.
+ </p>
+
+ <br clear="all" />
+ </s:layout-component>
+
+</s:layout-render>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Search.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Search.jsp?rev=916570&r1=916569&r2=916570&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Search.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Search.jsp Fri Feb
26 05:16:19 2010
@@ -29,7 +29,7 @@
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.commons.lang.*" %>
-<%@ page errorPage="/Error.jsp" %>
+<%@ page errorPage="${templates['Error.jsp']}" %>
<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<s:layout-component name="content">
<wiki:TabbedSection>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Wiki.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Wiki.jsp?rev=916570&r1=916569&r2=916570&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Wiki.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Wiki.jsp Fri Feb
26 05:16:19 2010
@@ -28,7 +28,7 @@
<%@ page import="org.apache.wiki.api.WikiPage" %>
<%@ page import="org.apache.wiki.attachment.*" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
-<%@ page errorPage="/Error.jsp" %>
+<%@ page errorPage="${templates['Error.jsp']}" %>
<%
WikiContext c = WikiContextFactory.findContext( pageContext );
WikiPage p = c.getPage();
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Workflow.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Workflow.jsp?rev=916570&r1=916569&r2=916570&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Workflow.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Workflow.jsp Fri
Feb 26 05:16:19 2010
@@ -22,7 +22,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld"; prefix="wiki" %>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s" %>
-<%@ page errorPage="/Error.jsp" %>
+<%@ page errorPage="${templates['Error.jsp']}" %>
<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<s:layout-component name="content">
<h3><fmt:message key="workflow.heading" /></h3>
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Install.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Install.jsp?rev=916570&r1=916569&r2=916570&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Install.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Install.jsp
Fri Feb 26 05:16:19 2010
@@ -20,7 +20,7 @@
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt"%>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s"%>
-<%@ page errorPage="/Error.jsp" %>
+<%@ page errorPage="${templates['Error.jsp']}" %>
<s:layout-render name="${templates['layout/StaticLayout.jsp']}">
<s:layout-component name="headTitle">
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/InstallSuccess.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/admin/InstallSuccess.jsp?rev=916570&r1=916569&r2=916570&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/InstallSuccess.jsp
(original)
+++
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/InstallSuccess.jsp
Fri Feb 26 05:16:19 2010
@@ -20,7 +20,7 @@
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt"%>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s"%>
-<%@ page errorPage="/Error.jsp" %>
+<%@ page errorPage="${templates['Error.jsp']}" %>
<s:layout-render name="${templates['layout/StaticLayout.jsp']}">
<s:layout-component name="headTitle">
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/AttachmentsTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/AttachmentsTab.jsp?rev=916570&r1=916569&r2=916570&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/AttachmentsTab.jsp
(original)
+++
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/AttachmentsTab.jsp
Fri Feb 26 05:16:19 2010
@@ -23,7 +23,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions"; prefix="fn" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld"; prefix="wiki" %>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s" %>
-<%@ page errorPage="/Error.jsp" %>
+<%@ page errorPage="${templates['Error.jsp']}" %>
<%-- Show existing attachments --%>
<wiki:HasAttachments>
<h3><fmt:message key="attach.list" /></h3>
