[tomcat] 02/08: Alphabetical order

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 45e0275a90f9e5a6196b9416e17bfe8e637dc66a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 5 20:40:15 2020 +0100

    Alphabetical order
---
 java/org/apache/catalina/session/LocalStrings.properties | 2 +-
 java/org/apache/catalina/valves/LocalStrings.properties  | 4 ++--
 java/org/apache/tomcat/util/net/LocalStrings.properties  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/session/LocalStrings.properties b/java/org/apache/catalina/session/LocalStrings.properties
index dae4f68..7676cf4 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -20,12 +20,12 @@ JDBCStore.checkConnectionDBReOpenFail=The re-open on the database failed. The da
 JDBCStore.checkConnectionSQLException=A SQL exception occurred [{0}]
 JDBCStore.close=Exception closing database connection [{0}]
 JDBCStore.commitSQLException=SQLException committing connection before closing
+JDBCStore.connectError=Cannot connect to database [{0}]
 JDBCStore.loading=Loading Session [{0}] from database [{1}]
 JDBCStore.missingDataSourceName=No valid JNDI name was given.
 JDBCStore.removing=Removing Session [{0}] at database [{1}]
 JDBCStore.saving=Saving Session [{0}] to database [{1}]
 JDBCStore.wrongDataSource=Cannot open JNDI DataSource [{0}]
-JDBCStore.connectError=Cannot connect to database [{0}]
 
 fileStore.createFailed=Unable to create directory [{0}] for the storage of session data
 fileStore.deleteFailed=Unable to delete file [{0}] which is preventing the creation of the session storage location
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties b/java/org/apache/catalina/valves/LocalStrings.properties
index 32fe151..89fcb46 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -127,6 +127,8 @@ http.511.reason=Network Authentication Required
 jdbcAccessLogValve.close=Failed to close database
 jdbcAccessLogValve.exception=Exception performing insert access entry
 
+persistentValve.filter.failure=Unable to compile filter=[{0}]
+
 remoteCidrValve.invalid=Invalid configuration provided for [{0}]. See previous messages for details.
 remoteCidrValve.noRemoteIp=Client does not have an IP address. Request denied.
 
@@ -143,5 +145,3 @@ sslValve.invalidProvider=The SSL provider specified on the connector associated
 stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread [{0}] (id=[{3}]) was previously reported to be stuck but has completed. It was active for approximately [{1}] milliseconds.{2,choice,0#|0< There is/are still [{2}] thread(s) that are monitored by this Valve and may be stuck.}
 stuckThreadDetectionValve.notifyStuckThreadDetected=Thread [{0}] (id=[{6}]) has been active for [{1}] milliseconds (since [{2}]) to serve the same request for [{4}] and may be stuck (configured threshold for this StuckThreadDetectionValve is [{5}] seconds). There is/are [{3}] thread(s) in total that are monitored by this Valve and may be stuck.
 stuckThreadDetectionValve.notifyStuckThreadInterrupted=Thread [{0}] (id=[{5}]) has been interrupted because it was active for [{1}] milliseconds (since [{2}]) to serve the same request for [{3}] and was probably stuck (configured interruption threshold for this StuckThreadDetectionValve is [{4}] seconds).
-
-persistentValve.filter.failure=Unable to compile filter=[{0}]
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 4cfb76c..b6d7861 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -146,8 +146,8 @@ sslHostConfigCertificate.mismatch=The property [{0}] was set on the SSLHostConfi
 sslImplementation.cnfe=Unable to create SSLImplementation for class [{0}]
 
 sslUtilBase.active=The [{0}] that are active are : [{1}]
-sslUtilBase.alias_no_key_entry=Alias name [{0}] does not identify a key entry
 sslUtilBase.aliasIgnored=FIPS enabled so alias name [{0}] will be ignored. If there is more than one key in the key store, the key used will depend on the key store implementation
+sslUtilBase.alias_no_key_entry=Alias name [{0}] does not identify a key entry
 sslUtilBase.invalidTrustManagerClassName=The trustManagerClassName provided [{0}] does not implement javax.net.ssl.TrustManager
 sslUtilBase.keystore_load_failed=Failed to load keystore type [{0}] with path [{1}] due to [{2}]
 sslUtilBase.noCertFile=SSLHostConfig attribute certificateFile must be defined when using an SSL connector


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org