tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r446782 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/core/ catalina/src/share/org/apache/catalina/valves/ webapps/docs/
Date Fri, 15 Sep 2006 23:23:26 GMT
Author: markt
Date: Fri Sep 15 16:23:25 2006
New Revision: 446782

URL: http://svn.apache.org/viewvc?view=rev&rev=446782
Log:
Fix bug 40518. Use correct message.

Modified:
    tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
    tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings_es.properties
    tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings_fr.properties
    tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties
    tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
    tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties
    tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings_es.properties
    tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings_fr.properties
    tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings_ja.properties
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings.properties?view=diff&rev=446782&r1=446781&r2=446782
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
Fri Sep 15 16:23:25 2006
@@ -56,6 +56,8 @@
 standardContext.filterMap.pattern=Invalid <url-pattern> {0} in filter mapping
 standardContext.filterStart=Exception starting filter {0}
 standardContext.filterStartFailed=Failed to start application Filters successfully
+standardContext.requestListener.requestInit=Exception sending request initialized lifecycle
event to listener instance of class {0}
+standardContext.requestListener.requestDestroy=Exception sending request destroyed lifecycle
event to listener instance of class {0}
 standardContext.requestListenerStartFailed=Failed to start request listener valve successfully
 standardContext.requestListenerConfig.added=Added request listener Valve
 standardContext.requestListenerConfig.error=Exception adding request listener Valve: {0}

Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings_es.properties?view=diff&rev=446782&r1=446781&r2=446782
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings_es.properties
Fri Sep 15 16:23:25 2006
@@ -65,6 +65,8 @@
 standardContext.reloadingCompleted=Se ha completado la Regarga de este Contexto
 standardContext.reloadingFailed=Falló la recarga de este Contexto debido a errores previos
 standardContext.reloadingStarted=Ha comenzado la recarga de este Contexto
+standardContext.requestListener.requestInit=Una excepción durante el envío de requerimiento
ha iniciado un evento de ciclo de vida (lifecycle event) para la instancia de clase a la escucha
(listener) {0}
+standardContext.requestListener.requestDestroy=Una excepción durante el envío de requerimiento
ha destruído un evento de ciclo de vida (lifecycle event) para la instancia de clase a la
escucha (listener) {0}
 standardContext.resourcesStart=Error arrancando Recursos estáticos
 standardContext.securityConstraint.pattern=<url-pattern> {0} inválida en restricción
de seguridad
 standardContext.servletMap.name=El mapeo de Servlet especifica un nombre de servlet desconocido
{0}

Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings_fr.properties?view=diff&rev=446782&r1=446781&r2=446782
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings_fr.properties
(original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings_fr.properties
Fri Sep 15 16:23:25 2006
@@ -64,6 +64,8 @@
 standardContext.reloadingCompleted=Le rechargement de ce contexte est terminé
 standardContext.reloadingFailed=Le rechargement de ce contexte a échoué suite à une erreur
précédente
 standardContext.reloadingStarted=Le rechargement de ce contexte a démarré
+standardContext.requestListener.requestInit=Une exception lors de l''envoi de requête a
initié un évènement cycle de vie (lifecycle event) pour l''instance de classe à l''écoute
(listener) {0}
+standardContext.requestListener.requestDestroy=Une exception lors de l''envoi de requête
a détruit un évènement cycle de vie (lifecycle event) pour l''instance de classe à l''écoute
(listener) {0}
 standardContext.securityConstraint.pattern=<url-pattern> {0} invalide d''après les
contraintes de sécurité (security constraint)
 standardContext.servletMap.name=L''association de servlet (servlet mapping) indique un nom
de servlet inconnu {0}
 standardContext.servletMap.pattern=<url-pattern> {0} invalide dans l''association de
servlet (servlet mapping)

Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties?view=diff&rev=446782&r1=446781&r2=446782
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties
(original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties
Fri Sep 15 16:23:25 2006
@@ -65,6 +65,8 @@
 standardContext.reloadingCompleted=\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u518d\u30ed\u30fc\u30c9\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f
 standardContext.reloadingFailed=\u4ee5\u524d\u306e\u30a8\u30e9\u30fc\u306e\u305f\u3081\u306b\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u518d\u30ed\u30fc\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f
 standardContext.reloadingStarted=\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u518d\u30ed\u30fc\u30c9\u3092\u958b\u59cb\u3057\u307e\u3057\u305f
+standardContext.requestListener.requestInit=\u30af\u30e9\u30b9 {0} \u306e\u30ea\u30b9\u30ca\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306b\u521d\u671f\u5316\u3059\u308b\u30e9\u30a4\u30d5\u30b5\u30a4\u30af\u30eb\u30a4\u30d9\u30f3\u30c8\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u9001\u4fe1\u4e2d\u306e\u4f8b\u5916\u3067\u3059
+standardContext.requestListener.requestDestroy=\u30af\u30e9\u30b9 {0} \u306e\u30ea\u30b9\u30ca\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306b\u5ec3\u68c4\u3059\u308b\u30e9\u30a4\u30d5\u30b5\u30a4\u30af\u30eb\u30a4\u30d9\u30f3\u30c8\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u9001\u4fe1\u4e2d\u306e\u4f8b\u5916\u3067\u3059
 standardContext.resourcesStart=\u9759\u7684\u30ea\u30bd\u30fc\u30b9\u306e\u8d77\u52d5\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059
 standardContext.securityConstraint.pattern=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u5236\u7d04\u306e\u4e2d\u306b\u7121\u52b9\u306a
<url-pattern> {0} \u304c\u3042\u308a\u307e\u3059
 standardContext.servletMap.name=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30de\u30c3\u30d4\u30f3\u30b0\u306f\u672a\u77e5\u306e\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u540d
{0} \u3092\u6307\u5b9a\u3057\u3066\u3044\u307e\u3059

Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java?view=diff&rev=446782&r1=446781&r2=446782
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
(original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
Fri Sep 15 16:23:25 2006
@@ -166,7 +166,7 @@
                 try {
                     listener.requestInitialized(event);
                 } catch (Throwable t) {
-                    container.getLogger().error(sm.getString("requestListenerValve.requestInit",
+                    container.getLogger().error(sm.getString("standardContext.requestListener.requestInit",
                                      instances[i].getClass().getName()), t);
                     ServletRequest sreq = request.getRequest();
                     sreq.setAttribute(Globals.EXCEPTION_ATTR,t);
@@ -190,7 +190,7 @@
                 try {
                     listener.requestDestroyed(event);
                 } catch (Throwable t) {
-                    container.getLogger().error(sm.getString("requestListenerValve.requestDestroy",
+                    container.getLogger().error(sm.getString("standardContext.requestListener.requestDestroy",
                                      instances[i].getClass().getName()), t);
                     ServletRequest sreq = request.getRequest();
                     sreq.setAttribute(Globals.EXCEPTION_ATTR,t);
@@ -202,47 +202,6 @@
 
 
     // -------------------------------------------------------- Private Methods
-
-
-    /**
-     * Report a "bad request" error for the specified resource.  FIXME:  We
-     * should really be using the error reporting settings for this web
-     * application, but currently that code runs at the wrapper level rather
-     * than the context level.
-     *
-     * @param requestURI The request URI for the requested resource
-     * @param response The response we are creating
-     */
-    private void badRequest(String requestURI, HttpServletResponse response) {
-
-        try {
-            response.sendError(HttpServletResponse.SC_BAD_REQUEST, requestURI);
-        } catch (IllegalStateException e) {
-            ;
-        } catch (IOException e) {
-            ;
-        }
-
-    }
-    
-    
-    /**
-     * Report a "forbidden" error for the specified resource. 
-     *
-     * @param requestURI The request URI for the requested resource
-     * @param response The response we are creating
-     */
-    private void forbidden(String requestURI, HttpServletResponse response) {
-
-        try {
-            response.sendError(HttpServletResponse.SC_FORBIDDEN, requestURI);
-        } catch (IllegalStateException e) {
-            ;
-        } catch (IOException e) {
-            ;
-        }
-
-    }
 
 
     /**

Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties?view=diff&rev=446782&r1=446781&r2=446782
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties
(original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties
Fri Sep 15 16:23:25 2006
@@ -8,8 +8,6 @@
 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}
-requestListenerValve.requestInit=Exception sending request initialized lifecycle event to
listener instance of class {0}
-requestListenerValve.requestDestroy=Exception sending request destroyed lifecycle event to
listener instance of class {0}
 valveBase.noNext=Configuration error: No ''next'' valve configured
 jdbcAccessLogValve.exception=Exception performing insert access entry
 jdbcAccessLogValve.close=Exception closing database connection

Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings_es.properties?view=diff&rev=446782&r1=446781&r2=446782
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings_es.properties
(original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings_es.properties
Fri Sep 15 16:23:25 2006
@@ -6,8 +6,6 @@
 interceptorValve.notStarted=La válvula interceptora no se ha iniciado
 requestFilterValve.next=No hay ''siguiente'' válvula configurada
 requestFilterValve.syntax=Error de sintáxis en petición de filtro patrón {0}
-requestListenerValve.requestInit=Una excepción durante el envío de requerimiento ha iniciado
un evento de ciclo de vida (lifecycle event) para la instancia de clase a la escucha (listener)
{0}
-requestListenerValve.requestDestroy=Una excepción durante el envío de requerimiento ha
destruído un evento de ciclo de vida (lifecycle event) para la instancia de clase a la escucha
(listener) {0}
 valveBase.noNext=Error de configuración: No hay ''siguiente'' válvula configurada
 jdbcAccessLogValve.exception=Excepción realizando entrada de acceso a inserción
 jdbcAccessLogValve.close=Excepción cerrando conexión a base de datos

Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings_fr.properties?view=diff&rev=446782&r1=446781&r2=446782
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings_fr.properties
(original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings_fr.properties
Fri Sep 15 16:23:25 2006
@@ -6,8 +6,6 @@
 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}
-requestListenerValve.requestInit=Une exception lors de l''envoi de requête a initié un
évènement cycle de vie (lifecycle event) pour l''instance de classe à l''écoute (listener)
{0}
-requestListenerValve.requestDestroy=Une exception lors de l''envoi de requête a détruit
un évènement cycle de vie (lifecycle event) pour l''instance de classe à l''écoute (listener)
{0}
 valveBase.noNext=Erreur de configuration error: Aucune Valve ''suivante'' n''a été configurée
 
 # Error report valve

Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings_ja.properties
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings_ja.properties?view=diff&rev=446782&r1=446781&r2=446782
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings_ja.properties
(original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/LocalStrings_ja.properties
Fri Sep 15 16:23:25 2006
@@ -6,8 +6,6 @@
 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
-requestListenerValve.requestInit=\u30af\u30e9\u30b9 {0} \u306e\u30ea\u30b9\u30ca\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306b\u521d\u671f\u5316\u3059\u308b\u30e9\u30a4\u30d5\u30b5\u30a4\u30af\u30eb\u30a4\u30d9\u30f3\u30c8\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u9001\u4fe1\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-requestListenerValve.requestDestroy=\u30af\u30e9\u30b9 {0} \u306e\u30ea\u30b9\u30ca\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306b\u5ec3\u68c4\u3059\u308b\u30e9\u30a4\u30d5\u30b5\u30a4\u30af\u30eb\u30a4\u30d9\u30f3\u30c8\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u9001\u4fe1\u4e2d\u306e\u4f8b\u5916\u3067\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
 

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=446782&r1=446781&r2=446782
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Sep 15 16:23:25 2006
@@ -21,6 +21,11 @@
         Fix logic error in UserDatbaseRealm.getprincipal() that caused user
         roles assigned via groups to be ignored. (markt)
       </fix>
+      <fix>
+        <bug>40518</bug>: Use correct message when a RuntimeException is
+        thrown from the requestInitialized or requestDestroyed method of
+        a listener that inplements ServletRequestListener. (markt)
+      </fix>
     </changelog>
   </subsection> 
   <subsection name="Jasper">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message