Author: remm
Date: Wed Dec 5 16:24:43 2018
New Revision: 1848223
URL: http://svn.apache.org/viewvc?rev=1848223&view=rev
Log:
Add i18n for the startup package. Classes from the bootstrap.jar package cannot
be i18ned at this time.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1848223&r1=1848222&r2=1848223&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed Dec 5
16:24:43 2018
@@ -1197,7 +1197,7 @@ public class ContextConfig implements Li
}
if (context.getLogEffectiveWebXml()) {
- log.info("web.xml:\n" + webXml.toXml());
+ log.info(sm.getString("contextConfig.effectiveWebXml",
webXml.toXml()));
}
// Always need to look for static resources
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1848223&r1=1848222&r2=1848223&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Wed Dec 5
16:24:43 2018
@@ -228,7 +228,7 @@ public class HostConfig implements Lifec
}
} catch (MalformedURLException e) {
// Should never happen
- log.warn("hostConfig.docBaseUrlInvalid", e);
+ log.warn(sm.getString("hostConfig.docBaseUrlInvalid"), e);
}
}
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1848223&r1=1848222&r2=1848223&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
[UTF-8] Wed Dec 5 16:24:43 2018
@@ -54,6 +54,7 @@ contextConfig.defaultError=Error process
contextConfig.defaultMissing=No global web.xml found
contextConfig.defaultPosition=Occurred at line [{0}] column [{1}]
contextConfig.destroy=ContextConfig: Destroying
+contextConfig.effectiveWebXml=Effective web.xml:\n{0}
contextConfig.fileUrl=Unable to create a File object from the URL [{0}]
contextConfig.fixDocBase=Exception fixing docBase for context [{0}]
contextConfig.init=ContextConfig: Initializing
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
