Author: remm
Date: Thu Nov 29 19:46:04 2018
New Revision: 1847747
URL: http://svn.apache.org/viewvc?rev=1847747&view=rev
Log:
i18n and cleanup
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1847747&r1=1847746&r2=1847747&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties [UTF-8]
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties [UTF-8]
Thu Nov 29 19:46:04 2018
@@ -209,6 +209,7 @@ standardContextValve.acknowledgeExceptio
standardEngine.jvmRouteFail=Failed to set Engine's jvmRoute attribute from
system property
standardEngine.notHost=Child of an Engine must be a Host
standardEngine.notParent=Engine cannot have a parent Container
+standardEngine.start=Starting Servlet engine: [{0}]
standardHost.clientAbort=Remote Client Aborted Request, IOException: [{0}]
standardHost.invalidErrorReportValveClass=Couldn''t load specified error
report valve class: [{0}]
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=1847747&r1=1847746&r2=1847747&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Thu Nov 29
19:46:04 2018
@@ -254,8 +254,9 @@ public class StandardEngine extends Cont
protected synchronized void startInternal() throws LifecycleException {
// Log our server identification information
- if(log.isInfoEnabled())
- log.info( "Starting Servlet Engine: " +
ServerInfo.getServerInfo());
+ if (log.isInfoEnabled()) {
+ log.info(sm.getString("standardEngine.start",
ServerInfo.getServerInfo()));
+ }
// Standard container startup
super.startInternal();
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=1847747&r1=1847746&r2=1847747&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Thu Nov 29
19:46:04 2018
@@ -626,7 +626,7 @@ public class Catalina {
}
if (getServer() == null) {
- log.fatal("Cannot start server. Server instance is not
configured.");
+ log.fatal(sm.getString("catalina.noServer"));
return;
}
@@ -647,7 +647,7 @@ public class Catalina {
long t2 = System.nanoTime();
if(log.isInfoEnabled()) {
- log.info("Server startup in " + ((t2 - t1) / 1000000) + " ms");
+ log.info(sm.getString("catalina.startup", ((t2 - t1) / 1000000)));
}
// Register shutdown hook
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=1847747&r1=1847746&r2=1847747&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] Thu Nov 29 19:46:04 2018
@@ -15,8 +15,10 @@
catalina.configFail=Unable to load server configuration from [{0}]
catalina.noCluster=Cluster RuleSet not found due to [{0}]. Cluster
configuration disabled.
+catalina.noServer=Cannot start server, server instance is not configured
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.startup=Server startup in [{0}] milliseconds
catalina.stopServer=No shutdown port configured. Shut down server through OS
signal. Server not shut down.
catalina.stopServer.connectException=Could not contact [{0}:{1}] (base port
[{2}] and offset [{3}]). Tomcat may not be running.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=1847747&r1=1847746&r2=1847747&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Thu Nov
29 19:46:04 2018
@@ -26,23 +26,11 @@ import java.util.NoSuchElementException;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-
/**
- *
* Thread safe non blocking selector pool
- * @version 1.0
- * @since 6.0
*/
-
public class NioSelectorPool {
- public NioSelectorPool() {
- }
-
- private static final Log log = LogFactory.getLog(NioSelectorPool.class);
-
protected static final boolean SHARED =
Boolean.parseBoolean(System.getProperty("org.apache.tomcat.util.net.NioSelectorShared",
"true"));
@@ -64,7 +52,6 @@ public class NioSelectorPool {
synchronized ( NioSelectorPool.class ) {
if ( SHARED_SELECTOR == null ) {
SHARED_SELECTOR = Selector.open();
- log.info("Using a shared selector for servlet write/read");
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
