Author: remy.maucherat(a)jboss.com Date: 2012-08-28 06:41:30 -0400 (Tue, 28 Aug 2012) New Revision: 2069 Removed: trunk/src/main/java/org/apache/catalina/valves/LocalStrings.properties trunk/src/main/java/org/apache/catalina/valves/LocalStrings_es.properties trunk/src/main/java/org/apache/catalina/valves/LocalStrings_fr.properties trunk/src/main/java/org/apache/catalina/valves/LocalStrings_ja.properties Modified: trunk/src/main/java/org/apache/catalina/valves/ErrorReportValve.java trunk/src/main/java/org/jboss/web/CatalinaMessages.java Log: Update HTTP messages. Modified: trunk/src/main/java/org/apache/catalina/valves/ErrorReportValve.java =================================================================== --- trunk/src/main/java/org/apache/catalina/valves/ErrorReportValve.java 2012-08-27 15:04:39 UTC (rev 2068) +++ trunk/src/main/java/org/apache/catalina/valves/ErrorReportValve.java 2012-08-28 10:41:30 UTC (rev 2069) @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.Writer; +import java.util.Scanner; import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; @@ -153,39 +154,57 @@ return; String message = RequestUtil.filter(response.getMessage()); - if (message == null) - message = ""; + if (message == null) { + if (throwable != null) { + String exceptionMessage = throwable.getMessage(); + if (exceptionMessage != null && exceptionMessage.length() > 0) { + message = RequestUtil.filter((new Scanner(exceptionMessage)).nextLine()); + } + } + if (message == null) { + message = ""; + } + } // Do nothing if there is no report for the specified status code String report = null; switch (statusCode) { - case 404: report = MESSAGES.http404(message); break; - case 500: report = MESSAGES.http500(message); break; - case 400: report = MESSAGES.http400(message); break; - case 401: report = MESSAGES.http401(message); break; - case 402: report = MESSAGES.http402(message); break; - case 403: report = MESSAGES.http403(message); break; - case 405: report = MESSAGES.http405(message); break; - case 406: report = MESSAGES.http406(message); break; - case 407: report = MESSAGES.http407(message); break; - case 408: report = MESSAGES.http408(message); break; - case 409: report = MESSAGES.http409(message); break; - case 410: report = MESSAGES.http410(message); break; - case 411: report = MESSAGES.http411(message); break; - case 412: report = MESSAGES.http412(message); break; - case 413: report = MESSAGES.http413(message); break; - case 414: report = MESSAGES.http414(message); break; - case 415: report = MESSAGES.http415(message); break; - case 416: report = MESSAGES.http416(message); break; - case 417: report = MESSAGES.http417(message); break; - case 422: report = MESSAGES.http422(message); break; - case 423: report = MESSAGES.http423(message); break; - case 501: report = MESSAGES.http501(message); break; - case 502: report = MESSAGES.http502(message); break; - case 503: report = MESSAGES.http503(message); break; - case 504: report = MESSAGES.http504(message); break; - case 505: report = MESSAGES.http505(message); break; - case 507: report = MESSAGES.http507(message); break; + case 404: report = MESSAGES.http404(); break; + case 500: report = MESSAGES.http500(); break; + case 400: report = MESSAGES.http400(); break; + case 403: report = MESSAGES.http403(); break; + case 401: report = MESSAGES.http401(); break; + case 402: report = MESSAGES.http402(); break; + case 405: report = MESSAGES.http405(); break; + case 406: report = MESSAGES.http406(); break; + case 407: report = MESSAGES.http407(); break; + case 408: report = MESSAGES.http408(); break; + case 409: report = MESSAGES.http409(); break; + case 410: report = MESSAGES.http410(); break; + case 411: report = MESSAGES.http411(); break; + case 412: report = MESSAGES.http412(); break; + case 413: report = MESSAGES.http413(); break; + case 414: report = MESSAGES.http414(); break; + case 415: report = MESSAGES.http415(); break; + case 416: report = MESSAGES.http416(); break; + case 417: report = MESSAGES.http417(); break; + case 422: report = MESSAGES.http422(); break; + case 423: report = MESSAGES.http423(); break; + case 424: report = MESSAGES.http424(); break; + case 426: report = MESSAGES.http426(); break; + case 428: report = MESSAGES.http428(); break; + case 429: report = MESSAGES.http429(); break; + case 431: report = MESSAGES.http431(); break; + case 501: report = MESSAGES.http501(); break; + case 502: report = MESSAGES.http502(); break; + case 503: report = MESSAGES.http503(); break; + case 504: report = MESSAGES.http504(); break; + case 505: report = MESSAGES.http505(); break; + case 506: report = MESSAGES.http506(); break; + case 507: report = MESSAGES.http507(); break; + case 508: report = MESSAGES.http508(); break; + case 510: report = MESSAGES.http510(); break; + case 511: report = MESSAGES.http511(); break; default: return; } Deleted: trunk/src/main/java/org/apache/catalina/valves/LocalStrings.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/valves/LocalStrings.properties 2012-08-27 15:04:39 UTC (rev 2068) +++ trunk/src/main/java/org/apache/catalina/valves/LocalStrings.properties 2012-08-28 10:41:30 UTC (rev 2069) @@ -1,78 +0,0 @@ -accessLogValve.alreadyStarted=Access Logger has already been started -accessLogValve.notStarted=Access Logger has not yet been started -semaphoreValve.alreadyStarted=Semaphore valve has already been started -semaphoreValve.notStarted=Semaphore valve has not yet been started -certificatesValve.alreadyStarted=Certificates Valve has already been started -certificatesValve.notStarted=Certificates Valve has not yet been started -interceptorValve.alreadyStarted=Interceptor Valve has already been started -interceptorValve.notStarted=Interceptor Valve has not yet been started -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 -jdbcAccessLogValve.exception=Exception performing insert access entry -jdbcAccessLogValve.close=Exception closing database connection -cometConnectionManagerValve.event=Exception processing event -cometConnectionManagerValve.listenerEvent=Exception processing session listener event - -# 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. - -# Remote IP valve -remoteIpValve.syntax=Invalid regular expressions [{0}] provided. - -# SSL valve -sslValve.certError=Failed to process certificate string [{0}] to create a java.security.cert.X509Certificate object -sslValve.invalidProvider=The SSL provider specified on the connector associated with this request of [{0}] is invalid. The certificate data could not be processed. - -# 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}). Deleted: trunk/src/main/java/org/apache/catalina/valves/LocalStrings_es.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/valves/LocalStrings_es.properties 2012-08-27 15:04:39 UTC (rev 2068) +++ trunk/src/main/java/org/apache/catalina/valves/LocalStrings_es.properties 2012-08-28 10:41:30 UTC (rev 2069) @@ -1,83 +0,0 @@ -# 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. -accessLogValve.alreadyStarted = El Registrador de accesos ya se hab\u00EDa iniciado -accessLogValve.notStarted = El Registrador de accesos no se ha iniciado -semaphoreValve.alreadyStarted = La v\u00E1lvula del sem\u00E1foro ya ha sido arrancada -semaphoreValve.notStarted = La v\u00E1lvula del sem\u00E1foro a\u00FAn no ha sido arrancada -certificatesValve.alreadyStarted = La v\u00E1lvula de certificados ya se hab\u00EDa iniciado -certificatesValve.notStarted = La v\u00E1lvula de certificados no se ha iniciado -interceptorValve.alreadyStarted = La v\u00E1lvula interceptora ya se hab\u00EDa iniciado -interceptorValve.notStarted = La v\u00E1lvula interceptora no se ha iniciado -requestFilterValve.next = No hay ''siguiente'' v\u00E1lvula configurada -requestFilterValve.syntax = Error de sint\u00E1xis en petici\u00F3n de filtro patr\u00F3n {0} -valveBase.noNext = Error de configuraci\u00F3n\: No hay ''siguiente'' v\u00E1lvula configurada -jdbcAccessLogValve.exception = Excepci\u00F3n realizando entrada de acceso a inserci\u00F3n -jdbcAccessLogValve.close = Excepci\u00F3n cerrando conexi\u00F3n a base de datos -cometConnectionManagerValve.event = Excepci\u00F3n procesando evento -cometConnectionManagerValve.listenerEvent = Excepci\u00F3n procesando evento de oyente de sesi\u00F3n -# Error report valve -errorReportValve.errorReport = Informe de Error -errorReportValve.statusHeader = Estado HTTP {0} - {1} -errorReportValve.exceptionReport = Informe de Excepci\u00F3n -errorReportValve.statusReport = Informe de estado -errorReportValve.message = mensaje -errorReportValve.description = descripci\u00F3n -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}. -# HTTP status reports -http.100 = El cliente puede continuar ({0}). -http.101 = El servidor est\u00E1 conmutando protocolos con arreglo a la cabecera "Upgrade" ({0}). -http.201 = El requerimiento tuvo \u00E9xito y un nuevo recurso ({0}) ha sido creado en el servidor. -http.202 = Este requerimiento ha sido aceptado para ser procesado, pero no ha sido completado ({0}). -http.203 = La informaci\u00F3n meta presentada por el cliente no se origin\u00F3 desde el servidor ({0}). -http.204 = El requerimiento tuvo \u00E9xito pero no hay informaci\u00F3n que devolver ({0}). -http.205 = El cliente no deber\u00EDa de limpiar la vista del documento que caus\u00F3 que este requerimiento fuera enviado ({0}). -http.206 = El servidor ha rellenado paci\u00E1lmente un requerimiento GET para este recurso ({0}). -http.207 = Se han devuelto valores m\u00FAltiples de estado ({0}). -http.300 = El recurso requerido ({0}) corresponde a una cualquiera de un conjunto de representaciones, cada una con su propia localizaci\u00F3n espec\u00EDfica. -http.301 = El recurso requerido ({0}) ha sido movido perman\u00E9ntemente a una nueva localizaci\u00F3n. -http.302 = El recurso requerido ({0}) ha sido movido tempor\u00E1lmente a una nueva localizaci\u00F3n. -http.303 = La respuesta a este requerimiento se puede hallar bajo una URI diferente ({0}). -http.304 = El recurso requerido ({0}) est\u00E1 disponible y no ha sido modificado. -http.305 = El recurso requerido ({0}) 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 ({0}). -http.401 = Este requerimiento requiere autenticaci\u00F3n HTTP ({0}). -http.402 = Se requiere pago para acceder a este recurso ({0}). -http.403 = El acceso al recurso especificado ({0}) ha sido prohibido. -http.404 = El recurso requerido ({0}) no est\u00E1 disponible. -http.405 = El m\u00E9todo HTTP especificado no est\u00E1 permitido para el recurso requerido ({0}). -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 ({0}). -http.407 = El cliente debe de ser primero autenticado en el apoderado ({0}). -http.408 = El cliente no produjo un requerimiento dentro del tiempo en que el servidor estaba preparado esperando ({0}). -http.409 = El requerimiento no pudo ser completado debido a un conflicto con el estado actual del recurso ({0}). -http.410 = El recurso requerido ({0}) 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 ({0}). -http.412 = Una precondici\u00F3n especificada ha fallado para este requerimiento ({0}). -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 ({0}). -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 ({0}). -http.416 = El rango de byte requerido no puede ser satisfecho ({0}). -http.417 = Lo que se espera dado por la cabecera "Expect" de requerimiento ({0}) 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 ({0}). -http.423 = La fuente o recurso de destino de un m\u00E9todo est\u00E1 bloqueada ({0}). -http.500 = El servidor encontr\u00F3 un error interno ({0}) que hizo que no pudiera rellenar este requerimiento. -http.501 = El servidor no soporta la funcionalidad necesaria para rellenar este requerimiento ({0}). -http.502 = Este servidor recibi\u00F3 una respuesta inv\u00E1lida desde un servidor que consult\u00F3 cuando actuaba como apoderado o pasarela ({0}). -http.503 = El servicio requerido ({0}) 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 ({0}). -http.505 = El servidor no soporta la versi\u00F3n de protocolo HTTP requerida ({0}). -http.507 = El recurso no tiene espacio suficiente para registrar el estado del recurso tras la ejecuci\u00F3n de este m\u00E9todo ({0}). Deleted: trunk/src/main/java/org/apache/catalina/valves/LocalStrings_fr.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/valves/LocalStrings_fr.properties 2012-08-27 15:04:39 UTC (rev 2068) +++ trunk/src/main/java/org/apache/catalina/valves/LocalStrings_fr.properties 2012-08-28 10:41:30 UTC (rev 2069) @@ -1,65 +0,0 @@ -accessLogValve.alreadyStarted=Le traceur d''acc�s a d�j� �t� d�marr� -accessLogValve.notStarted=Le traceur d''acc�s n''a pas encore �t� d�marr� -certificatesValve.alreadyStarted=La Valve de Certificats a d�j� �t� d�marr�e -certificatesValve.notStarted=La Valve de Certificats n''a pas encore �t� d�marr�e -interceptorValve.alreadyStarted=La Valve d''Interception a d�j� �t� d�marr� -interceptorValve.notStarted=La Valve d''Interception n''a pas encore �t� d�marr�e -requestFilterValve.next=Aucune Valve ''suivante'' n''a �t� configur�e -requestFilterValve.syntax=Erreur de synthaxe dans le pattern de filtre de requ�te {0} -valveBase.noNext=Erreur de configuration error: Aucune Valve ''suivante'' n''a �t� configur�e - -# Error report valve -errorReportValve.errorReport=Rapport d''erreur -errorReportValve.statusHeader=Etat HTTP {0} - {1} -errorReportValve.exceptionReport=Rapport d''exception -errorReportValve.statusReport=Rapport d''�tat -errorReportValve.message=message -errorReportValve.description=description -errorReportValve.exception=exception -errorReportValve.rootCause=cause m�re -errorReportValve.note=note -errorReportValve.rootCauseInLogs=La trace compl�te de la cause m�re de cette erreur est disponible dans les fichiers journaux de {0}. - -# HTTP status reports -http.100=Le client peut continuer ({0}). -http.101=Le serveur change de protocoles suivant la directive "Upgrade" de l''ent�te ({0}). -http.201=La requ�te a r�ussi et une nouvelle ressource ({0}) a �t� cr�ee sur le serveur. -http.202=La requ�te a �t� accept� pour traitement, mais n''a pas �t� termin�e ({0}). -http.203=L''information meta pr�sent�e par le client n''a pas pour origine ce server ({0}). -http.204=La requ�te a r�ussi mais il n''y a aucune information � retourner ({0}). -http.205=Le client doit remettre � z�ro la vue de document qui a caus�e l''envoi de cette requ�te ({0}). -http.206=Le serveur a satisfait une requ�te GET partielle pour cette ressource ({0}). -http.207=Plusieurs valeurs d''�tats ont �t� retourn�es ({0}). -http.300=La ressource demand�e ({0}) correspond � plusieurs repr�sentations, chacune avec sa propre localisation. -http.301=La ressource demand�e ({0}) a �t� d�plac�e de fa�on permanente vers une nouvelle localisation. -http.302=La ressource demand�e ({0}) a �t� d�plac�e de fa�on temporaire vers une nouvelle localisation. -http.303=La r�ponse � cette requ�te peut �tre trouv�e � une URI diff�rente ({0}). -http.304=La ressource demand�e ({0}) est disponible et n''a pas �t� modifi�e. -http.305=La ressource demand�e ({0}) doit �tre acc�d�e au travers du relais indiqu� par la directive "Location" de l''ent�te. -http.400=La requ�te envoy�e par le client �tait syntaxiquement incorrecte ({0}). -http.401=La requ�te n�cessite une authentification HTTP ({0}). -http.402=Un paiement est demand� pour acc�der � cette ressource ({0}). -http.403=L''acc�s � la ressource demand�e ({0}) a �t� interdit. -http.404=La ressource demand�e ({0}) n''est pas disponible. -http.405=La m�thode HTTP sp�cifi�e n''est pas autoris�e pour la ressource demand�e ({0}). -http.406=La ressource identifi�e par cette requ�te n''est capable de g�n�rer des r�ponses qu''avec des caract�ristiques incompatible avec la directive "accept" pr�sente dans l''ent�te de requ�te ({0}). -http.407=Le client doit d''abord s''authentifier aupr�s du relais ({0}). -http.408=Le client n''a pas produit de requ�te pendant le temps d''attente du serveur ({0}). -http.409=La requ�te ne peut �tre finalis�e suite � un conflit li� � l''�tat de la ressource ({0}). -http.410=La ressource demand�e ({0}) n''est pas disponible, et aucune addresse de rebond (forwarding) n''est connue. -http.411=La requ�te ne peut �tre trait�e sans d�finition d''une taille de contenu (content length) ({0}). -http.412=Une condition pr�alable demand�e a �chou�e pour cette requ�te ({0}). -http.413=L''entit� de requ�te est plus importante que ce que le serveur veut ou peut traiter. -http.414=Le serveur a refus� cette requ�te car URI de requ�te est trop longue ({0}). -http.415=Le serveur a refus� cette requ�te car l''entit� de requ�te est dans un format non support� par la ressource demand�e avec la m�thode sp�cifi�e ({0}). -http.416=La place d''octets (byte range) ne peut �tre satisfaite ({0}). -http.417=L''attente indiqu� dans la directive "Expect" de l''ent�te de requ�te ({0}) ne peut �tre satisfaite. -http.422=Le serveur a compris le type de contenu (content type) ainsi que la synthaxe de la requ�te mais a �t� incapable de traiter les instructions contenues ({0}). -http.423=La ressource source ou destination de la m�thode est v�rrouill�e ({0}). -http.500=Le serveur a rencontr� une erreur interne ({0}) qui l''a emp�ch� de satisfaire la requ�te. -http.501=Le serveur ne supporte pas la fonctionnalit� demand�e pour satisfaire cette requ�te ({0}). -http.502=Le serveur a re�u une r�ponse invalide d''un serveur qu''il consultait en tant que relais ou passerelle ({0}). -http.503=Le service demand� ({0}) n''est pas disponible actuellement. -http.504=Le serveur a re�u un d�passement de delais (timeout) d''un serveur amont qu''il consultait en tant que relais ou passerelle ({0}). -http.505=Le serveur ne supporte pas la version de protocole HTTP demand� ({0}). -http.507=La ressource n''a pas assez d''espace pour enregistrer l''�tat de la ressource apr�s ex�cution de cette m�thode ({0}). Deleted: trunk/src/main/java/org/apache/catalina/valves/LocalStrings_ja.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/valves/LocalStrings_ja.properties 2012-08-27 15:04:39 UTC (rev 2068) +++ trunk/src/main/java/org/apache/catalina/valves/LocalStrings_ja.properties 2012-08-28 10:41:30 UTC (rev 2069) @@ -1,22 +0,0 @@ -accessLogValve.alreadyStarted=\u30a2\u30af\u30bb\u30b9\u30ed\u30ac\u30fc\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 -accessLogValve.notStarted=\u30a2\u30af\u30bb\u30b9\u30ed\u30ac\u30fc\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -certificatesValve.alreadyStarted=\u8a8d\u8a3c\u30d0\u30eb\u30d6\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 -certificatesValve.notStarted=\u8a8d\u8a3c\u30d0\u30eb\u30d6\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -interceptorValve.alreadyStarted=\u30a4\u30f3\u30bf\u30fc\u30bb\u30d7\u30bf\u30d0\u30eb\u30d6\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 -interceptorValve.notStarted=\u30a4\u30f3\u30bf\u30fc\u30bb\u30d7\u30bf\u30d0\u30eb\u30d6\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -requestFilterValve.next=\u6b21\u306e\u30d0\u30eb\u30d6\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -requestFilterValve.syntax=\u30ea\u30af\u30a8\u30b9\u30c8\u30d5\u30a3\u30eb\u30bf\u30d1\u30bf\u30fc\u30f3 {0} \u306b\u69cb\u6587\u30a8\u30e9\u30fc\u304c\u3042\u308a\u307e\u3059 -jdbcAccessLogValve.exception=\u30a2\u30af\u30bb\u30b9\u30a8\u30f3\u30c8\u30ea\u306e\u633f\u5165\u3092\u5b9f\u884c\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -jdbcAccessLogValve.close=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u3092\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u4f8b\u5916\u3067\u3059 - -# Error report valve -valveBase.noNext=\u8a2d\u5b9a\u30a8\u30e9\u30fc: \u6b21\u306e\u30d0\u30eb\u30d6\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -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 -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 Modified: trunk/src/main/java/org/jboss/web/CatalinaMessages.java =================================================================== --- trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-08-27 15:04:39 UTC (rev 2068) +++ trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-08-28 10:41:30 UTC (rev 2069) @@ -108,175 +108,217 @@ @Message(id = 21, value = "Missing MD5 digest") IllegalArgumentException noMD5Digest(@Cause NoSuchAlgorithmException e); - @Message(id = 22, value = "The client may continue (%s).") - String http100(String resource); + @Message(id = 64, value = "Error report") + String errorReport(); - @Message(id = 23, value = "The server is switching protocols according to the 'Upgrade' header (%s).") - String http101(String resource); + @Message(id = 65, value = "HTTP Status %s - %s") + String statusHeader(int statusCode, String message); - @Message(id = 24, value = "The request succeeded and a new resource (%s) has been created on the server.") - String http201(String resource); + @Message(id = 66, value = "Exception report") + String exceptionReport(); - @Message(id = 25, value = "This request was accepted for processing, but has not been completed (%s).") - String http202(String resource); + @Message(id = 67, value = "Status report") + String statusReport(); - @Message(id = 26, value = "The meta information presented by the client did not originate from the server (%s).") - String http203(String resource); + @Message(id = 68, value = "message") + String statusMessage(); - @Message(id = 27, value = "The request succeeded but there is no information to return (%s).") - String http204(String resource); + @Message(id = 69, value = "description") + String statusDescritpion(); - @Message(id = 28, value = "The client should reset the document view which caused this request to be sent (%s).") - String http205(String resource); + @Message(id = 70, value = "exception") + String statusException(); - @Message(id = 29, value = "The server has fulfilled a partial GET request for this resource (%s).") - String http206(String resource); + @Message(id = 71, value = "root cause") + String statusRootCause(); - @Message(id = 30, value = "Multiple status values have been returned (%s).") - String http207(String resource); + @Message(id = 72, value = "note") + String statusNote(); - @Message(id = 31, value = "The requested resource (%s) corresponds to any one of a set of representations, each with its own specific location.") - String http300(String resource); + @Message(id = 73, value = "The full stack trace of the root cause is available in the %s logs.") + String statusRootCauseInLogs(String log); - @Message(id = 32, value = "The requested resource (%s) has moved permanently to a new location.") - String http301(String resource); + @Message(id = 74, value = "Exception processing event.") + String eventValveExceptionDuringEvent(); - @Message(id = 33, value = "The requested resource (%s) has moved temporarily to a new location.") - String http302(String resource); + @Message(id = 75, value = "Exception processing session listener event.") + String eventValveSessionListenerException(); - @Message(id = 34, value = "The response to this request can be found under a different URI (%s).") - String http303(String resource); + @Message(id = 76, value = "Exception performing insert access entry.") + String jdbcAccessLogValveInsertError(); - @Message(id = 35, value = "The requested resource (%s) is available and has not been modified.") - String http304(String resource); + @Message(id = 77, value = "Exception closing database connection.") + String jdbcAccessLogValveConnectionCloseError(); - @Message(id = 36, value = "The requested resource (%s) must be accessed through the proxy given by the 'Location' header.") - String http305(String resource); + @Message(id = 78, value = "Syntax error in request filter pattern %s") + String requestFilterValvePatternError(String pattern); - @Message(id = 37, value = "The request sent by the client was syntactically incorrect (%s).") - String http400(String resource); + @Message(id = 100, value = "The client may continue.") + String http100(); - @Message(id = 38, value = "This request requires HTTP authentication (%s).") - String http401(String resource); + @Message(id = 101, value = "The server is switching protocols according to the 'Upgrade' header.") + String http101(); - @Message(id = 39, value = "Payment is required for access to this resource (%s).") - String http402(String resource); + @Message(id = 102, value = "The server has accepted the complete request, but has not yet completed it.") + String http102(); - @Message(id = 40, value = "Access to the specified resource (%s) has been forbidden.") - String http403(String resource); + @Message(id = 103, value = "The request succeeded and a new resource has been created on the server.") + String http201(); - @Message(id = 41, value = "The requested resource (%s) is not available.") - String http404(String resource); + @Message(id = 104, value = "This request was accepted for processing, but has not been completed.") + String http202(); - @Message(id = 42, value = "The specified HTTP method is not allowed for the requested resource (%s).") - String http405(String resource); + @Message(id = 105, value = "The meta information presented by the client did not originate from the server.") + String http203(); - @Message(id = 43, value = "The resource identified by this request is only capable of generating responses with characteristics not acceptable according to the request 'Accept' headers (%s).") - String http406(String resource); + @Message(id = 106, value = "The request succeeded but there is no information to return.") + String http204(); - @Message(id = 44, value = "The client must first authenticate itself with the proxy (%s).") - String http407(String resource); + @Message(id = 107, value = "The client should reset the document view which caused this request to be sent.") + String http205(); - @Message(id = 45, value = "The client did not produce a request within the time that the server was prepared to wait (%s).") - String http408(String resource); + @Message(id = 108, value = "The server has fulfilled a partial GET request for this resource.") + String http206(); - @Message(id = 46, value = "The request could not be completed due to a conflict with the current state of the resource (%s).") - String http409(String resource); + @Message(id = 109, value = "Multiple status values have been returned.") + String http207(); - @Message(id = 47, value = "The requested resource (%s) is no longer available, and no forwarding address is known.") - String http410(String resource); + @Message(id = 110, value = "This collection binding was already reported.") + String http208(); - @Message(id = 48, value = "This request cannot be handled without a defined content length (%s).") - String http411(String resource); + @Message(id = 111, value = "The response is a representation of the result of one or more instance-manipulations applied to the current instance.") + String http226(); - @Message(id = 49, value = "A specified precondition has failed for this request (%s).") - String http412(String resource); + @Message(id = 112, value = "The requested resource corresponds to any one of a set of representations, each with its own specific location.") + String http300(); - @Message(id = 50, value = "The request entity is larger than the server is willing or able to process (%s).") - String http413(String resource); + @Message(id = 113, value = "The requested resource has moved permanently to a new location.") + String http301(); - @Message(id = 51, value = "The server refused this request because the request URI was too long (%s).") - String http414(String resource); + @Message(id = 114, value = "The requested resource has moved temporarily to a new location.") + String http302(); - @Message(id = 52, value = "The server refused this request because the request entity is in a format not supported by the requested resource for the requested method (%s).") - String http415(String resource); + @Message(id = 115, value = "The response to this request can be found under a different URI (%s).") + String http303(); - @Message(id = 53, value = "The requested byte range cannot be satisfied (%s).") - String http416(String resource); + @Message(id = 116, value = "The requested resource is available and has not been modified.") + String http304(); - @Message(id = 54, value = "The expectation given in the 'Expect' request header (%s) could not be fulfilled.") - String http417(String resource); + @Message(id = 117, value = "The requested resource must be accessed through the proxy given by the 'Location' header.") + String http305(); - @Message(id = 55, value = "The server understood the content type and syntax of the request but was unable to process the contained instructions (%s).") - String http422(String resource); + @Message(id = 118, value = "The requested resource resides temporarily under a different URI.") + String http307(); - @Message(id = 56, value = "The source or destination resource of a method is locked (%s).") - String http423(String resource); + @Message(id = 119, value = "The target resource has been assigned a new permanent URI and any future references to this resource SHOULD use one of the returned URIs.") + String http308(); - @Message(id = 57, value = "The server encountered an internal error (%s) that prevented it from fulfilling this request.") - String http500(String resource); + @Message(id = 120, value = "The request sent by the client was syntactically incorrect.") + String http400(); - @Message(id = 58, value = "The server does not support the functionality needed to fulfill this request (%s).") - String http501(String resource); + @Message(id = 121, value = "This request requires HTTP authentication.") + String http401(); - @Message(id = 59, value = "This server received an invalid response from a server it consulted when acting as a proxy or gateway (%s).") - String http502(String resource); + @Message(id = 122, value = "Payment is required for access to this resource.") + String http402(); - @Message(id = 60, value = "The requested service (%s) is not currently available.") - String http503(String resource); + @Message(id = 123, value = "Access to the specified resource has been forbidden.") + String http403(); - @Message(id = 61, value = "The server received a timeout from an upstream server while acting as a gateway or proxy (%s).") - String http504(String resource); + @Message(id = 124, value = "The requested resource is not available.") + String http404(); - @Message(id = 62, value = "The server does not support the requested HTTP protocol version (%s).") - String http505(String resource); + @Message(id = 125, value = "The specified HTTP method is not allowed for the requested resource.") + String http405(); - @Message(id = 63, value = "The resource does not have sufficient space to record the state of the resource after execution of this method (%s).") - String http507(String resource); + @Message(id = 126, value = "The resource identified by this request is only capable of generating responses with characteristics not acceptable according to the request 'Accept' headers.") + String http406(); - @Message(id = 64, value = "Error report") - String errorReport(); + @Message(id = 127, value = "The client must first authenticate itself with the proxy.") + String http407(); - @Message(id = 65, value = "HTTP Status %s - %s") - String statusHeader(int statusCode, String message); + @Message(id = 128, value = "The client did not produce a request within the time that the server was prepared to wait.") + String http408(); - @Message(id = 66, value = "Exception report") - String exceptionReport(); + @Message(id = 129, value = "The request could not be completed due to a conflict with the current state of the resource.") + String http409(); - @Message(id = 67, value = "Status report") - String statusReport(); + @Message(id = 130, value = "The requested resource is no longer available, and no forwarding address is known.") + String http410(); - @Message(id = 68, value = "message") - String statusMessage(); + @Message(id = 131, value = "This request cannot be handled without a defined content length.") + String http411(); - @Message(id = 69, value = "description") - String statusDescritpion(); + @Message(id = 132, value = "A specified precondition has failed for this request.") + String http412(); - @Message(id = 70, value = "exception") - String statusException(); + @Message(id = 133, value = "The request entity is larger than the server is willing or able to process.") + String http413(); - @Message(id = 71, value = "root cause") - String statusRootCause(); + @Message(id = 134, value = "The server refused this request because the request URI was too long.") + String http414(); - @Message(id = 72, value = "note") - String statusNote(); + @Message(id = 135, value = "The server refused this request because the request entity is in a format not supported by the requested resource for the requested method.") + String http415(); - @Message(id = 73, value = "The full stack trace of the root cause is available in the %s logs.") - String statusRootCauseInLogs(String log); + @Message(id = 136, value = "The requested byte range cannot be satisfied.") + String http416(); - @Message(id = 74, value = "Exception processing event.") - String eventValveExceptionDuringEvent(); + @Message(id = 137, value = "The expectation given in the 'Expect' request header could not be fulfilled.") + String http417(); - @Message(id = 75, value = "Exception processing session listener event.") - String eventValveSessionListenerException(); + @Message(id = 138, value = "The server understood the content type and syntax of the request but was unable to process the contained instructions.") + String http422(); - @Message(id = 76, value = "Exception performing insert access entry.") - String jdbcAccessLogValveInsertError(); + @Message(id = 139, value = "The source or destination resource of a method is locked.") + String http423(); - @Message(id = 77, value = "Exception closing database connection.") - String jdbcAccessLogValveConnectionCloseError(); + @Message(id = 140, value = "The method could not be performed on the resource because the requested action depended on another action and that action failed.") + String http424(); - @Message(id = 78, value = "Syntax error in request filter pattern %s") - String requestFilterValvePatternError(String pattern); + @Message(id = 141, value = "The request can only be completed after a protocol upgrade.") + String http426(); + @Message(id = 142, value = "The request is required to be conditional.") + String http428(); + + @Message(id = 143, value = "The user has sent too many requests in a given amount of time.") + String http429(); + + @Message(id = 144, value = "The server refused this request because the request header fields are too large.") + String http431(); + + @Message(id = 145, value = "The server encountered an internal error that prevented it from fulfilling this request.") + String http500(); + + @Message(id = 146, value = "The server does not support the functionality needed to fulfill this request.") + String http501(); + + @Message(id = 147, value = "This server received an invalid response from a server it consulted when acting as a proxy or gateway.") + String http502(); + + @Message(id = 148, value = "The requested service is not currently available.") + String http503(); + + @Message(id = 149, value = "The server received a timeout from an upstream server while acting as a gateway or proxy.") + String http504(); + + @Message(id = 150, value = "The server does not support the requested HTTP protocol version.") + String http505(); + + @Message(id = 151, value = "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.") + String http506(); + + @Message(id = 152, value = "The resource does not have sufficient space to record the state of the resource after execution of this method.") + String http507(); + + @Message(id = 153, value = "The server terminated an operation because it encountered an infinite loop.") + String http508(); + + @Message(id = 154, value = "The policy for accessing the resource has not been met in the request.") + String http510(); + + @Message(id = 155, value = "The client needs to authenticate to gain network access.") + String http511(); + }