Author: kkolinko
Date: Thu Jan 27 19:06:19 2011
New Revision: 1064257
URL: http://svn.apache.org/viewvc?rev=1064257&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48822
Include context name in reload and stop log statements.
Based on the patch by Marc Guillemot.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1064257&r1=1064256&r2=1064257&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 27 19:06:19 2011
@@ -100,10 +100,3 @@ PATCHES PROPOSED TO BACKPORT:
(kkolinko: not tested, thus not voting yet)
+1:
-1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48822
- Include context name in reload and stop log statements.
- Based on the patch by Marc Guillemot.
- http://people.apache.org/~kkolinko/patches/2011-01-23_tc6_48822.patch
- +1: kkolinko, markt, fhanik
- -1:
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1064257&r1=1064256&r2=1064257&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Thu Jan 27 19:06:19 2011
@@ -111,17 +111,18 @@ standardContext.parameter.duplicate=Dupl
standardContext.parameter.required=Both parameter name and parameter value are
required
standardContext.reloadingCompleted=Reloading this Context is completed
standardContext.reloadingFailed=Reloading this Context failed due to previous
errors
-standardContext.reloadingStarted=Reloading this Context has started
+standardContext.reloadingStarted=Reloading Context with name [{0}] has started
standardContext.resourcesStart=Error starting static Resources
standardContext.securityConstraint.pattern=Invalid <url-pattern> {0} in
security constraint
standardContext.servletMap.name=Servlet mapping specifies an unknown servlet
name {0}
standardContext.servletMap.pattern=Invalid <url-pattern> {0} in servlet mapping
standardContext.startCleanup=Exception during cleanup after start failed
standardContext.startFailed=Context [{0}] startup failed due to previous errors
+standardContext.startingContext=Exception starting Context with name [{0}]
standardContext.startingLoader=Exception starting Loader
standardContext.startingManager=Exception starting Manager
standardContext.startingWrapper=Exception starting Wrapper for servlet {0}
-standardContext.stoppingContext=Exception stopping Context
+standardContext.stoppingContext=Exception stopping Context with name [{0}]
standardContext.stoppingLoader=Exception stopping Loader
standardContext.stoppingManager=Exception stopping Manager
standardContext.stoppingWrapper=Exception stopping Wrapper for servlet {0}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1064257&r1=1064256&r2=1064257&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
Thu Jan 27 19:06:19 2011
@@ -100,7 +100,7 @@ standardContext.parameter.duplicate = Du
standardContext.parameter.required = Es necesario poner nombre de
par\u00e1metro y valor de par\u00e1metro
standardContext.reloadingCompleted = Se ha completado la Regarga de este
Contexto
standardContext.reloadingFailed = Fall\u00f3 la recarga de este Contexto
debido a errores previos
-standardContext.reloadingStarted = Ha comenzado la recarga de este Contexto
+standardContext.reloadingStarted = Ha comenzado la recarga de Contexto [{0}]
standardContext.resourcesStart = Error arrancando Recursos est\u00e1ticos
standardContext.securityConstraint.pattern = <url-pattern> {0} inv\u00e1lida
en restricci\u00f3n de seguridad
standardContext.servletMap.name = El mapeo de Servlet especifica un nombre de
servlet desconocido {0}
@@ -110,7 +110,7 @@ standardContext.startFailed = Fall\u00f3
standardContext.startingLoader = Excepci\u00f3n arrancando Cargador
standardContext.startingManager = Excepci\u00f3n arrancando Gestor
standardContext.startingWrapper = Excepci\u00f3n arrancando Arropador
(Wrapper) para servlet {0}
-standardContext.stoppingContext = Excepci\u00f3n parando Context
+standardContext.stoppingContext = Excepci\u00f3n parando Context [{0}]
standardContext.stoppingLoader = Excepci\u00f3n parando Cargador
standardContext.stoppingManager = Excepci\u00f3n parando Gestor
standardContext.stoppingWrapper = Excepci\u00f3n parando Arropador (Wrapper)
para servlet {0}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=1064257&r1=1064256&r2=1064257&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
Thu Jan 27 19:06:19 2011
@@ -78,7 +78,7 @@ standardContext.parameter.duplicate=Para
standardContext.parameter.required=Le nom de param\u00e8tre ainsi que la
valeur du param\u00e8tre sont requis
standardContext.reloadingCompleted=Le rechargement de ce contexte est
termin\u00e9
standardContext.reloadingFailed=Le rechargement de ce contexte a
\u00e9chou\u00e9 suite \u00e0 une erreur pr\u00e9c\u00e9dente
-standardContext.reloadingStarted=Le rechargement de ce contexte a
d\u00e9marr\u00e9
+standardContext.reloadingStarted=Le rechargement du contexte [{0}] a
d\u00e9marr\u00e9
standardContext.requestListener.requestInit=Une exception lors de l''envoi de
requ\u00eate a initi\u00e9 un \u00e9v\u00e8nement cycle de vie (lifecycle
event) pour l''instance de classe \u00e0 l''\u00e9coute (listener) {0}
standardContext.requestListener.requestDestroy=Une exception lors de l''envoi
de requ\u00eate a d\u00e9truit un \u00e9v\u00e8nement cycle de vie (lifecycle
event) pour l''instance de classe \u00e0 l''\u00e9coute (listener) {0}
standardContext.securityConstraint.pattern=<url-pattern> {0} invalide
d''apr\u00e8s les contraintes de s\u00e9curit\u00e9 (security constraint)
@@ -89,7 +89,7 @@ standardContext.startFailed=Erreur de d\
standardContext.startingLoader=Exception an d\u00e9marrage du "Loader"
standardContext.startingManager=Exception an d\u00e9marrage du "Manager"
standardContext.startingWrapper=Exception an d\u00e9marrage de l''enrobeur
(wrapper) de la servlet {0}
-standardContext.stoppingContext=Exception \u00e0 l''arr\u00eat du "Context"
+standardContext.stoppingContext=Exception \u00e0 l''arr\u00eat du Context [{0}]
standardContext.stoppingLoader=Exception \u00e0 l''arr\u00eat du "Loader"
standardContext.stoppingManager=Exception \u00e0 l''arr\u00eat du "Manager"
standardContext.stoppingWrapper=Exception \u00e0 l''arr\u00eat de l''enrobeur
(wrapper) de la servlet {0}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1064257&r1=1064256&r2=1064257&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Thu
Jan 27 19:06:19 2011
@@ -3413,7 +3413,8 @@ public class StandardContext
// throw new IllegalStateException
// (sm.getString("standardContext.notReloadable"));
if(log.isInfoEnabled())
- log.info(sm.getString("standardContext.reloadingStarted"));
+ log.info(sm.getString("standardContext.reloadingStarted",
+ getName()));
// Stop accepting requests temporarily
setPaused(true);
@@ -3421,13 +3422,15 @@ public class StandardContext
try {
stop();
} catch (LifecycleException e) {
- log.error(sm.getString("standardContext.stoppingContext"), e);
+ log.error(sm.getString("standardContext.stoppingContext",
+ getName()), e);
}
try {
start();
} catch (LifecycleException e) {
- log.error(sm.getString("standardContext.startingContext"), e);
+ log.error(sm.getString("standardContext.startingContext",
+ getName()), e);
}
setPaused(false);
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1064257&r1=1064256&r2=1064257&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jan 27 19:06:19 2011
@@ -44,6 +44,14 @@
General, Catalina, Coyote, Jasper, Cluster, Webapps, Other
-->
<section name="Tomcat 6.0.32 (jfclere)">
+ <subsection name="Catalina">
+ <changelog>
+ <update>
+ <bug>48822</bug>: Include context name in reload and stop log
statements.
+ Based on the patch provided by Marc Guillemot. (kkolinko)
+ </update>
+ </changelog>
+ </subsection>
<subsection name="Coyote">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
