(tomcat) branch 9.0.x updated: Fix ordering

[email protected]
Newsgroups gmane.comp.jakarta.tomcat.devel
Message-ID <178300027331.4063552.9317964496584528803@gitbox3-he-fi.apache.org>
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 59f72c7ea8 Fix ordering
59f72c7ea8 is described below

commit 59f72c7ea8c8da6f051cba61960d0d0aec9d5f30
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Jul 2 14:51:07 2026 +0100

    Fix ordering
---
 java/org/apache/catalina/realm/LocalStrings.properties          | 4 ++--
 java/org/apache/tomcat/util/net/openssl/LocalStrings.properties | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/realm/LocalStrings.properties b/java/org/apache/catalina/realm/LocalStrings.properties
index 617b4c538a..38d68a1003 100644
--- a/java/org/apache/catalina/realm/LocalStrings.properties
+++ b/java/org/apache/catalina/realm/LocalStrings.properties
@@ -36,9 +36,9 @@ dataSourceRealm.exception=Exception performing authentication
 dataSourceRealm.getPassword.exception=Exception retrieving password for [{0}]
 dataSourceRealm.getRoles.exception=Exception retrieving roles for [{0}]
 dataSourceRealm.noNamingContext=Cannot access the server to retrieve the naming context
-dataSourceRealm.noUserTable=No user table was specified
-dataSourceRealm.noUserNameCol=No column was specified for user names
 dataSourceRealm.noUserCredCol=No column was specified for user credentials
+dataSourceRealm.noUserNameCol=No column was specified for user names
+dataSourceRealm.noUserTable=No user table was specified
 dataSourceRealm.roleConfigMismatch=Role configuration is incomplete: both userRoleTable and roleNameCol must be specified together
 
 jaasCallback.username=Returned username [{0}]
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties b/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
index 04dedbbf71..4285396da5 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
@@ -56,6 +56,8 @@ openssl.nonJsseCertificate=The certificate [{0}] or its private key [{1}] could
 openssl.nonJsseChain=The certificate chain [{0}] was not specified or was not valid and JSSE requires a valid certificate chain so attempting to use OpenSSL directly
 openssl.trustManagerMissing=No trust manager found
 
+opensslImplementation.notAvailable=A suitable Tomcat Native implementation is not available
+
 opensslconf.applyCommand=OpenSSLConf applying command (name [{0}], value [{1}])
 opensslconf.applyFailed=Failure while applying OpenSSLConf to SSL context
 opensslconf.checkCommand=OpenSSLConf checking command (name [{0}], value [{1}])
@@ -65,6 +67,4 @@ opensslconf.finishFailed=OpenSSLConf finish failed with result [{0}]
 opensslconf.noCommandName=OpenSSLConf no command name - will be ignored (command value [{0}])
 opensslconf.resultCommand=OpenSSLConf command (name [{0}], value [{1}]) returned [{2}]
 
-opensslImplementation.notAvailable=A suitable Tomcat Native implementation is not available
-
 sessionContext.nullTicketKeys=Null keys
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.