continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From car...@apache.org
Subject svn commit: r431223 - in /maven/continuum/trunk/continuum-webapp/src/main: resources/localization/Continuum.properties resources/xwork.xml webapp/error.jsp
Date Sun, 13 Aug 2006 20:10:52 GMT
Author: carlos
Date: Sun Aug 13 13:10:52 2006
New Revision: 431223

URL: http://svn.apache.org/viewvc?rev=431223&view=rev
Log:
[CONTINUUM-778] Show internal error page on unhandled exceptions.
Submitted By: Nap Ramirez

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/trunk/continuum-webapp/src/main/webapp/error.jsp

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?rev=431223&r1=431222&r2=431223&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Sun Aug 13 13:10:52 2006
@@ -43,8 +43,9 @@
 # Page: error
 # ----------------------------------------------------------------------
 error.page.title = Error Page
-error.section.title = An Error Has Occurred!
+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.
 
 # ----------------------------------------------------------------------
 # Page: About

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=431223&r1=431222&r2=431223&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Sun Aug 13 13:10:52
2006
@@ -5,8 +5,9 @@
   <package name="default" extends="webwork-default">
 
     <interceptors>
+      <interceptor name="exception-logging" class="org.codehaus.plexus.xwork.interceptor.ExceptionLoggingInterceptor"/>
       <interceptor-stack name="defaultContinuumStack">
-        <interceptor-ref name="exception"/>
+        <interceptor-ref name="exception-logging"/>
         <interceptor-ref name="prepare"/>
         <interceptor-ref name="servlet-config"/>
         <interceptor-ref name="chain"/>
@@ -24,13 +25,13 @@
     <default-interceptor-ref name="defaultContinuumStack"/>
 
     <global-results>
-      <result name="continuumException">error.jsp</result>
+      <result name="internalError" type="redirect">/error.jsp</result>
       <result name="continuumInitialization" type="redirect">/configuration!input.action</result>
     </global-results>
 
     <global-exception-mappings>
-      <exception-mapping exception="org.apache.maven.continuum.ContinuumException" result="continuumException"/>
       <exception-mapping exception="org.apache.maven.continuum.initialization.ContinuumInitializationException"
result="continuumInitialization"/>
+      <exception-mapping exception="java.lang.Exception" result="internalError"/>
     </global-exception-mappings>
 
     <action name="checkConfiguration" class="checkConfiguration">

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/error.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/error.jsp?rev=431223&r1=431222&r2=431223&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/error.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/error.jsp Sun Aug 13 13:10:52 2006
@@ -8,10 +8,7 @@
       <div id="axial" class="h3">
         <h3><ww:text name="error.section.title"/></h3>
         <p>
-          <ww:text name="error.exception.message"/>
-          <p>
-           ${exception.message}
-          </p>
+          <ww:text name="error.message"/>
         </p>
       </div>
     </body>



Mime
View raw message