continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r508387 - in /maven/continuum/trunk/continuum-webapp/src/main: resources/localization/Continuum.properties webapp/WEB-INF/jsp/error/httpError.jsp webapp/WEB-INF/web.xml
Date Fri, 16 Feb 2007 13:28:53 GMT
Author: evenisse
Date: Fri Feb 16 05:28:52 2007
New Revision: 508387

URL: http://svn.apache.org/viewvc?view=rev&rev=508387
Log:
[CONTINUUM-1177] Re-add custom error pages.
Submitted by: Teodoro Cue Jr.

Added:
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp
  (with props)
Modified:
    maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?view=diff&rev=508387&r1=508386&r2=508387
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Fri Feb 16 05:28:52 2007
@@ -77,6 +77,15 @@
 error.section.title = An Internal Error Has Occurred!
 error.exception.message = Exception Message:
 error.message = The server was not able of performing the request. Please try again later.
Contact the administrator if this problem persists.
+error.403.title = Error 403
+error.403.section.title = Resource Forbidden
+error.403.message = The URL requested results in a forbidden page.
+error.404.title = Error 404
+error.404.section.title = Resource Not Found
+error.404.message = The URL requested cannot be found.
+error.500.title = Error 500
+error.500.section.title = Internal Error
+error.500.message = The URL requested results in an internal error.
 
 # ----------------------------------------------------------------------
 # Page: About

Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp?view=auto&rev=508387
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp
Fri Feb 16 05:28:52 2007
@@ -0,0 +1,94 @@
+<%--
+  ~ 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.
+  --%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<%@ taglib uri="/webwork" prefix="ww" %>
+
+<ww:i18n name="localization.Continuum">
+<html>
+<head>
+  <title>
+    <c:choose>
+      <c:when test="${param.errorCode == 403 || param.errorCode == 404 || param.errorCode
== 500}">
+        <ww:text name="error.${param.errorCode}.title"/>
+      </c:when>
+      <c:otherwise>
+        <ww:text name="error.page.title"/>
+      </c:otherwise>
+    </c:choose>
+  </title>
+  <link rel="stylesheet" type="text/css" href="<ww:url value="/css/tigris.css"/>"
media="screen"/>
+  <link rel="stylesheet" type="text/css" href="<ww:url value="/css/print.css"/>"
media="print"/>
+  <link rel="stylesheet" type="text/css" href="<ww:url value="/css/extremecomponents.css"/>"
media="screen"/>
+  <link rel="shortcut icon" href="<ww:url value="/favicon.ico"/>" type="image/x-icon"/>
+
+  <script src="<ww:url value="/scripts/tigris.js"/>" type="text/javascript"></script>
+</head>
+
+<body onload="focus()" marginwidth="0" marginheight="0" class="composite">
+<%@ include file="/WEB-INF/jsp/navigations/DefaultTop.jsp" %>
+
+<table id="main" border="0" cellpadding="4" cellspacing="0" width="100%">
+  <tbody>
+    <tr valign="top">
+      <td id="leftcol" width="180">
+        <br/> <br/>
+        <%@ include file="/WEB-INF/jsp/navigations/Menu.jsp" %>
+      </td>
+      <td width="86%">
+        <br/>
+
+        <div id="bodycol">
+          <div class="app">
+            <div id="axial" class="h3">
+              <h3>
+                <c:choose>
+                  <c:when test="${param.errorCode == 403 || param.errorCode == 404 ||
param.errorCode == 500}">
+                    <ww:text name="error.${param.errorCode}.section.title"/>
+                  </c:when>
+                  <c:otherwise>
+                    The URL requested results to an unknown error.
+                  </c:otherwise>
+                </c:choose>
+              </h3>
+
+              <div class="errormessage">
+                <c:choose>
+                  <c:when test="${param.errorCode == 403 || param.errorCode == 404 ||
param.errorCode == 500}">
+                    <ww:text name="error.${param.errorCode}.message"/>
+                  </c:when>
+                  <c:otherwise>
+                    The URL requested results to an unknown error.
+                  </c:otherwise>
+                </c:choose>
+              </div>
+            </div>
+          </div>
+        </div>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<%@ include file="/WEB-INF/jsp/navigations/DefaultBottom.jsp" %>
+</body>
+</html>
+</ww:i18n>
\ No newline at end of file

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml?view=diff&rev=508387&r1=508386&r2=508387
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml Fri Feb 16 05:28:52
2007
@@ -69,6 +69,19 @@
     <listener-class>org.codehaus.plexus.xwork.PlexusLifecycleListener</listener-class>
   </listener>
 
+  <error-page>
+    <error-code>403</error-code>
+    <location>/WEB-INF/jsp/error/httpError.jsp?errorCode=403</location>
+  </error-page>
+  <error-page>
+    <error-code>404</error-code>
+    <location>/WEB-INF/jsp/error/httpError.jsp?errorCode=404</location>
+  </error-page>
+  <error-page>
+    <error-code>500</error-code>
+    <location>/WEB-INF/jsp/error/httpError.jsp?errorCode=500</location>
+  </error-page>
+
   <!-- [jspc-maven-plugin:post-compiled-jsps-as-servlets] -->
 
 </web-app>



Mime
View raw message