--- java/org/apache/catalina/valves/ErrorReportValve.java (revision 1774695)
+++ java/org/apache/catalina/valves/ErrorReportValve.java (working copy)
@@ -28,6 +28,7 @@
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
+import org.apache.catalina.util.TomcatCSS;
import org.apache.coyote.ActionCode;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
@@ -161,50 +162,49 @@
}
}
- // Do nothing if there is no report for the specified status code and
+ // Do nothing if there is no reason phrase for the specified status code and
// no error message provided
- String report = null;
+ String reason = null;
+ String description = null;
StringManager smClient = StringManager.getManager(
Constants.Package, request.getLocales());
response.setLocale(smClient.getLocale());
try {
- report = smClient.getString("http." + statusCode);
+ reason = smClient.getString("http." + statusCode + ".reason");
+ description = smClient.getString("http." + statusCode + ".desc");
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
}
- if (report == null) {
- if (message.length() == 0) {
+ if (reason == null || description == null) {
+ if (message.isEmpty()) {
return;
} else {
- report = smClient.getString("errorReportValve.noDescription");
+ reason = smClient.getString("errorReportValve.unknownReason");
+ description = smClient.getString("errorReportValve.noDescription");
}
}
StringBuilder sb = new StringBuilder();
- sb.append("");
- if(showServerInfo || showReport){
- sb.append("");
- if(showServerInfo) {
- sb.append(ServerInfo.getServerInfo()).append(" - ");
- }
- sb.append(smClient.getString("errorReportValve.errorReport"));
- sb.append("");
- sb.append(" ");
- } else {
- sb.append("");
- sb.append(smClient.getString("errorReportValve.errorReport"));
- sb.append("");
- }
+ sb.append("");
+ sb.append("");
+ sb.append("");
+ sb.append(smClient.getString("errorReportValve.statusHeader",
+ String.valueOf(statusCode), reason));
+ sb.append("");
+ sb.append("");
sb.append("");
sb.append("");
sb.append(smClient.getString("errorReportValve.statusHeader",
- String.valueOf(statusCode), message)).append("
");
- if (showReport) {
- sb.append("");
- sb.append("type ");
+ String.valueOf(statusCode), reason)).append("");
+ if (isShowReport()) {
+ sb.append("
");
+ sb.append("");
+ sb.append(smClient.getString("errorReportValve.type"));
+ sb.append(" ");
if (throwable != null) {
sb.append(smClient.getString("errorReportValve.exceptionReport"));
} else {
@@ -211,17 +211,18 @@
sb.append(smClient.getString("errorReportValve.statusReport"));
}
sb.append("
");
+ if (!message.isEmpty()) {
+ sb.append("");
+ sb.append(smClient.getString("errorReportValve.message"));
+ sb.append(" ");
+ sb.append(message).append("
");
+ }
sb.append("");
- sb.append(smClient.getString("errorReportValve.message"));
- sb.append(" ");
- sb.append(message).append("
");
- sb.append("");
sb.append(smClient.getString("errorReportValve.description"));
- sb.append(" ");
- sb.append(report);
- sb.append("
");
+ sb.append(" ");
+ sb.append(description);
+ sb.append("");
if (throwable != null) {
-
String stackTrace = getPartialServletStackTrace(throwable);
sb.append("");
sb.append(smClient.getString("errorReportValve.exception"));
@@ -245,15 +246,14 @@
sb.append("
");
sb.append(smClient.getString("errorReportValve.note"));
- sb.append(" ");
- sb.append(smClient.getString("errorReportValve.rootCauseInLogs",
- showServerInfo?ServerInfo.getServerInfo():""));
- sb.append("
");
+ sb.append(" ");
+ sb.append(smClient.getString("errorReportValve.rootCauseInLogs"));
+ sb.append("");
}
- sb.append("
");
+ sb.append("
");
}
- if (showServerInfo) {
+ if (isShowServerInfo()) {
sb.append("").append(ServerInfo.getServerInfo()).append("
");
}
sb.append("");
@@ -292,7 +292,7 @@
*/
protected String getPartialServletStackTrace(Throwable t) {
StringBuilder trace = new StringBuilder();
- trace.append(t.toString()).append('\n');
+ trace.append(t.toString()).append(System.lineSeparator());
StackTraceElement[] elements = t.getStackTrace();
int pos = elements.length;
for (int i = elements.length - 1; i >= 0; i--) {
@@ -306,7 +306,7 @@
for (int i = 0; i < pos; i++) {
if (!(elements[i].getClassName().startsWith
("org.apache.catalina.core."))) {
- trace.append('\t').append(elements[i].toString()).append('\n');
+ trace.append('\t').append(elements[i].toString()).append(System.lineSeparator());
}
}
return trace.toString();
--- java/org/apache/catalina/valves/LocalStrings.properties (revision 1774695)
+++ java/org/apache/catalina/valves/LocalStrings.properties (working copy)
@@ -29,16 +29,17 @@
accessLogValve.writeFail=Failed to write log message [{0}]
# 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
-errorReportValve.note=note
-errorReportValve.rootCauseInLogs=The full stack trace of the root cause is available in the {0} logs.
+errorReportValve.statusHeader=HTTP Status {0} \u2013 {1}
+errorReportValve.type=Type
+errorReportValve.exceptionReport=Exception Report
+errorReportValve.statusReport=Status Report
+errorReportValve.message=Message
+errorReportValve.description=Description
+errorReportValve.exception=Exception
+errorReportValve.rootCause=Root Cause
+errorReportValve.note=Note
+errorReportValve.rootCauseInLogs=The full stack trace of the root cause is available in the server logs.
+errorReportValve.unknownReason=Unknown Reason
errorReportValve.noDescription=No description available
# Remote IP valve
@@ -59,61 +60,77 @@
# HTTP status reports
# All status codes registered with IANA can be found at
# http://www.iana.org/assignments/http-status-codes/http-status-codes.xml
-# The list might be kept in sync with the one in
-# org/apache/tomcat/util/http/res/LocalStrings.properties.
-http.100=The client may continue.
-http.101=The server is switching protocols according to the "Upgrade" header.
-http.102=The server has accepted the complete request, but has not yet completed it.
-http.201=The request succeeded and a new resource has been created on the server.
-http.202=This request was accepted for processing, but has not been completed.
-http.203=The meta information presented by the client did not originate from the server.
-http.204=The request succeeded but there is no information to return.
-http.205=The client should reset the document view which caused this request to be sent.
-http.206=The server has fulfilled a partial GET request for this resource.
-http.207=Multiple status values have been returned.
-http.208=This collection binding was already reported.
-http.226=The response is a representation of the result of one or more instance-manipulations applied to the current instance.
-http.300=The requested resource corresponds to any one of a set of representations, each with its own specific location.
-http.301=The requested resource has moved permanently to a new location.
-http.302=The requested resource has moved temporarily to a new location.
-http.303=The response to this request can be found under a different URI.
-http.304=The requested resource is available and has not been modified.
-http.305=The requested resource must be accessed through the proxy given by the "Location" header.
-http.307=The requested resource resides temporarily under a different URI.
-http.308=The target resource has been assigned a new permanent URI and any future references to this resource SHOULD use one of the returned URIs.
-http.400=The request sent by the client was syntactically incorrect.
-http.401=This request requires HTTP authentication.
-http.402=Payment is required for access to this resource.
-http.403=Access to the specified resource has been forbidden.
-http.404=The requested resource is not available.
-http.405=The specified HTTP method is not allowed for the requested resource.
-http.406=The resource identified by this request is only capable of generating responses with characteristics not acceptable according to the request "accept" headers.
-http.407=The client must first authenticate itself with the proxy.
-http.408=The client did not produce a request within the time that the server was prepared to wait.
-http.409=The request could not be completed due to a conflict with the current state of the resource.
-http.410=The requested resource is no longer available, and no forwarding address is known.
-http.411=This request cannot be handled without a defined content length.
-http.412=A specified precondition has failed for this request.
-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.
-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.
-http.416=The requested byte range cannot be satisfied.
-http.417=The expectation given in the "Expect" request header 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.
-http.423=The source or destination resource of a method is locked.
-http.424=The method could not be performed on the resource because the requested action depended on another action and that action failed.
-http.426=The request can only be completed after a protocol upgrade.
-http.428=The request is required to be conditional.
-http.429=The user has sent too many requests in a given amount of time.
-http.431=The server refused this request because the request header fields are too large.
-http.500=The server encountered an internal error that prevented it from fulfilling this request.
-http.501=The server does not support the functionality needed to fulfill this request.
-http.502=This server received an invalid response from a server it consulted when acting as a proxy or gateway.
-http.503=The requested service is not currently available.
-http.504=The server received a timeout from an upstream server while acting as a gateway or proxy.
-http.505=The server does not support the requested HTTP protocol version.
-http.506=The chosen variant resource is configured to engage in transparent content negotiation itself, and is therefore not a proper end point in the negotiation process.
-http.507=The resource does not have sufficient space to record the state of the resource after execution of this method.
-http.508=The server terminated an operation because it encountered an infinite loop.
-http.510=The policy for accessing the resource has not been met in the request.
-http.511=The client needs to authenticate to gain network access.
+http.400.reason=Bad Request
+http.400.desc=The server cannot or will not process the request due to something that is perceived to be a client error (e.g., malformed request syntax, invalid request message framing, or deceptive request routing).
+http.401.reason=Unauthorized
+http.401.desc=The request has not been applied because it lacks valid authentication credentials for the target resource.
+http.402.reason=Payment Required
+http.402.desc=This status code is reserved for future use.
+http.403.reason=Forbidden
+http.403.desc=The server understood the request but refuses to authorize it.
+http.404.reason=Not Found
+http.404.desc=The origin server did not find a current representation for the target resource or is not willing to disclose that one exists.
+http.405.reason=Method Not Allowed
+http.405.desc=The method received in the request-line is known by the origin server but not supported by the target resource.
+http.406.reason=Not Acceptable
+http.406.desc= The target resource does not have a current representation that would be acceptable to the user agent, according to the proactive negotiation header fields received in the request, and the server is unwilling to supply a default representation.
+http.407.reason=Proxy Authentication Required
+http.407.desc=This status code is similar to 401 (Unauthorized), but it indicates that the client needs to authenticate itself in order to use a proxy.
+http.408.reason=Request Timeout
+http.408.desc= The server did not receive a complete request message within the time that it was prepared to wait.
+http.409.reason=Conflict
+http.409.desc=The request could not be completed due to a conflict with the current state of the target resource.
+http.410.reason=Gone
+http.410.desc= Access to the target resource is no longer available at the origin server and that this condition is likely to be permanent.
+http.411.reason=Length Required
+http.411.desc=The server refuses to accept the request without a defined Content-Length.
+http.412.reason=Precondition Failed
+http.412.desc=One or more conditions given in the request header fields evaluated to false when tested on the server.
+http.413.reason=Payload Too Large
+http.413.desc=The server is refusing to process a request because the request payload is larger than the server is willing or able to process.
+http.414.reason=URI Too Long
+http.414.desc=The server is refusing to service the request because the request-target is longer than the server is willing to interpret.
+http.415.reason=Unsupported Media Type
+http.415.desc=The origin server is refusing to service the request because the payload is in a format not supported by this method on the target resource.
+http.416.reason=Range Not Satisfiable
+http.416.desc=None of the ranges in the request's Range header field overlap the current extent of the selected resource or that the set of ranges requested has been rejected due to invalid ranges or an excessive request of small or overlapping ranges.
+http.417.reason=Expectation Failed
+http.417.desc=The expectation given in the request's Expect header field could not be met by at least one of the inbound servers.
+http.421.reason=Misdirected Request
+http.421.desc=The request was directed at a server that is not able to produce a response.
+http.422.reason=Unprocessable Entity
+http.422.desc=The server understands the content type of the request entity, and the syntax of the request entity is correct but was unable to process the contained instructions.
+http.423.reason=Locked
+http.423.desc=The source or destination resource of a method is locked.
+http.424.reason=Failed Dependency
+http.424.desc=The method could not be performed on the resource because the requested action depended on another action and that action failed.
+http.426.reason=Upgrade Required
+http.426.desc=the server refuses to perform the request using the current protocol but might be willing to do so after the client upgrades to a different protocol.
+http.428.reason=Precondition Required
+http.428.desc=The origin server requires the request to be conditional.
+http.429.reason=Too Many Requests
+http.429.desc=The user has sent too many requests in a given amount of time ("rate limiting").
+http.431.reason=Request Header Fields Too Large
+http.431.desc=The server is unwilling to process the request because its header fields are too large.
+http.500.reason=Internal Server Error
+http.500.desc=The server encountered an unexpected condition that prevented it from fulfilling the request.
+http.501.reason=Not Implemented
+http.501.desc=The server does not support the functionality required to fulfill the request.
+http.502.reason=Bad Gateway
+http.502.desc=The server, while acting as a gateway or proxy, received an invalid response from an inbound server it accessed while attempting to fulfill the request.
+http.503.reason=Service Unavailable
+http.503.desc=The server is currently unable to handle the request due to a temporary overload or scheduled maintenance, which will likely be alleviated after some delay.
+http.504.reason=Gateway Timeout
+http.504.desc=The server, while acting as a gateway or proxy, did not receive a timely response from an upstream server it needed to access in order to complete the request.
+http.505.reason=HTTP Version Not Supported
+http.505.desc=The server does not support, or refuses to support, the major version of HTTP that was used in the request message.
+http.506.reason=Variant Also Negotiates
+http.506.desc=The server has an internal configuration error: the chosen variant resource is configured to engage in transparent content negotiation itself, and is thereforenot a proper end point in the negotiation process.
+http.507.reason=Insufficient Storage
+http.507.desc=The method could not be performed on the resource because the server is unable to store the representation needed to successfully complete the request.
+http.508.reason=Loop Detected
+http.508.desc=The server terminated an operation because it encountered an infinite loop while processing a request with "Depth: infinity".
+http.510.reason=Not Extended
+http.510.desc=The policy for accessing the resource has not been met in the request
+http.511.reason=Network Authentication Required
+http.511.desc=The client needs to authenticate to gain network access.
--- java/org/apache/catalina/valves/LocalStrings_es.properties (revision 1774695)
+++ java/org/apache/catalina/valves/LocalStrings_es.properties (working copy)
@@ -17,8 +17,8 @@
accessLogValve.openDirFail = No pude crear directorio [{0}] para historiales de acceso
accessLogValve.rotateFail = No pude rotar historial de acceso
# Error report valve
-errorReportValve.errorReport = Informe de Error
-errorReportValve.statusHeader = Estado HTTP {0} - {1}
+errorReportValve.statusHeader = Estado HTTP {0} \u2013 {1}
+errorReportValve.type=Tipo
errorReportValve.exceptionReport = Informe de Excepci\u00F3n
errorReportValve.statusReport = Informe de estado
errorReportValve.message = mensaje
@@ -26,52 +26,39 @@
errorReportValve.exception = excepci\u00F3n
errorReportValve.rootCause = causa ra\u00EDz
errorReportValve.note = nota
-errorReportValve.rootCauseInLogs = La traza completa de la causa de este error se encuentra en los archivos de diario de {0}.
+errorReportValve.rootCauseInLogs = La traza completa de la causa de este error se encuentra en los archivos de diario del servidor.
+
remoteIpValve.invalidPortHeader = Valor inv\u00E1lido [{0}] hallado para el puerto en cabecera HTTP [{1}]
sslValve.certError = No pude procesar cadena de certificado [{0}] para crear un objeto java.security.cert.X509Certificate
sslValve.invalidProvider = El proveedor de SSL especificado en el conecto asociado con este requerimiento de [{0}] ies inv\u00E1lido. No se pueden procesar los datos del certificado.
stuckThreadDetectionValve.notifyStuckThreadDetected = El hilo "{0}" (id={6}) ha estado activo durante {1} miilisegundos (desde {2}) para servir el mismo requerimiento para {4} y puede estar atascado (el umbral configurado para este StuckThreadDetectionValve es de {5} segundos). Hay {3} hilo(s) en total que son monitorizados por esta V\u00E1lvula y pueden estar atascados.
stuckThreadDetectionValve.notifyStuckThreadCompleted = El hilo "{0}" (id={3}), que previamente se report\u00F3 como atascado, se ha completado. Estuvo activo por aproximadamente {1} milisegundos. {2, choice,0\#|0< Hay a\u00FAn {2} hilo(s) que son monitorizados por esta V\u00E1lvula y pueden estar atascados.}
+
# HTTP status reports
-http.100 = El cliente puede continuar.
-http.101 = El servidor est\u00E1 conmutando protocolos con arreglo a la cabecera "Upgrade".
-http.201 = El requerimiento tuvo \u00E9xito y un nuevo recurso ha sido creado en el servidor.
-http.202 = Este requerimiento ha sido aceptado para ser procesado, pero no ha sido completado.
-http.203 = La informaci\u00F3n meta presentada por el cliente no se origin\u00F3 desde el servidor.
-http.204 = El requerimiento tuvo \u00E9xito pero no hay informaci\u00F3n que devolver.
-http.205 = El cliente no deber\u00EDa de limpiar la vista del documento que caus\u00F3 que este requerimiento fuera enviado.
-http.206 = El servidor ha rellenado paci\u00E1lmente un requerimiento GET para este recurso.
-http.207 = Se han devuelto valores m\u00FAltiples de estado.
-http.300 = El recurso requerido corresponde a una cualquiera de un conjunto de representaciones, cada una con su propia localizaci\u00F3n espec\u00EDfica.
-http.301 = El recurso requerido ha sido movido perman\u00E9ntemente a una nueva localizaci\u00F3n.
-http.302 = El recurso requerido ha sido movido tempor\u00E1lmente a una nueva localizaci\u00F3n.
-http.303 = La respuesta a este requerimiento se puede hallar bajo una URI diferente.
-http.304 = El recurso requerido est\u00E1 disponible y no ha sido modificado.
-http.305 = El recurso requerido debe de ser accedido a trav\u00E9s del apoderado (proxy) dado mediante la cabecera "Location".
-http.400 = El requerimiento enviado por el cliente era sint\u00E1cticamente incorrecto.
-http.401 = Este requerimiento requiere autenticaci\u00F3n HTTP.
-http.402 = Se requiere pago para acceder a este recurso.
-http.403 = El acceso al recurso especificado ha sido prohibido.
-http.404 = El recurso requerido no est\u00E1 disponible.
-http.405 = El m\u00E9todo HTTP especificado no est\u00E1 permitido para el recurso requerido.
-http.406 = El recurso identificado por este requerimiento s\u00F3lo es capaz de generar respuestas con caracter\u00EDsticas no aceptables con arreglo a las cabeceras "accept" de requerimiento.
-http.407 = El cliente debe de ser primero autenticado en el apoderado.
-http.408 = El cliente no produjo un requerimiento dentro del tiempo en que el servidor estaba preparado esperando.
-http.409 = El requerimiento no pudo ser completado debido a un conflicto con el estado actual del recurso.
-http.410 = El recurso requerido ya no est\u00E1 disponible y no se conoce direcci\u00F3n de reenv\u00EDo.
-http.411 = Este requerimiento no puede ser manejado sin un tama\u00F1o definido de contenido.
-http.412 = Una precondici\u00F3n especificada ha fallado para este requerimiento.
-http.413 = La entidad de requerimiento es mayor de lo que el servidor quiere o puede procesar.
-http.414 = El servidor rechaz\u00F3 este requerimiento porque la URI requerida era demasiado larga.
-http.415 = El servidor rechaz\u00F3 este requerimiento porque la entidad requerida se encuentra en un formato no soportado por el recurso requerido para el m\u00E9todo requerido.
-http.416 = El rango de byte requerido no puede ser satisfecho.
-http.417 = Lo que se espera dado por la cabecera "Expect" de requerimiento no pudo ser completado.
-http.422 = El servidor entendi\u00F3 el tipo de contenido y la sint\u00E1xis del requerimiento pero no pudo procesar las instrucciones contenidas.
-http.423 = La fuente o recurso de destino de un m\u00E9todo est\u00E1 bloqueada.
-http.500 = El servidor encontr\u00F3 un error interno que hizo que no pudiera rellenar este requerimiento.
-http.501 = El servidor no soporta la funcionalidad necesaria para rellenar este requerimiento.
-http.502 = Este servidor recibi\u00F3 una respuesta inv\u00E1lida desde un servidor que consult\u00F3 cuando actuaba como apoderado o pasarela.
-http.503 = El servicio requerido no est\u00E1 disponible en este momento.
-http.504 = El servidor recibi\u00F3 un Tiempo Agotado desde un servidor superior cuando actuaba como pasarela o apoderado.
-http.505 = El servidor no soporta la versi\u00F3n de protocolo HTTP requerida.
-http.507 = El recurso no tiene espacio suficiente para registrar el estado del recurso tras la ejecuci\u00F3n de este m\u00E9todo.
+http.400.desc = El requerimiento enviado por el cliente era sint\u00E1cticamente incorrecto.
+http.401.desc = Este requerimiento requiere autenticaci\u00F3n HTTP.
+http.402.desc = Se requiere pago para acceder a este recurso.
+http.403.desc = El acceso al recurso especificado ha sido prohibido.
+http.404.desc = El recurso requerido no est\u00E1 disponible.
+http.405.desc = El m\u00E9todo HTTP especificado no est\u00E1 permitido para el recurso requerido.
+http.406.desc = El recurso identificado por este requerimiento s\u00F3lo es capaz de generar respuestas con caracter\u00EDsticas no aceptables con arreglo a las cabeceras "accept" de requerimiento.
+http.407.desc = El cliente debe de ser primero autenticado en el apoderado.
+http.408.desc = El cliente no produjo un requerimiento dentro del tiempo en que el servidor estaba preparado esperando.
+http.409.desc = El requerimiento no pudo ser completado debido a un conflicto con el estado actual del recurso.
+http.410.desc = El recurso requerido ya no est\u00E1 disponible y no se conoce direcci\u00F3n de reenv\u00EDo.
+http.411.desc = Este requerimiento no puede ser manejado sin un tama\u00F1o definido de contenido.
+http.412.desc = Una precondici\u00F3n especificada ha fallado para este requerimiento.
+http.413.desc = La entidad de requerimiento es mayor de lo que el servidor quiere o puede procesar.
+http.414.desc = El servidor rechaz\u00F3 este requerimiento porque la URI requerida era demasiado larga.
+http.415.desc = El servidor rechaz\u00F3 este requerimiento porque la entidad requerida se encuentra en un formato no soportado por el recurso requerido para el m\u00E9todo requerido.
+http.416.desc = El rango de byte requerido no puede ser satisfecho.
+http.417.desc = Lo que se espera dado por la cabecera "Expect" de requerimiento no pudo ser completado.
+http.422.desc = El servidor entendi\u00F3 el tipo de contenido y la sint\u00E1xis del requerimiento pero no pudo procesar las instrucciones contenidas.
+http.423.desc = La fuente o recurso de destino de un m\u00E9todo est\u00E1 bloqueada.
+http.500.desc = El servidor encontr\u00F3 un error interno que hizo que no pudiera rellenar este requerimiento.
+http.501.desc = El servidor no soporta la funcionalidad necesaria para rellenar este requerimiento.
+http.502.desc = Este servidor recibi\u00F3 una respuesta inv\u00E1lida desde un servidor que consult\u00F3 cuando actuaba como apoderado o pasarela.
+http.503.desc = El servicio requerido no est\u00E1 disponible en este momento.
+http.504.desc = El servidor recibi\u00F3 un Tiempo Agotado desde un servidor superior cuando actuaba como pasarela o apoderado.
+http.505.desc = El servidor no soporta la versi\u00F3n de protocolo HTTP requerida.
+http.507.desc = El recurso no tiene espacio suficiente para registrar el estado del recurso tras la ejecuci\u00F3n de este m\u00E9todo.
--- java/org/apache/catalina/valves/LocalStrings_fr.properties (revision 1774695)
+++ java/org/apache/catalina/valves/LocalStrings_fr.properties (working copy)
@@ -14,8 +14,8 @@
# limitations under the License.
# Error report valve
-errorReportValve.errorReport=Rapport d''erreur
-errorReportValve.statusHeader=Etat HTTP {0} - {1}
+errorReportValve.statusHeader=\u00c9tat HTTP {0} \u2013 {1}
+errorReportValve.type=Type
errorReportValve.exceptionReport=Rapport d''exception
errorReportValve.statusReport=Rapport d''\u00e9tat
errorReportValve.message=message
@@ -23,48 +23,33 @@
errorReportValve.exception=exception
errorReportValve.rootCause=cause m\u00e8re
errorReportValve.note=note
-errorReportValve.rootCauseInLogs=La trace compl\u00e8te de la cause m\u00e8re de cette erreur est disponible dans les fichiers journaux de {0}.
+errorReportValve.rootCauseInLogs=La trace compl\u00e8te de la cause m\u00e8re de cette erreur est disponible dans les fichiers journaux de ce serveur.
# HTTP status reports
-http.100=Le client peut continuer.
-http.101=Le serveur change de protocoles suivant la directive "Upgrade" de l''ent\u00eate.
-http.201=La requ\u00eate a r\u00e9ussi et une nouvelle ressource a \u00e9t\u00e9 cr\u00e9\u00e9e sur le serveur.
-http.202=La requ\u00eate a \u00e9t\u00e9 accept\u00e9e pour traitement, mais n''a pas \u00e9t\u00e9 termin\u00e9e.
-http.203=L''information meta pr\u00e9sent\u00e9e par le client n''a pas pour origine ce serveur.
-http.204=La requ\u00eate a r\u00e9ussi mais il n''y a aucune information \u00e0 retourner.
-http.205=Le client doit remettre \u00e0 z\u00e9ro la vue de document qui a caus\u00e9 l''envoi de cette requ\u00eate.
-http.206=Le serveur a satisfait une requ\u00eate GET partielle pour cette ressource.
-http.207=Plusieurs valeurs d''\u00e9tats ont \u00e9t\u00e9 retourn\u00e9es.
-http.300=La ressource demand\u00e9e correspond \u00e0 plusieurs repr\u00e9sentations, chacune avec sa propre localisation.
-http.301=La ressource demand\u00e9e a \u00e9t\u00e9 d\u00e9plac\u00e9e de fa\u00e7on permanente vers une nouvelle localisation.
-http.302=La ressource demand\u00e9e a \u00e9t\u00e9 d\u00e9plac\u00e9e de fa\u00e7on temporaire vers une nouvelle localisation.
-http.303=La r\u00e9ponse \u00e0 cette requ\u00eate peut \u00eatre trouv\u00e9e \u00e0 une URI diff\u00e9rente.
-http.304=La ressource demand\u00e9e est disponible et n''a pas \u00e9t\u00e9 modifi\u00e9e.
-http.305=La ressource demand\u00e9e doit \u00eatre acc\u00e9d\u00e9e au travers du relais indiqu\u00e9 par la directive "Location" de l''ent\u00eate.
-http.400=La requ\u00eate envoy\u00e9e par le client \u00e9tait syntaxiquement incorrecte.
-http.401=La requ\u00eate n\u00e9cessite une authentification HTTP.
-http.402=Un paiement est demand\u00e9 pour acc\u00e9der \u00e0 cette ressource.
-http.403=L''acc\u00e8s \u00e0 la ressource demand\u00e9e a \u00e9t\u00e9 interdit.
-http.404=La ressource demand\u00e9e n''est pas disponible.
-http.405=La m\u00e9thode HTTP sp\u00e9cifi\u00e9e n''est pas autoris\u00e9e pour la ressource demand\u00e9e.
-http.406=La ressource identifi\u00e9e par cette requ\u00eate n''est capable de g\u00e9n\u00e9rer des r\u00e9ponses qu''avec des caract\u00e9ristiques incompatible avec la directive "accept" pr\u00e9sente dans l''ent\u00eate de requ\u00eate.
-http.407=Le client doit d''abord s''authentifier aupr\u00e8s du relais.
-http.408=Le client n''a pas produit de requ\u00eate pendant le temps d''attente du serveur.
-http.409=La requ\u00eate ne peut \u00eatre finalis\u00e9e suite \u00e0 un conflit li\u00e9 \u00e0 l''\u00e9tat de la ressource.
-http.410=La ressource demand\u00e9e n''est pas disponible, et aucune addresse de rebond (forwarding) n''est connue.
-http.411=La requ\u00eate ne peut \u00eatre trait\u00e9e sans d\u00e9finition d''une taille de contenu (content length).
-http.412=Une condition pr\u00e9alable demand\u00e9e n''est pas satisfaite pour cette requ\u00eate.
-http.413=L''entit\u00e9 de requ\u00eate est plus importante que ce que le serveur veut ou peut traiter.
-http.414=Le serveur a refus\u00e9 cette requ\u00eate car l''URI de requ\u00eate est trop longue.
-http.415=Le serveur a refus\u00e9 cette requ\u00eate car l''entit\u00e9 de requ\u00eate est dans un format non support\u00e9 par la ressource demand\u00e9e avec la m\u00e9thode sp\u00e9cifi\u00e9e.
-http.416=La plage d''octets demand\u00e9e (byte range) ne peut \u00eatre satisfaite.
-http.417=L''attente indiqu\u00e9e dans la directive "Expect" de l''ent\u00eate de requ\u00eate ne peut \u00eatre satisfaite.
-http.422=Le serveur a compris le type de contenu (content type) ainsi que la syntaxe de la requ\u00eate mais a \u00e9t\u00e9 incapable de traiter les instructions contenues.
-http.423=La ressource source ou destination de la m\u00e9thode est verrouill\u00e9e.
-http.500=Le serveur a rencontr\u00e9 une erreur interne qui l''a emp\u00each\u00e9 de satisfaire la requ\u00eate.
-http.501=Le serveur ne supporte pas la fonctionnalit\u00e9 demand\u00e9e pour satisfaire cette requ\u00eate.
-http.502=Le serveur a re\u00e7u une r\u00e9ponse invalide d''un serveur qu''il consultait en tant que relais ou passerelle.
-http.503=Le service demand\u00e9 n''est pas disponible actuellement.
-http.504=Le serveur a re\u00e7u un d\u00e9passement de delai (timeout) d''un serveur amont qu''il consultait en tant que relais ou passerelle.
-http.505=Le serveur ne supporte pas la version demand\u00e9e du protocole HTTP.
-http.507=L''espace disponible est insuffisant pour enregistrer l''\u00e9tat de la ressource apr\u00e8s ex\u00e9cution de cette m\u00e9thode.
+http.400.desc=La requ\u00eate envoy\u00e9e par le client \u00e9tait syntaxiquement incorrecte.
+http.401.desc=La requ\u00eate n\u00e9cessite une authentification HTTP.
+http.402.desc=Un paiement est demand\u00e9 pour acc\u00e9der \u00e0 cette ressource.
+http.403.desc=L''acc\u00e8s \u00e0 la ressource demand\u00e9e a \u00e9t\u00e9 interdit.
+http.404.desc=La ressource demand\u00e9e n''est pas disponible.
+http.405.desc=La m\u00e9thode HTTP sp\u00e9cifi\u00e9e n''est pas autoris\u00e9e pour la ressource demand\u00e9e.
+http.406.desc=La ressource identifi\u00e9e par cette requ\u00eate n''est capable de g\u00e9n\u00e9rer des r\u00e9ponses qu''avec des caract\u00e9ristiques incompatible avec la directive "accept" pr\u00e9sente dans l''ent\u00eate de requ\u00eate.
+http.407.desc=Le client doit d''abord s''authentifier aupr\u00e8s du relais.
+http.408.desc=Le client n''a pas produit de requ\u00eate pendant le temps d''attente du serveur.
+http.409.desc=La requ\u00eate ne peut \u00eatre finalis\u00e9e suite \u00e0 un conflit li\u00e9 \u00e0 l''\u00e9tat de la ressource.
+http.410.desc=La ressource demand\u00e9e n''est pas disponible, et aucune addresse de rebond (forwarding) n''est connue.
+http.411.desc=La requ\u00eate ne peut \u00eatre trait\u00e9e sans d\u00e9finition d''une taille de contenu (content length).
+http.412.desc=Une condition pr\u00e9alable demand\u00e9e n''est pas satisfaite pour cette requ\u00eate.
+http.413.desc=L''entit\u00e9 de requ\u00eate est plus importante que ce que le serveur veut ou peut traiter.
+http.414.desc=Le serveur a refus\u00e9 cette requ\u00eate car l''URI de requ\u00eate est trop longue.
+http.415.desc=Le serveur a refus\u00e9 cette requ\u00eate car l''entit\u00e9 de requ\u00eate est dans un format non support\u00e9 par la ressource demand\u00e9e avec la m\u00e9thode sp\u00e9cifi\u00e9e.
+http.416.desc=La plage d''octets demand\u00e9e (byte range) ne peut \u00eatre satisfaite.
+http.417.desc=L''attente indiqu\u00e9e dans la directive "Expect" de l''ent\u00eate de requ\u00eate ne peut \u00eatre satisfaite.
+http.422.desc=Le serveur a compris le type de contenu (content type) ainsi que la syntaxe de la requ\u00eate mais a \u00e9t\u00e9 incapable de traiter les instructions contenues.
+http.423.desc=La ressource source ou destination de la m\u00e9thode est verrouill\u00e9e.
+http.500.desc=Le serveur a rencontr\u00e9 une erreur interne qui l''a emp\u00each\u00e9 de satisfaire la requ\u00eate.
+http.501.desc=Le serveur ne supporte pas la fonctionnalit\u00e9 demand\u00e9e pour satisfaire cette requ\u00eate.
+http.502.desc=Le serveur a re\u00e7u une r\u00e9ponse invalide d''un serveur qu''il consultait en tant que relais ou passerelle.
+http.503.desc=Le service demand\u00e9 n''est pas disponible actuellement.
+http.504.desc=Le serveur a re\u00e7u un d\u00e9passement de delai (timeout) d''un serveur amont qu''il consultait en tant que relais ou passerelle.
+http.505.desc=Le serveur ne supporte pas la version demand\u00e9e du protocole HTTP.
+http.507.desc=L''espace disponible est insuffisant pour enregistrer l''\u00e9tat de la ressource apr\u00e8s ex\u00e9cution de cette m\u00e9thode.
--- java/org/apache/catalina/valves/LocalStrings_ja.properties (revision 1774695)
+++ java/org/apache/catalina/valves/LocalStrings_ja.properties (working copy)
@@ -16,7 +16,6 @@
jdbcAccessLogValve.exception=\u30a2\u30af\u30bb\u30b9\u30a8\u30f3\u30c8\u30ea\u306e\u633f\u5165\u3092\u5b9f\u884c\u4e2d\u306e\u4f8b\u5916\u3067\u3059
# Error report valve
errorReportValve.statusHeader=HTTP\u30b9\u30c6\u30fc\u30bf\u30b9 {0} - {1}
-errorReportValve.exceptionReport=\u4f8b\u5916\u30ec\u30dd\u30fc\u30c8
errorReportValve.statusReport=\u30b9\u30c6\u30fc\u30bf\u30b9\u30ec\u30dd\u30fc\u30c8
errorReportValve.message=\u30e1\u30c3\u30bb\u30fc\u30b8
errorReportValve.description=\u8aac\u660e
@@ -23,4 +22,4 @@
errorReportValve.exception=\u4f8b\u5916
errorReportValve.rootCause=\u539f\u56e0
errorReportValve.note=\u6ce8\u610f
-errorReportValve.rootCauseInLogs=\u539f\u56e0\u306e\u3059\u3079\u3066\u306e\u30b9\u30bf\u30c3\u30af\u30c8\u30ec\u30fc\u30b9\u306f\u3001{0}\u306e\u30ed\u30b0\u306b\u8a18\u9332\u3055\u308c\u3066\u3044\u307e\u3059
+errorReportValve.rootCauseInLogs=\u539f\u56e0\u306e\u3059\u3079\u3066\u306e\u30b9\u30bf\u30c3\u30af\u30c8\u30ec\u30fc\u30b9\u306f\u3001\u306e\u30ed\u30b0\u306b\u8a18\u9332\u3055\u308c\u3066\u3044\u307e\u3059
--- test/org/apache/catalina/valves/TestErrorReportValve.java (revision 1774695)
+++ test/org/apache/catalina/valves/TestErrorReportValve.java (working copy)
@@ -50,8 +50,8 @@
ByteChunk res = getUrl("http://localhost:" + getPort());
- Assert.assertTrue(res.toString().contains("message " +
- ErrorServlet.ERROR_TEXT + "
"));
+ Assert.assertTrue(res.toString().contains("Message " +
+ ErrorServlet.ERROR_TEXT + "
"));
}