Author: agilliland
Date: Mon Feb 20 12:38:16 2006
New Revision: 379230
URL: http://svn.apache.org/viewcvs?rev=379230&view=rev
Log:
starting to move some jsps into WEB-INF/jsps folder.
- created WEB-INF/jsps folder
- added new 403 and 404 pages
- moved denied and error jsps pages to WEB-INF/jsps
- slight touch ups on error messages
- modified web.xml error-page element to capture all java.lang.Exception
classes rather than just org.roller.RollerExceptions
Added:
incubator/roller/trunk/web/WEB-INF/jsps/
incubator/roller/trunk/web/WEB-INF/jsps/403.jsp
incubator/roller/trunk/web/WEB-INF/jsps/403Body.jsp
incubator/roller/trunk/web/WEB-INF/jsps/404.jsp
incubator/roller/trunk/web/WEB-INF/jsps/404Body.jsp
incubator/roller/trunk/web/WEB-INF/jsps/denied.jsp
- copied unchanged from r379168, incubator/roller/trunk/web/denied.jsp
incubator/roller/trunk/web/WEB-INF/jsps/error.jsp
- copied, changed from r379168, incubator/roller/trunk/web/error.jsp
incubator/roller/trunk/web/WEB-INF/jsps/errorBody.jsp
- copied unchanged from r379168, incubator/roller/trunk/web/errorBody.jsp
Removed:
incubator/roller/trunk/web/denied.jsp
incubator/roller/trunk/web/error.jsp
incubator/roller/trunk/web/errorBody.jsp
Modified:
incubator/roller/trunk/metadata/xdoclet/error-pages.xml
incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/trunk/web/WEB-INF/tiles-defs.xml
Modified: incubator/roller/trunk/metadata/xdoclet/error-pages.xml
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/xdoclet/error-pages.xml?rev=379230&r1=379229&r2=379230&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/error-pages.xml (original)
+++ incubator/roller/trunk/metadata/xdoclet/error-pages.xml Mon Feb 20 12:38:16
2006
@@ -1,17 +1,17 @@
<error-page>
- <exception-type>org.roller.RollerException</exception-type>
- <location>/error.jsp</location>
+ <exception-type>java.lang.Exception</exception-type>
+ <location>/WEB-INF/jsps/error.jsp</location>
</error-page>
<error-page>
<error-code>403</error-code>
- <location>/error.jsp</location>
+ <location>/WEB-INF/jsps/403.jsp</location>
</error-page>
<error-page>
<error-code>404</error-code>
- <location>/error.jsp</location>
+ <location>/WEB-INF/jsps/404.jsp</location>
</error-page>
<error-page>
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=379230&r1=379229&r2=379230&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
(original)
+++ incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
Mon Feb 20 12:38:16 2006
@@ -440,11 +440,11 @@
errorPage.message=Roller has encountered and logged an unexpected exception.
errorPage.reason=Reason
-error.title.403=Access Denied (403)
+error.title.403=Access Denied
error.text.403=You do not have the privilege necessary to access the page you \
requested.
-error.title.404=Sorry! We couldn't find your document (404)
+error.title.404=Sorry! We couldn't find your document
error.text.404=The file that you requested could not be found on this server.
error.permissions.deniedSave=Access Denied (you logged in as a different user?)
Added: incubator/roller/trunk/web/WEB-INF/jsps/403.jsp
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/jsps/403.jsp?rev=379230&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/403.jsp (added)
+++ incubator/roller/trunk/web/WEB-INF/jsps/403.jsp Mon Feb 20 12:38:16 2006
@@ -0,0 +1,11 @@
+<%@ include file="/taglibs.jsp" %>
+<%@ page isErrorPage="true" %>
+<tiles:insert page="/theme/tiles-simplepage.jsp">
+ <tiles:put name="banner" value="/theme/banner.jsp" />
+ <tiles:put name="bannerStatus" value="/theme/bannerStatus.jsp" />
+ <tiles:put name="head" value="/theme/head.jsp" />
+ <tiles:put name="styles" value="/theme/empty.jsp" />
+ <tiles:put name="messages" value="/theme/messages.jsp" />
+ <tiles:put name="content" value="/WEB-INF/jsps/403Body.jsp" />
+ <tiles:put name="footer" value="/theme/footer.jsp" />
+</tiles:insert>
\ No newline at end of file
Added: incubator/roller/trunk/web/WEB-INF/jsps/403Body.jsp
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/jsps/403Body.jsp?rev=379230&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/403Body.jsp (added)
+++ incubator/roller/trunk/web/WEB-INF/jsps/403Body.jsp Mon Feb 20 12:38:16 2006
@@ -0,0 +1,32 @@
+<%@ include file="/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 />
+
+
+
Added: incubator/roller/trunk/web/WEB-INF/jsps/404.jsp
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/jsps/404.jsp?rev=379230&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/404.jsp (added)
+++ incubator/roller/trunk/web/WEB-INF/jsps/404.jsp Mon Feb 20 12:38:16 2006
@@ -0,0 +1,11 @@
+<%@ include file="/taglibs.jsp" %>
+<%@ page isErrorPage="true" %>
+<tiles:insert page="/theme/tiles-simplepage.jsp">
+ <tiles:put name="banner" value="/theme/banner.jsp" />
+ <tiles:put name="bannerStatus" value="/theme/bannerStatus.jsp" />
+ <tiles:put name="head" value="/theme/head.jsp" />
+ <tiles:put name="styles" value="/theme/empty.jsp" />
+ <tiles:put name="messages" value="/theme/messages.jsp" />
+ <tiles:put name="content" value="/WEB-INF/jsps/404Body.jsp" />
+ <tiles:put name="footer" value="/theme/footer.jsp" />
+</tiles:insert>
\ No newline at end of file
Added: incubator/roller/trunk/web/WEB-INF/jsps/404Body.jsp
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/jsps/404Body.jsp?rev=379230&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/404Body.jsp (added)
+++ incubator/roller/trunk/web/WEB-INF/jsps/404Body.jsp Mon Feb 20 12:38:16 2006
@@ -0,0 +1,32 @@
+<%@ include file="/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 />
+
+
+
Copied: incubator/roller/trunk/web/WEB-INF/jsps/error.jsp (from r379168,
incubator/roller/trunk/web/error.jsp)
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/jsps/error.jsp?p2=incubator/roller/trunk/web/WEB-INF/jsps/error.jsp&p1=incubator/roller/trunk/web/error.jsp&r1=379168&r2=379230&rev=379230&view=diff
==============================================================================
--- incubator/roller/trunk/web/error.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/error.jsp Mon Feb 20 12:38:16 2006
@@ -6,6 +6,6 @@
<tiles:put name="head" value="/theme/head.jsp" />
<tiles:put name="styles" value="/theme/empty.jsp" />
<tiles:put name="messages" value="/theme/messages.jsp" />
- <tiles:put name="content" value="/errorBody.jsp" />
+ <tiles:put name="content" value="/WEB-INF/jsps/errorBody.jsp" />
<tiles:put name="footer" value="/theme/footer.jsp" />
</tiles:insert>
Modified: incubator/roller/trunk/web/WEB-INF/tiles-defs.xml
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/tiles-defs.xml?rev=379230&r1=379229&r2=379230&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/tiles-defs.xml (original)
+++ incubator/roller/trunk/web/WEB-INF/tiles-defs.xml Mon Feb 20 12:38:16 2006
@@ -246,16 +246,16 @@
<!-- Misc login and error pages -->
<definition name=".denied" extends=".tiles-simplepage" >
- <put name="content" value="/denied.jsp" />
+ <put name="content" value="/WEB-INF/jsps/denied.jsp" />
</definition>
<definition name=".error" extends=".tiles-simplepage" >
- <put name="content" value="/error.jsp" />
+ <put name="content" value="/WEB-INF/jsps/error.jsp" />
</definition>
<definition name=".error403" extends=".tiles-simplepage" >
- <put name="content" value="/error403.jsp" />
+ <put name="content" value="/WEB-INF/jsps/error403.jsp" />
</definition>
<definition name=".error404" extends=".tiles-simplepage" >
- <put name="content" value="/error404.jsp" />
+ <put name="content" value="/WEB-INF/jsps/error404.jsp" />
</definition>
<definition name=".loginerror" extends=".tiles-simplepage" >
<put name="content" value="/loginerror.jsp" />
