[tomcat] 01/02: Fix alphabetical order

[ma...@apache.org]

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 8b52655e760078a53f624e7fb885a24a09b95283
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 31 17:55:39 2021 +0000

    Fix alphabetical order
---
 java/org/apache/catalina/mbeans/LocalStrings.properties   | 2 +-
 java/org/apache/catalina/security/LocalStrings.properties | 4 ++--
 java/org/apache/coyote/http2/LocalStrings.properties      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/mbeans/LocalStrings.properties b/java/org/apache/catalina/mbeans/LocalStrings.properties
index 529a941..fb63a26 100644
--- a/java/org/apache/catalina/mbeans/LocalStrings.properties
+++ b/java/org/apache/catalina/mbeans/LocalStrings.properties
@@ -20,8 +20,8 @@ globalResources.createError.userDatabase=Cannot create UserDatabase MBean for re
 globalResources.createError.userDatabase.group=Cannot create Group MBean for group [{0}]
 globalResources.createError.userDatabase.role=Cannot create Role MBean for role [{0}]
 globalResources.createError.userDatabase.user=Cannot create User MBean for user [{0}]
-globalResources.notServer=This listener must only be nested within Server elements, but is in [{0}].
 globalResources.noNamingContext=No global naming context defined for server
+globalResources.notServer=This listener must only be nested within Server elements, but is in [{0}].
 globalResources.userDatabaseCreateError=Exception creating UserDatabase MBeans for [{0}]
 
 jmxRemoteLifecycleListener.createRegistryFailed=Unable to create the RMI registry for the [{0}] server using port [{1}]
diff --git a/java/org/apache/catalina/security/LocalStrings.properties b/java/org/apache/catalina/security/LocalStrings.properties
index 1c604fd..f1e1aa6 100644
--- a/java/org/apache/catalina/security/LocalStrings.properties
+++ b/java/org/apache/catalina/security/LocalStrings.properties
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-listener.notServer=This listener must only be nested within Server elements, but is in [{0}].
-
 SecurityListener.checkUmaskFail=Start attempted with umask setting of [{0}]. Running Tomcat without a umask at least as restrictive as [{1}] has been blocked by the Lifecycle listener org.apache.catalina.security.SecurityListener (usually configured in CATALINA_BASE/conf/server.xml)
 SecurityListener.checkUmaskNone=No umask setting was found in system property [{0}]. However, it appears Tomcat is running on a platform that supports umask. The system property is typically set in CATALINA_HOME/bin/catalina.sh. The Lifecycle listener org.apache.catalina.security.SecurityListener (usually configured in CATALINA_BASE/conf/server.xml) expects a umask at least as restrictive as [{1}]
 SecurityListener.checkUmaskParseFail=Failed to parse value [{0}] as a valid umask.
@@ -22,3 +20,5 @@ SecurityListener.checkUmaskSkip=Unable to determine umask. It appears Tomcat is
 SecurityListener.checkUserWarning=Start attempted while running as user [{0}]. Running Tomcat as this user has been blocked by the Lifecycle listener org.apache.catalina.security.SecurityListener (usually configured in CATALINA_BASE/conf/server.xml)
 
 SecurityUtil.doAsPrivilege=An exception occurs when running the PrivilegedExceptionAction block.
+
+listener.notServer=This listener must only be nested within Server elements, but is in [{0}].
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties b/java/org/apache/coyote/http2/LocalStrings.properties
index 999a8d6..6151d96 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-abstractStream.setConnectionAllocationRequested=Connection [{0}], Stream [{1}], connection allocation requested changed from [{2}] to [{3}]
 abstractStream.setConnectionAllocationMade=Connection [{0}], Stream [{1}], connection allocation made changed from [{2}] to [{3}]
+abstractStream.setConnectionAllocationRequested=Connection [{0}], Stream [{1}], connection allocation requested changed from [{2}] to [{3}]
 abstractStream.windowSizeDec=Connection [{0}], Stream [{1}], reduce flow control window by [{2}] to [{3}]
 abstractStream.windowSizeInc=Connection [{0}], Stream [{1}], increase flow control window by [{2}] to [{3}]
 abstractStream.windowSizeTooBig=Connection [{0}], Stream [{1}], increased window size by [{2}] to [{3}] which exceeded permitted maximum

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