On 24/09/2014 08:59, kkoli...@apache.org wrote: > Author: kkolinko > Date: Wed Sep 24 07:59:57 2014 > New Revision: 1627247 > > URL: http://svn.apache.org/r1627247 > Log: > Revert r1623471 + r1623804. > This was the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56401 > Log server information when Tomcat starts. > > Reason: It is wrong to log this information in constructor of Catalina class, > as I noted in Bugzilla. > There have to be a better solution. I think it is better to revert for now to > avoid delaying tagging of Tomcat 8.0.13.
This is absolutely not the way an objection to a commit should be handled. If you object to a commit then you need to veto that commit, providing valid technical reasons for doing so. In most cases a discussion will then follow on the dev list. If the veto is considered valid by the community then the original committer is expected to revert it. If the original committer doesn't revert it after a suitable period then someone else can revert it but that should be the exception rather than the rule and in all cases it should be preceded by an e-mail to the dev list *before* the commit is reverted. Mark > > 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=1627247&r1=1627246&r2=1627247&view=diff > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original) > +++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Wed Sep 24 > 07:59:57 2014 > @@ -35,7 +35,6 @@ import org.apache.catalina.LifecycleExce > import org.apache.catalina.LifecycleState; > import org.apache.catalina.Server; > import org.apache.catalina.security.SecurityConfig; > -import org.apache.catalina.util.ServerInfo; > import org.apache.juli.ClassLoaderLogManager; > import org.apache.tomcat.util.ExceptionUtils; > import org.apache.tomcat.util.digester.Digester; > @@ -124,7 +123,6 @@ public class Catalina { > > public Catalina() { > setSecurityProtection(); > - logInfo(); > } > > > @@ -786,26 +784,6 @@ public class Catalina { > } > > > - private void logInfo() { > - 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"))); > - } > - > - > // --------------------------------------- CatalinaShutdownHook Inner > Class > > // XXX Should be moved to embedded ! > > 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=1627247&r1=1627246&r2=1627247&view=diff > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties > (original) > +++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Wed > Sep 24 07:59:57 2014 > @@ -15,14 +15,6 @@ > > 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=1627247&r1=1627246&r2=1627247&view=diff > ============================================================================== > --- tomcat/trunk/webapps/docs/changelog.xml (original) > +++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 24 07:59:57 2014 > @@ -64,10 +64,6 @@ > correctly handle these cookies. (markt) > </fix> > <add> > - <bug>56401</bug>: Log version information when Tomcat starts. > - (markt/kkolinko) > - </add> > - <add> > <bug>56530</bug>: Add a web application class loader implementation > that > supports the parallel loading of web application classes. (markt) > </add> > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
