Author: kkolinko
Date: Thu Nov 20 04:34:51 2014
New Revision: 1640672
URL: http://svn.apache.org/r1640672
Log:
Correct message that is logged when load-on-startup servlet fails to load.
It was logging context name instead of servlet name.
Also correct message key. The message belongs to StandardContext. It is not
used anywhere else. It is not used by StandardWrapper.
To test: uncomment CGIServlet in conf/web.xml and look for messages in
localhost.$DATE.log file.
Merged r1640652 from tomcat/trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1640652
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1640672&r1=1640671&r2=1640672&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Thu Nov 20 04:34:51 2014
@@ -118,6 +118,7 @@ standardContext.requestListener.requestI
standardContext.isUnavailable=This application is not currently available
standardContext.listenerStart=Exception sending context initialized event to
listener instance of class {0}
standardContext.listenerStop=Exception sending context destroyed event to
listener instance of class {0}
+standardContext.loadOnStartup.loadException=Servlet [{1}] in web application
[{0}] threw load() exception
standardContext.loginConfig.errorPage=Form error page {0} must start with a
''/'
standardContext.loginConfig.errorWarning=WARNING: Form error page {0} must
start with a ''/'' in Servlet 2.4
standardContext.loginConfig.loginPage=Form login page {0} must start with a
''/'
@@ -180,7 +181,6 @@ standardWrapper.destroyException=Servlet
standardWrapper.initException=Servlet.init() for servlet {0} threw exception
standardWrapper.instantiate=Error instantiating servlet class {0}
standardWrapper.isUnavailable=Servlet {0} is currently unavailable
-standardWrapper.loadException=Servlet {0} threw load() exception
standardWrapper.notChild=Wrapper container may not have child containers
standardWrapper.notClass=No servlet class has been specified for servlet {0}
standardWrapper.notContext=Parent container of a Wrapper must be a Context
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1640672&r1=1640671&r2=1640672&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
Thu Nov 20 04:34:51 2014
@@ -140,7 +140,6 @@ standardWrapper.destroyException = Servl
standardWrapper.initException = Servlet.init() para servlet {0} lanz\u00F3
excepci\u00F3n
standardWrapper.instantiate = Error instanciando clase de servlet {0}
standardWrapper.isUnavailable = El Servlet {0} no est\u00E1 disponible en este
momento
-standardWrapper.loadException = El Servlet {0} lanz\u00F3 excepci\u00F3n de
load()
standardWrapper.notChild = El contenedor de Arropador (Wrapper) no puede tener
contenedores hijo
standardWrapper.notClass = No se ha especificado clase de servlet para servlet
{0}
standardWrapper.notContext = El contenedor padre para un Arropador (Wrapper)
debe de ser un Contexto
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=1640672&r1=1640671&r2=1640672&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
Thu Nov 20 04:34:51 2014
@@ -76,7 +76,6 @@ standardWrapper.destroyException="Servle
standardWrapper.initException="Servlet.init()" pour la servlet {0} a
g\u00e9n\u00e9r\u00e9 une exception
standardWrapper.instantiate=Erreur \u00e0 l''instantiation de la classe
servlet {0}
standardWrapper.isUnavailable=La servlet {0} est actuellement indisponible
-standardWrapper.loadException=La servlet {0} a g\u00e9n\u00e9r\u00e9 une
exception "load()"
standardWrapper.notChild=L''enrobeur de conteneur (wrapper container) peut ne
pas avoir de conteneurs fils
standardWrapper.notClass=Aucune classe servlet n''a \u00e9t\u00e9
sp\u00e9cifi\u00e9e pour la servlet {0}
standardWrapper.notContext=Le conteneur parent d''un enrobeur (wrapper) doit
\u00eatre un contexte
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties?rev=1640672&r1=1640671&r2=1640672&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
Thu Nov 20 04:34:51 2014
@@ -77,7 +77,6 @@ standardWrapper.destroyException=\u30b5\
standardWrapper.initException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0}
\u306eServlet.init()\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
standardWrapper.instantiate=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30af\u30e9\u30b9
{0}
\u3092\u521d\u671f\u5316\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
standardWrapper.isUnavailable=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0}
\u306f\u73fe\u5728\u5229\u7528\u3067\u304d\u307e\u305b\u3093
-standardWrapper.loadException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0}
\u304cload()\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
standardWrapper.notChild=\u30e9\u30c3\u30d1\u30b3\u30f3\u30c6\u30ca\u306f\u5b50\u4f9b\u306e\u30b3\u30f3\u30c6\u30ca\u3092\u6301\u3064\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
standardWrapper.notClass=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0}
\u306b\u6307\u5b9a\u3055\u308c\u305f\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30af\u30e9\u30b9\u304c\u3042\u308a\u307e\u305b\u3093
standardWrapper.notContext=\u30e9\u30c3\u30d1\u306e\u89aa\u306e\u30b3\u30f3\u30c6\u30ca\u306f\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1640672&r1=1640671&r2=1640672&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Thu
Nov 20 04:34:51 2014
@@ -4954,11 +4954,12 @@ public class StandardContext extends Con
try {
wrapper.load();
} catch (ServletException e) {
-
getLogger().error(sm.getString("standardWrapper.loadException",
- getName()),
StandardWrapper.getRootCause(e));
+
getLogger().error(sm.getString("standardContext.loadOnStartup.loadException",
+ getName(), wrapper.getName()),
StandardWrapper.getRootCause(e));
// NOTE: load errors (including a servlet that throws
- // UnavailableException from tht init() method) are NOT
- // fatal to application startup, excepted if
failDeploymentIfServletLoadedOnStartupFails is specified
+ // UnavailableException from the init() method) are NOT
+ // fatal to application startup
+ // unless failCtxIfServletStartFails="true" is specified
if(getComputedFailCtxIfServletStartFails()) {
return false;
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1640672&r1=1640671&r2=1640672&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Nov 20 04:34:51 2014
@@ -72,6 +72,10 @@
<fix>
Update storeconfig with the CredentialHandler element. (remm)
</fix>
+ <fix>
+ Correct message that is logged when load-on-startup servlet fails
+ to load. It was logging a wrong name. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
