tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves ErrorDispatcherValve.java ErrorReportValve.java LocalStrings.properties
Date Thu, 04 Oct 2001 19:28:14 GMT
remm        01/10/04 12:28:14

  Modified:    catalina/src/share/org/apache/catalina/valves Tag:
                        tomcat_40_branch LocalStrings.properties
  Added:       catalina/src/share/org/apache/catalina/valves Tag:
                        tomcat_40_branch ErrorDispatcherValve.java
                        ErrorReportValve.java
  Log:
  - Merge a variety of fixes and small feature additions which have been made
    and debugged in the HEAD branch, including:
    - Removal of Jasper loader (merged with the shared loader).
    - Fixes a lot of spec complaince issue regarding the commit state of the
      response when using forwards, sendError or sendRedirect.
    - Fixes cache consistency issues for static resource serving.
    - Adds content caching for static resources (that's linked to the bugfix
      mentioned just above).
    - Merge enhanced error reporting and error page dispatching (which will be
      able to display error pages for most errors returned from the pipeline -
      like the 401 and 403 returned by the authenticator).
    - Merge the fixes for all the other more recent bugfixes that have been
      fixed in the HEAD branch.
    - Passes all tester and Watchdog tests.
    - Merge a variety of small enhancements to the build scripts which have been
      made in the HEAD branch.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.4.1   +54 -0     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties,v
  retrieving revision 1.2
  retrieving revision 1.2.4.1
  diff -u -r1.2 -r1.2.4.1
  --- LocalStrings.properties	2000/10/31 23:53:29	1.2
  +++ LocalStrings.properties	2001/10/04 19:28:13	1.2.4.1
  @@ -7,3 +7,57 @@
   requestFilterValve.next=No 'next' valve has been configured
   requestFilterValve.syntax=Syntax error in request filter pattern {0}
   valveBase.noNext=Configuration error: No 'next' valve configured
  +
  +# Error report valve
  +errorReportValve.errorReport=Error report
  +errorReportValve.statusHeader=HTTP Status {0} - {1}
  +errorReportValve.exceptionReport=Exception report
  +errorReportValve.statusReport=Status report
  +errorReportValve.message=message
  +errorReportValve.description=description
  +errorReportValve.exception=exception
  +errorReportValve.rootCause=root cause
  +
  +# HTTP status reports
  +http.100=The client may continue ({0}).
  +http.101=The server is switching protocols according to the "Upgrade" header ({0}).
  +http.201=The request succeeded and a new resource ({0}) has been created on the server.
  +http.202=This request was accepted for processing, but has not been completed ({0}).
  +http.203=The meta information presented by the client did not originate from the server
({0}).
  +http.204=The request succeeded but there is no information to return ({0}).
  +http.205=The client should reset the document view which caused this request to be sent
({0}).
  +http.206=The server has fulfilled a partial GET request for this resource ({0}).
  +http.207=Multiple status values have been returned ({0}).
  +http.300=The requested resource ({0}) corresponds to any one of a set of representations,
each with its own specific location.
  +http.301=The requested resource ({0}) has moved permanently to a new location.
  +http.302=The requested resource ({0}) has moved temporarily to a new location.
  +http.303=The response to this request can be found under a different URI ({0}).
  +http.304=The requested resource ({0}) is available and has not been modified.
  +http.305=The requested resource ({0}) must be accessed through the proxy given by the "Location"
header.
  +http.400=The request sent by the client was syntactically incorrect ({0}).
  +http.401=This request requires HTTP authentication ({0}).
  +http.402=Payment is required for access to this resource ({0}).
  +http.403=Access to the specified resource ({0}) has been forbidden.
  +http.404=The requested resource ({0}) is not available.
  +http.405=The specified HTTP method is not allowed for the requested resource ({0}).
  +http.406=The resource identified by this request is only capable of generating responses
with characteristics not acceptable according to the request "accept" headers ({0}).
  +http.407=The client must first authenticate itself with the proxy ({0}).
  +http.408=The client did not produce a request within the time that the server was prepared
to wait ({0}).
  +http.409=The request could not be completed due to a conflict with the current state of
the resource ({0}).
  +http.410=The requested resource ({0}) is no longer available, and no forwarding address
is known.
  +http.411=This request cannot be handled without a defined content length ({0}).
  +http.412=A specified precondition has failed for this request ({0}).
  +http.413=The request entity is larger than the server is willing or able to process.
  +http.414=The server refused this request because the request URI was too long ({0}).
  +http.415=The server refused this request because the request entity is in a format not
supported by the requested resource for the requested method ({0}).
  +http.416=The requested byte range cannot be satisfied ({0}).
  +http.417=The expectation given in the "Expect" request header ({0}) could not be fulfilled.
  +http.422=The server understood the content type and syntax of the request but was unable
to process the contained instructions ({0}).
  +http.423=The source or destination resource of a method is locked ({0}).
  +http.500=The server encountered an internal error ({0}) that prevented it from fulfilling
this request.
  +http.501=The server does not support the functionality needed to fulfill this request ({0}).
  +http.502=This server received an invalid response from a server it consulted when acting
as a proxy or gateway ({0}).
  +http.503=The requested service ({0}) is not currently available.
  +http.504=The server received a timeout from an upstream server while acting as a gateway
or proxy ({0}).
  +http.505=The server does not support the requested HTTP protocol version ({0}).
  +http.507=The resource does not have sufficient space to record the state of the resource
after execution of this method ({0}).
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.1   +4 -4      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java
  
  Index: ErrorDispatcherValve.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- ErrorDispatcherValve.java	2001/09/28 23:33:16	1.5
  +++ ErrorDispatcherValve.java	2001/10/04 19:28:13	1.5.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java,v
1.5 2001/09/28 23:33:16 remm Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/09/28 23:33:16 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java,v
1.5.2.1 2001/10/04 19:28:13 remm Exp $
  + * $Revision: 1.5.2.1 $
  + * $Date: 2001/10/04 19:28:13 $
    *
    * ====================================================================
    *
  @@ -104,7 +104,7 @@
    *
    * @author Remy Maucherat
    * @author Craig R. McClanahan
  - * @version $Revision: 1.5 $ $Date: 2001/09/28 23:33:16 $
  + * @version $Revision: 1.5.2.1 $ $Date: 2001/10/04 19:28:13 $
    */
   
   public class ErrorDispatcherValve
  
  
  
  1.5.2.1   +4 -4      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
  
  Index: ErrorReportValve.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- ErrorReportValve.java	2001/10/03 02:02:05	1.5
  +++ ErrorReportValve.java	2001/10/04 19:28:13	1.5.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
1.5 2001/10/03 02:02:05 remm Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/10/03 02:02:05 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
1.5.2.1 2001/10/04 19:28:13 remm Exp $
  + * $Revision: 1.5.2.1 $
  + * $Date: 2001/10/04 19:28:13 $
    *
    * ====================================================================
    *
  @@ -104,7 +104,7 @@
    * @author Craig R. McClanahan
    * @author <a href="mailto:nicolaken@supereva.it">Nicola Ken Barozzi</a> Aisa
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.5 $ $Date: 2001/10/03 02:02:05 $
  + * @version $Revision: 1.5.2.1 $ $Date: 2001/10/04 19:28:13 $
    */
   
   public class ErrorReportValve
  
  
  

Mime
View raw message