You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/02/13 17:55:05 UTC
svn commit: r507094 - in
/incubator/roller/branches/roller_4.0/web/WEB-INF/jsps: 403.jsp 403Body.jsp
404.jsp 404Body.jsp error.jsp errorBody.jsp taglibs-error.jsp
tiles/tiles-errorpage.jsp
Author: snoopdave
Date: Tue Feb 13 08:55:04 2007
New Revision: 507094
URL: http://svn.apache.org/viewvc?view=rev&rev=507094
Log:
Error page updates from trunk
Added:
incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/taglibs-error.jsp
- copied unchanged from r506460, incubator/roller/trunk/web/WEB-INF/jsps/taglibs-error.jsp
incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/tiles/tiles-errorpage.jsp
- copied unchanged from r506460, incubator/roller/trunk/web/WEB-INF/jsps/tiles/tiles-errorpage.jsp
Modified:
incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/403.jsp
incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/403Body.jsp
incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/404.jsp
incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/404Body.jsp
incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/error.jsp
incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/errorBody.jsp
Modified: incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/403.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/403.jsp?view=diff&rev=507094&r1=507093&r2=507094
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/403.jsp (original)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/403.jsp Tue Feb 13 08:55:04 2007
@@ -14,51 +14,10 @@
limitations under the License. For additional information regarding
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
---%><%@ page language="java" contentType="text/html; charset=UTF-8" %>
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-error.jsp" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
-<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.0.1" prefix="str" %>
-
-<%@ taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %>
-
-<%@ page import="javax.servlet.jsp.jstl.core.Config" %>
-
-<%@ page import="org.apache.roller.business.Roller" %>
-<%@ page import="org.apache.roller.business.RollerFactory" %>
-
-<%@ page import="org.apache.roller.pojos.UserData" %>
-<%@ page import="org.apache.roller.pojos.WebsiteData" %>
-<%@ page import="org.apache.roller.pojos.RollerConfigData" %>
-
-<%@ page import="org.apache.roller.config.RollerConfig" %>
-<%@ page import="org.apache.roller.config.RollerRuntimeConfig" %>
-<%@ page import="org.apache.roller.config.RollerConfig" %>
-
-<%@ page import="org.apache.roller.ui.core.RequestConstants" %>
-<%@ page import="org.apache.roller.ui.core.BasePageModel" %>
-<%@ page import="org.apache.roller.ui.core.RollerContext" %>
-<%@ page import="org.apache.roller.ui.core.RollerSession" %>
-
-<%
- request.setAttribute("mLocale", request.getLocale());
-%>
-<fmt:setLocale value="${mLocale}" />
-<fmt:setBundle basename="ApplicationResources" />
-
-<%-- Set Struts tags to use XHTML --%>
-<html:xhtml />
<%@ page isErrorPage="true" %>
-<tiles:insert page="/WEB-INF/jsps/tiles/tiles-simplepage.jsp">
- <tiles:put name="banner" value="/WEB-INF/jsps/tiles/banner.jsp" />
- <tiles:put name="bannerStatus" value="/WEB-INF/jsps/tiles/empty.jsp" />
- <tiles:put name="head" value="/WEB-INF/jsps/tiles/head.jsp" />
- <tiles:put name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
- <tiles:put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" />
+<tiles:insert page="/WEB-INF/jsps/tiles/tiles-errorpage.jsp">
<tiles:put name="content" value="/WEB-INF/jsps/403Body.jsp" />
- <tiles:put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" />
</tiles:insert>
Modified: incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/403Body.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/403Body.jsp?view=diff&rev=507094&r1=507093&r2=507094
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/403Body.jsp (original)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/403Body.jsp Tue Feb 13 08:55:04 2007
@@ -1,4 +1,4 @@
-<!--
+<%--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. The ASF licenses this file to You
under the Apache License, Version 2.0 (the "License"); you may not
@@ -14,36 +14,36 @@
limitations under the License. For additional information regarding
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
--->
-<%@ include file="/WEB-INF/jsps/taglibs.jsp" %>
-
-<h2 class="error"><fmt:message key="error.title.403" /></h2>
-
-<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']}" />
-
-<table width="80%" border="1px" style="border-collapse: collapse;">
-<tr>
- <td width="20%">Status Code</td>
- <td><c:out value="${status_code}" /></td>
-</tr>
-<tr>
- <td width="20%">Message</td>
- <td><c:out value="${message}" /></td>
-</tr>
-<tr>
- <td width="20%">Type</td>
- <td><c:out value="${type}" /></td>
-</tr>
-<tr>
- <td width="20%">Exception</td>
- <td><fmt:message key="error.text.403" /></td>
-</tr>
-</table>
-
-<br />
-<br />
-
-
-
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-error.jsp" %>
+
+<h2 class="error"><fmt:message key="error.title.403" /></h2>
+
+<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']}" />
+
+<table width="80%" border="1px" style="border-collapse: collapse;">
+<tr>
+ <td width="20%">Status Code</td>
+ <td><c:out value="${status_code}" /></td>
+</tr>
+<tr>
+ <td width="20%">Message</td>
+ <td><c:out value="${message}" /></td>
+</tr>
+<tr>
+ <td width="20%">Type</td>
+ <td><c:out value="${type}" /></td>
+</tr>
+<tr>
+ <td width="20%">Exception</td>
+ <td><fmt:message key="error.text.403" /></td>
+</tr>
+</table>
+
+<br />
+<br />
+
+
+
Modified: incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/404.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/404.jsp?view=diff&rev=507094&r1=507093&r2=507094
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/404.jsp (original)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/404.jsp Tue Feb 13 08:55:04 2007
@@ -14,51 +14,10 @@
limitations under the License. For additional information regarding
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
---%><%@ page language="java" contentType="text/html; charset=UTF-8" %>
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-error.jsp" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
-<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.0.1" prefix="str" %>
-
-<%@ taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %>
-
-<%@ page import="javax.servlet.jsp.jstl.core.Config" %>
-
-<%@ page import="org.apache.roller.business.Roller" %>
-<%@ page import="org.apache.roller.business.RollerFactory" %>
-
-<%@ page import="org.apache.roller.pojos.UserData" %>
-<%@ page import="org.apache.roller.pojos.WebsiteData" %>
-<%@ page import="org.apache.roller.pojos.RollerConfigData" %>
-
-<%@ page import="org.apache.roller.config.RollerConfig" %>
-<%@ page import="org.apache.roller.config.RollerRuntimeConfig" %>
-<%@ page import="org.apache.roller.config.RollerConfig" %>
-
-<%@ page import="org.apache.roller.ui.core.RequestConstants" %>
-<%@ page import="org.apache.roller.ui.core.BasePageModel" %>
-<%@ page import="org.apache.roller.ui.core.RollerContext" %>
-<%@ page import="org.apache.roller.ui.core.RollerSession" %>
-
-<%
- request.setAttribute("mLocale", request.getLocale());
-%>
-<fmt:setLocale value="${mLocale}" />
-<fmt:setBundle basename="ApplicationResources" />
-
-<%-- Set Struts tags to use XHTML --%>
-<html:xhtml />
<%@ page isErrorPage="true" %>
-<tiles:insert page="/WEB-INF/jsps/tiles/tiles-simplepage.jsp">
- <tiles:put name="banner" value="/WEB-INF/jsps/tiles/banner.jsp" />
- <tiles:put name="bannerStatus" value="/WEB-INF/jsps/tiles/empty.jsp" />
- <tiles:put name="head" value="/WEB-INF/jsps/tiles/head.jsp" />
- <tiles:put name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
- <tiles:put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" />
+<tiles:insert page="/WEB-INF/jsps/tiles/tiles-errorpage.jsp">
<tiles:put name="content" value="/WEB-INF/jsps/404Body.jsp" />
- <tiles:put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" />
</tiles:insert>
Modified: incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/404Body.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/404Body.jsp?view=diff&rev=507094&r1=507093&r2=507094
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/404Body.jsp (original)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/404Body.jsp Tue Feb 13 08:55:04 2007
@@ -1,4 +1,4 @@
-<!--
+<%--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. The ASF licenses this file to You
under the Apache License, Version 2.0 (the "License"); you may not
@@ -14,36 +14,36 @@
limitations under the License. For additional information regarding
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
--->
-<%@ include file="/WEB-INF/jsps/taglibs.jsp" %>
-
-<h2 class="error"><fmt:message key="error.title.404" /></h2>
-
-<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']}" />
-
-<table width="80%" border="1px" style="border-collapse: collapse;">
-<tr>
- <td width="20%">Status Code</td>
- <td><c:out value="${status_code}" /></td>
-</tr>
-<tr>
- <td width="20%">Message</td>
- <td><c:out value="${message}" /></td>
-</tr>
-<tr>
- <td width="20%">Type</td>
- <td><c:out value="${type}" /></td>
-</tr>
-<tr>
- <td width="20%">Exception</td>
- <td><fmt:message key="error.text.404" /></td>
-</tr>
-</table>
-
-<br />
-<br />
-
-
-
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-error.jsp" %>
+
+<h2 class="error"><fmt:message key="error.title.404" /></h2>
+
+<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']}" />
+
+<table width="80%" border="1px" style="border-collapse: collapse;">
+<tr>
+ <td width="20%">Status Code</td>
+ <td><c:out value="${status_code}" /></td>
+</tr>
+<tr>
+ <td width="20%">Message</td>
+ <td><c:out value="${message}" /></td>
+</tr>
+<tr>
+ <td width="20%">Type</td>
+ <td><c:out value="${type}" /></td>
+</tr>
+<tr>
+ <td width="20%">Exception</td>
+ <td><fmt:message key="error.text.404" /></td>
+</tr>
+</table>
+
+<br />
+<br />
+
+
+
Modified: incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/error.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/error.jsp?view=diff&rev=507094&r1=507093&r2=507094
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/error.jsp (original)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/error.jsp Tue Feb 13 08:55:04 2007
@@ -14,51 +14,10 @@
limitations under the License. For additional information regarding
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
---%><%@ page language="java" contentType="text/html; charset=UTF-8" %>
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-error.jsp" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
-<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.0.1" prefix="str" %>
-
-<%@ taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %>
-
-<%@ page import="javax.servlet.jsp.jstl.core.Config" %>
-
-<%@ page import="org.apache.roller.business.Roller" %>
-<%@ page import="org.apache.roller.business.RollerFactory" %>
-
-<%@ page import="org.apache.roller.pojos.UserData" %>
-<%@ page import="org.apache.roller.pojos.WebsiteData" %>
-<%@ page import="org.apache.roller.pojos.RollerConfigData" %>
-
-<%@ page import="org.apache.roller.config.RollerConfig" %>
-<%@ page import="org.apache.roller.config.RollerRuntimeConfig" %>
-<%@ page import="org.apache.roller.config.RollerConfig" %>
-
-<%@ page import="org.apache.roller.ui.core.RequestConstants" %>
-<%@ page import="org.apache.roller.ui.core.BasePageModel" %>
-<%@ page import="org.apache.roller.ui.core.RollerContext" %>
-<%@ page import="org.apache.roller.ui.core.RollerSession" %>
-
-<%
- request.setAttribute("mLocale", request.getLocale());
-%>
-<fmt:setLocale value="${mLocale}" />
-<fmt:setBundle basename="ApplicationResources" />
-
-<%-- Set Struts tags to use XHTML --%>
-<html:xhtml />
<%@ page isErrorPage="true" %>
-<tiles:insert page="/WEB-INF/jsps/tiles/tiles-simplepage.jsp">
- <tiles:put name="banner" value="/WEB-INF/jsps/tiles/banner.jsp" />
- <tiles:put name="bannerStatus" value="/WEB-INF/jsps/tiles/empty.jsp" />
- <tiles:put name="head" value="/WEB-INF/jsps/tiles/head.jsp" />
- <tiles:put name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
- <tiles:put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" />
+<tiles:insert page="/WEB-INF/jsps/tiles/tiles-errorpage.jsp">
<tiles:put name="content" value="/WEB-INF/jsps/errorBody.jsp" />
- <tiles:put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" />
</tiles:insert>
Modified: incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/errorBody.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/errorBody.jsp?view=diff&rev=507094&r1=507093&r2=507094
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/errorBody.jsp (original)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/errorBody.jsp Tue Feb 13 08:55:04 2007
@@ -15,10 +15,10 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/WEB-INF/jsps/taglibs.jsp" %>
+<%@ include file="/WEB-INF/jsps/taglibs-error.jsp" %>
<%
-boolean debug = org.apache.roller.config.RollerRuntimeConfig.getBooleanProperty("site.debugMode");
+boolean debug = org.apache.roller.config.RollerConfig.getBooleanProperty("site.debugMode");
request.setAttribute("debug", new Boolean(debug));
%>