Author: kkolinko
Date: Thu Nov 20 04:42:45 2014
New Revision: 1640673
URL: http://svn.apache.org/r1640673
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 r1640672 from tomcat/tc8.0.x/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1640652
Merged /tomcat/tc8.0.x/trunk:r1640672
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1640673&r1=1640672&r2=1640673&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Thu Nov 20 04:42:45 2014
@@ -139,6 +139,7 @@ standardContext.isUnavailable=This appli
standardContext.listenerStart=Exception sending context initialized event to
listener instance of class {0}
standardContext.listenerStartFailed=Failed to start application Listeners
successfully
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
''/'
@@ -258,7 +259,6 @@ standardWrapper.instantiate=Error instan
standardWrapper.isUnavailable=Servlet {0} is currently unavailable
standardWrapper.jasperLoader=Using Jasper classloader for servlet {0}
standardWrapper.jspFile.format=JSP file {0} does not start with a ''/''
character
-standardWrapper.loadException=Servlet {0} threw load() exception
standardWrapper.missingClass=Wrapper cannot find servlet class {0} or a class
it depends on
standardWrapper.missingLoader=Wrapper cannot find Loader for servlet {0}
standardWrapper.notChild=Wrapper container may not have child containers
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1640673&r1=1640672&r2=1640673&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
Thu Nov 20 04:42:45 2014
@@ -227,7 +227,6 @@ standardWrapper.instantiate = Error inst
standardWrapper.isUnavailable = El Servlet {0} no est\u00E1 disponible en este
momento
standardWrapper.jasperLoader = Usando cargador de clases (classloader) de
Jasper para servlet {0}
standardWrapper.jspFile.format = El archivo JSP {0} no comienza con
car\u00E1cter ''/''
-standardWrapper.loadException = El Servlet {0} lanz\u00F3 excepci\u00F3n de
load()
standardWrapper.missingClass = El Arropador (Wrapper) no puede hallar clase de
servlet {0} o una clase de la que depende
standardWrapper.missingLoader = El Arropador (Wrapper) no puede hallar
Cargador para servlet {0}
standardWrapper.notChild = El contenedor de Arropador (Wrapper) no puede tener
contenedores hijo
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=1640673&r1=1640672&r2=1640673&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
Thu Nov 20 04:42:45 2014
@@ -150,7 +150,6 @@ standardWrapper.instantiate=Erreur \u00e
standardWrapper.isUnavailable=La servlet {0} est actuellement indisponible
standardWrapper.jasperLoader=Utilisation du chargeur de classe Jasper
(classloader) pour la servlet {0}
standardWrapper.jspFile.format=Le fichier JSP {0} ne commence par par un
caract\u00e8re ''/''
-standardWrapper.loadException=La servlet {0} a g\u00e9n\u00e9r\u00e9 une
exception "load()"
standardWrapper.missingClass=L''enrobeur (wrapper) ne peut trouver la classe
servlet {0} ou une classe dont elle d\u00e9pend
standardWrapper.missingLoader=L''enrobeur (wrapper) ne peut trouver de
chargeur (loader) pour la servlet {0}
standardWrapper.notChild=L''enrobeur de conteneur (wrapper container) peut ne
pas avoir de conteneurs fils
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties?rev=1640673&r1=1640672&r2=1640673&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
Thu Nov 20 04:42:45 2014
@@ -154,7 +154,6 @@ standardWrapper.instantiate=\u30b5\u30fc
standardWrapper.isUnavailable=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0}
\u306f\u73fe\u5728\u5229\u7528\u3067\u304d\u307e\u305b\u3093
standardWrapper.jasperLoader=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0}
\u306bJasper\u30af\u30e9\u30b9\u30ed\u30fc\u30c0\u3092\u4f7f\u7528\u3057\u307e\u3059
standardWrapper.jspFile.format=JSP\u30d5\u30a1\u30a4\u30eb {0}
\u304c''/''\u6587\u5b57\u3067\u59cb\u307e\u3063\u3066\u3044\u307e\u305b\u3093
-standardWrapper.loadException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0}
\u304cload()\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
standardWrapper.missingClass=\u30e9\u30c3\u30d1\u304c\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30af\u30e9\u30b9
{0}
\u53c8\u306f\u305d\u308c\u304c\u4f9d\u5b58\u3059\u308b\u30af\u30e9\u30b9\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093
standardWrapper.missingLoader=\u30e9\u30c3\u30d1\u304c\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8
{0}
\u306e\u30ed\u30fc\u30c0\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093
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
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1640673&r1=1640672&r2=1640673&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Thu
Nov 20 04:42:45 2014
@@ -5241,11 +5241,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/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1640673&r1=1640672&r2=1640673&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Nov 20 04:42:45 2014
@@ -72,6 +72,10 @@
<code>"/"</code> values are now correctly changed to
<code>""</code>. (markt/kkolinko)
</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="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
