Author: kkolinko
Date: Tue Sep 9 12:41:17 2014
New Revision: 1623804
URL: http://svn.apache.org/r1623804
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=56401
Followup to r1623471 - I18n for the log messages.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1623804&r1=1623803&r2=1623804&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Tue Sep 9
12:41:17 2014
@@ -787,14 +787,22 @@ public class Catalina {
private void logInfo() {
- log.info("Server version: " + ServerInfo.getServerInfo());
- log.info("Server built: " + ServerInfo.getServerBuilt());
- log.info("Server number: " + ServerInfo.getServerNumber());
- log.info("OS Name: " + System.getProperty("os.name"));
- log.info("OS Version: " + System.getProperty("os.version"));
- log.info("Architecture: " + System.getProperty("os.arch"));
- log.info("JVM Version: " +
System.getProperty("java.runtime.version"));
- log.info("JVM Vendor: " + System.getProperty("java.vm.vendor"));
+ log.info(sm.getString("catalina.serverInfo.server.version",
+ ServerInfo.getServerInfo()));
+ log.info(sm.getString("catalina.serverInfo.server.built",
+ ServerInfo.getServerBuilt()));
+ log.info(sm.getString("catalina.serverInfo.server.number",
+ ServerInfo.getServerNumber()));
+ log.info(sm.getString("catalina.serverInfo.os.name",
+ System.getProperty("os.name")));
+ log.info(sm.getString("catalina.serverInfo.os.version",
+ System.getProperty("os.version")));
+ log.info(sm.getString("catalina.serverInfo.os.arch",
+ System.getProperty("os.arch")));
+ log.info(sm.getString("catalina.serverInfo.vm.version",
+ System.getProperty("java.runtime.version")));
+ log.info(sm.getString("catalina.serverInfo.vm.vendor",
+ System.getProperty("java.vm.vendor")));
}
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=1623804&r1=1623803&r2=1623804&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Tue
Sep 9 12:41:17 2014
@@ -15,6 +15,14 @@
catalina.configFail=Unable to load server configuration from [{0}]
catalina.noCluster=Cluster RuleSet not found due to [{0}]. Cluster
configuration disabled.
+catalina.serverInfo.server.version=Server version: {0}
+catalina.serverInfo.server.built =Server built: {0}
+catalina.serverInfo.server.number =Server number: {0}
+catalina.serverInfo.os.name =OS Name: {0}
+catalina.serverInfo.os.version =OS Version: {0}
+catalina.serverInfo.os.arch =Architecture: {0}
+catalina.serverInfo.vm.version =JVM Version: {0}
+catalina.serverInfo.vm.vendor =JVM Vendor: {0}
catalina.serverStartFail=The required Server component failed to start so
Tomcat is unable to start.
catalina.shutdownHookFail=The shutdown hook experienced an error while trying
to stop the server
catalina.stopServer=No shutdown port configured. Shut down server through OS
signal. Server not shut down.
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1623804&r1=1623803&r2=1623804&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Sep 9 12:41:17 2014
@@ -64,7 +64,8 @@
correctly handle these cookies. (markt)
</fix>
<add>
- <bug>56401</bug>: Log version information when Tomcat starts. (markt)
+ <bug>56401</bug>: Log version information when Tomcat starts.
+ (markt/kkolinko)
</add>
<add>
<bug>56530</bug>: Add a web application class loader implementation
that
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
