[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tomcat-dev
Subject:    [tomcat] 01/02: Correct alphabetical order
From:       markt () apache ! org
Date:       2021-12-31 18:14:17
Message-ID: 20211231181416.B12C581FE7 () gitbox ! apache ! org
[Download RAW message or body]

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 e22c5237d823f10be1c418aa3ad46d8085934cbe
Author: Mark Thomas <markt@apache.org>
AuthorDate: Fri Dec 31 18:06:39 2021 +0000

    Correct alphabetical order
---
 java/org/apache/catalina/security/LocalStrings.properties | 4 ++--
 java/org/apache/coyote/http2/LocalStrings.properties      | 2 +-
 java/org/apache/tomcat/util/buf/LocalStrings.properties   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

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 b6e1347..eaaa9c2 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
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings.properties \
b/java/org/apache/tomcat/util/buf/LocalStrings.properties index 0f14806..d7eace5 \
                100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings.properties
@@ -20,10 +20,10 @@ b2cConverter.unknownEncoding=The character encoding [{0}] is not \
supported  
 byteBufferUtils.cleaner=Cannot use direct ByteBuffer cleaner, memory leaking may \
occur  
-chunk.overflow=Buffer overflow and no sink is set, limit [{0}] and buffer length \
                [{1}]
-
 c2bConverter.recycleFailed=Failed to recycle the C2B Converter. Creating new \
BufferedWriter, WriteConvertor and IntermediateOutputStream.  
+chunk.overflow=Buffer overflow and no sink is set, limit [{0}] and buffer length \
[{1}] +
 encodedSolidusHandling.invalid=The value [{0}] is not recognised
 
 hexUtils.fromHex.nonHex=The input must consist only of hex digits

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


[prev in list] [next in list] [prev in thread] [next in thread]