This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6fc36ede1ed444b63f17ed973eec77e771709955
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 5 19:49:36 2020 +0100
Fix alphabetical order
---
java/org/apache/catalina/session/LocalStrings.properties | 2 +-
java/org/apache/catalina/startup/LocalStrings.properties | 2 +-
java/org/apache/catalina/valves/LocalStrings.properties | 4 ++--
java/org/apache/tomcat/util/net/LocalStrings.properties | 2 +-
4 files changed, 5 insertions(+), 5 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/startup/LocalStrings.properties
b/java/org/apache/catalina/startup/LocalStrings.properties
index 6d503e1..271ca31 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -70,9 +70,9 @@ contextConfig.jspFile.warning=WARNING: JSP file [{0}] must
start with a ''/'' in
contextConfig.missingRealm=No Realm has been configured to authenticate against
contextConfig.noAntiLocking=The value [{0}] configured for java.io.tmpdir does
not point to a valid directory. The antiResourceLocking setting for the web
application [{1}] will be ignored.
contextConfig.processAnnotationsDir.debug=Scanning directory for class files
with annotations [{0}]
+contextConfig.processAnnotationsInParallelFailure=Parallel execution failed
contextConfig.processAnnotationsJar.debug=Scanning jar file for class files
with annotations [{0}]
contextConfig.processAnnotationsWebDir.debug=Scanning web application
directory for class files with annotations [{0}]
-contextConfig.processAnnotationsInParallelFailure=Parallel execution failed
contextConfig.resourceJarFail=Failed to process JAR found at URL [{0}] for
static resources to be included in context with name [{1}]
contextConfig.role.auth=Security role name [{0}] used in an <auth-constraint>
without being defined in a <security-role>
contextConfig.role.link=Security role name [{0}] used in a <role-link> without
being defined in a <security-role>
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties
b/java/org/apache/catalina/valves/LocalStrings.properties
index 321d2be..eebf3cf 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -129,6 +129,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.
@@ -145,5 +147,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 e47c7ca..43b740c 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -163,8 +163,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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
