You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/02/02 16:57:20 UTC
[tomcat] 01/02: Reformat to simplify back-porting updates
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7bb93e75259bea1e80dc8264b8a8e842af67f40d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 2 16:23:35 2023 +0000
Reformat to simplify back-porting updates
---
java/jakarta/servlet/jsp/LocalStrings.properties | 2 +-
.../apache/catalina/core/LocalStrings.properties | 2 +-
.../catalina/security/LocalStrings.properties | 4 +-
.../apache/catalina/valves/LocalStrings.properties | 2 -
java/org/apache/el/LocalStrings.properties | 66 ++++++++--------------
.../tomcat/websocket/LocalStrings.properties | 22 ++------
6 files changed, 32 insertions(+), 66 deletions(-)
diff --git a/java/jakarta/servlet/jsp/LocalStrings.properties b/java/jakarta/servlet/jsp/LocalStrings.properties
index 2b34d2c499..081f2fab14 100644
--- a/java/jakarta/servlet/jsp/LocalStrings.properties
+++ b/java/jakarta/servlet/jsp/LocalStrings.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-el.unknown.identifier=Unknown identifier
\ No newline at end of file
+el.unknown.identifier=Unknown identifier
diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties
index 242259f157..944e236726 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -68,13 +68,13 @@ applicationServletRegistration.setServletSecurity.ise=Security constraints can''
applicationSessionCookieConfig.ise=Property [{0}] cannot be added to SessionCookieConfig for context [{1}] as the context has been initialised
+aprListener.FIPSProviderNotDefault=The FIPS provider must be configured as the default provider when the AprLifecycleListener is configured with FIPS mode [{0}]
aprListener.aprDestroy=Failed shutdown of the Apache Tomcat Native library
aprListener.aprInit=The Apache Tomcat Native library which allows using OpenSSL was not found on the java.library.path: [{0}]
aprListener.aprInitDebug=The Apache Tomcat Native library could not be found using names [{0}] on the java.library.path [{1}]. The errors reported were [{2}]
aprListener.aprInitError=The Apache Tomcat Native library failed to load. The error reported was [{0}]
aprListener.currentFIPSMode=Current FIPS mode: [{0}]
aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force entering FIPS mode, but library is already in FIPS mode [{0}]
-aprListener.FIPSProviderNotDefault=The FIPS provider must be configured as the default provider when the AprLifecycleListener is configured with FIPS mode [{0}]
aprListener.initializeFIPSFailed=Failed to enter FIPS mode
aprListener.initializeFIPSSuccess=Successfully entered FIPS mode
aprListener.initializedOpenSSL=OpenSSL successfully initialized [{0}]
diff --git a/java/org/apache/catalina/security/LocalStrings.properties b/java/org/apache/catalina/security/LocalStrings.properties
index 1c604fd388..f1e1aa689c 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/catalina/valves/LocalStrings.properties b/java/org/apache/catalina/valves/LocalStrings.properties
index 2f3a68e485..a1441664b9 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -26,8 +26,6 @@ accessLogValve.rotateFail=Failed to rotate access log
accessLogValve.unsupportedEncoding=Failed to set encoding to [{0}], will use the system default character set.
accessLogValve.writeFail=Failed to write log message [{0}]
-# Default error page should not have '[' ']' symbols around substituted text fragments.
-# https://bz.apache.org/bugzilla/show_bug.cgi?id=61134
errorReportValve.description=Description
errorReportValve.errorPageIOException=Unable to display error page at [{0}] due to an exception
errorReportValve.errorPageNotFound=Unable to find a static error page at [{0}]
diff --git a/java/org/apache/el/LocalStrings.properties b/java/org/apache/el/LocalStrings.properties
index 3ee497d7ca..57e0d01261 100644
--- a/java/org/apache/el/LocalStrings.properties
+++ b/java/org/apache/el/LocalStrings.properties
@@ -15,60 +15,42 @@
elSupport.coerce.nonAbstract=Unable to coerce a LambdaExpression to the functional interface [{0}] because the method [{1}] is not abstract
-# General Errors
error.cannotSetVariables=Cannot set variables on factory
-error.convert=Cannot convert [{0}] of type [{1}] to [{2}]
error.compare=Cannot compare [{0}] to [{1}]
+error.context.null=ELContext was null
+error.convert=Cannot convert [{0}] of type [{1}] to [{2}]
+error.fnMapper.method=Function [{0}] not found
+error.fnMapper.null=Expression uses functions, but no FunctionMapper was provided
+error.fnMapper.paramcount=Function [{0}] specifies [{1}] params, but [{2}] were declared
error.function=Problems calling function [{0}]
+error.function.tooManyMethodParameterSets=There are multiple sets of parameters specified for function [{0}]
+error.identifier.noMethod=Identity [{0}] was null and was unable to invoke
+error.identifier.notMethodExpression=Identity [{0}] does not reference a method expression instance, returned type [{1}]
+error.identifier.notjava=The identifier [{0}] is not a valid Java identifier as required by section 1.19 of the EL specification (Identifier ::= Java language identifier). This check can be disabled by setting the system property org.apache.el.parser.SKIP_IDENTIFIER_CHECK to true.
error.invalidMethodExpression=Not a valid method expression [{0}]
+error.invoke.tooFewParams=The method [{0}] was called with [{1}] parameter(s) when it expected at least [{2}]
+error.invoke.wrongParams=The method [{0}] was called with [{1}] parameter(s) when it expected [{2}]
+error.lambda.tooManyMethodParameterSets=There are more sets of method parameters specified than there are nested lambda expressions
+error.lambda.wrongNestedState=Nested state may only be set once
+error.method=Not a valid MethodExpression : [{0}]
+error.method.ambiguous=Unable to find unambiguous method: {0}.{1}({2})
+error.method.notfound=Method not found: {0}.{1}({2})
+error.method.nullParms=Parameter types cannot be null
+error.mixed=Expression cannot contain both ''#{...}'' and ''${...}'' : [{0}]
error.noFunctionMapperTarget=FunctionMapper target cannot be null
error.noVariableMapperTarget=VariableMapper target cannot be null
+error.null=Expression cannot be null
error.nullLocalName=Local name cannot be null
error.nullMethod=Method cannot be null
-error.unreachable.base=Target Unreachable, identifier [{0}] resolved to null
-error.unreachable.property=Target Unreachable, [{0}] returned null
+error.parseFail=Failed to parse the expression [{0}]
error.resolver.unhandled=ELResolver did not handle type: [{0}] with property of [{1}]
error.resolver.unhandled.null=ELResolver cannot handle a null base Object with identifier [{0}]
-error.invoke.wrongParams=The method [{0}] was called with [{1}] parameter(s) when it expected [{2}]
-error.invoke.tooFewParams=The method [{0}] was called with [{1}] parameter(s) when it expected at least [{2}]
-
-# ValueExpressionLiteral
-error.value.literal.write=ValueExpression is a literal and not writable: [{0}]
-
-# ExpressionFactoryImpl
-error.null=Expression cannot be null
-error.mixed=Expression cannot contain both ''#{...}'' and ''${...}'' : [{0}]
-error.method=Not a valid MethodExpression : [{0}]
-error.method.nullParms=Parameter types cannot be null
-error.value.expectedType=Expected type cannot be null
-
-# ExpressionBuilder
-error.parseFail=Failed to parse the expression [{0}]
-
-# ValueSetVisitor
error.syntax.set=Illegal Syntax for Set Operation
+error.unreachable.base=Target Unreachable, identifier [{0}] resolved to null
+error.unreachable.property=Target Unreachable, [{0}] returned null
+error.value.expectedType=Expected type cannot be null
+error.value.literal.write=ValueExpression is a literal and not writable: [{0}]
-# ReflectionUtil
-error.method.notfound=Method not found: {0}.{1}({2})
-error.method.ambiguous=Unable to find unambiguous method: {0}.{1}({2})
-
-# ValidatingVisitor
-error.fnMapper.null=Expression uses functions, but no FunctionMapper was provided
-error.fnMapper.method=Function [{0}] not found
-error.fnMapper.paramcount=Function [{0}] specifies [{1}] params, but [{2}] were declared
-
-# ExpressionImpl
-error.context.null=ELContext was null
-
-# Parser
-error.function.tooManyMethodParameterSets=There are multiple sets of parameters specified for function [{0}]
-error.identifier.noMethod=Identity [{0}] was null and was unable to invoke
-error.identifier.notjava=The identifier [{0}] is not a valid Java identifier as required by section 1.19 of the EL specification (Identifier ::= Java language identifier). This check can be disabled by setting the system property org.apache.el.parser.SKIP_IDENTIFIER_CHECK to true.
-error.identifier.notMethodExpression=Identity [{0}] does not reference a method expression instance, returned type [{1}]
-error.lambda.tooManyMethodParameterSets=There are more sets of method parameters specified than there are nested lambda expressions
-error.lambda.wrongNestedState=Nested state may only be set once
-
-# Stream
stream.compare.notComparable=Stream elements must implement Comparable
stream.optional.empty=It is illegal to call get() on an empty optional
stream.optional.paramNotLambda=The parameter for the method [{0}] should be a lambda expression
diff --git a/java/org/apache/tomcat/websocket/LocalStrings.properties b/java/org/apache/tomcat/websocket/LocalStrings.properties
index 41b1e1efa2..2727d0ee02 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings.properties
@@ -54,10 +54,6 @@ util.invalidType=Unable to coerce value [{0}] to type [{1}]. That type is not su
util.notToken=An illegal extension parameter was specified with name [{0}] and value [{1}]
util.unknownDecoderType=The Decoder type [{0}] is not recognized
-# Note the wsFrame.* messages are used as close reasons in WebSocket control
-# frames and therefore must be 123 bytes (not characters) or less in length.
-# Messages are encoded using UTF-8 where a single character may be encoded in
-# as many as 4 bytes.
wsFrame.alreadyResumed=Message receiving has already been resumed.
wsFrame.alreadySuspended=Message receiving has already been suspended.
wsFrame.bufferTooSmall=No async message support and buffer too small. Buffer size: [{0}], Message size: [{1}]
@@ -105,14 +101,6 @@ wsRemoteEndpoint.tooMuchData=Ping or pong may not send more than 125 bytes
wsRemoteEndpoint.writeTimeout=Blocking write timeout
wsRemoteEndpoint.wrongState=The remote endpoint was in state [{0}] which is an invalid state for called method
-# Note the following messages are used as a close reason in a WebSocket control
-# frame and therefore must be 123 bytes (not characters) or less in length.
-# Messages are encoded using UTF-8 where a single character may be encoded in
-# as many as 4 bytes.
-wsSession.timeout=The WebSocket session [{0}] idle timeout expired
-wsSession.timeoutRead=The WebSocket session [{0}] read idle timeout expired
-wsSession.timeoutWrite=The WebSocket session [{0}] write idle timeout expired
-
wsSession.closed=The WebSocket session [{0}] has been closed and no method (apart from close()) may be called on a closed session
wsSession.created=Created WebSocket session [{0}]
wsSession.doClose=Closing WebSocket session [{0}]
@@ -126,15 +114,12 @@ wsSession.invalidHandlerTypePong=A pong message handler must implement MessageHa
wsSession.messageFailed=Unable to write the complete message as the WebSocket connection has been closed
wsSession.removeHandlerFailed=Unable to remove the handler [{0}] as it was not registered with this session
wsSession.sendCloseFail=Failed to send close message for session [{0}] to remote endpoint
+wsSession.timeout=The WebSocket session [{0}] idle timeout expired
+wsSession.timeoutRead=The WebSocket session [{0}] read idle timeout expired
+wsSession.timeoutWrite=The WebSocket session [{0}] write idle timeout expired
wsSession.unknownHandler=Unable to add the message handler [{0}] as it was for the unrecognised type [{1}]
wsSession.unknownHandlerType=Unable to add the message handler [{0}] as it was wrapped as the unrecognised type [{1}]
-# Note the following message is used as a close reason in a WebSocket control
-# frame and therefore must be 123 bytes (not characters) or less in length.
-# Messages are encoded using UTF-8 where a single character may be encoded in
-# as many as 4 bytes.
-wsWebSocketContainer.shutdown=The web application is stopping
-
wsWebSocketContainer.asynchronousSocketChannelFail=Unable to open a connection to the server
wsWebSocketContainer.connect.entry=Connecting endpoint instance of type [{0}] to [{1}]
wsWebSocketContainer.connect.write=Writing the HTTP upgrade request from buffer starting at [{0}] with a limit of [{1}] from local address [{2}]
@@ -155,5 +140,6 @@ wsWebSocketContainer.proxyConnectFail=Failed to connect to the configured Proxy
wsWebSocketContainer.redirectThreshold=Cyclic Location header [{0}] detected / reached max number of redirects [{1}] of max [{2}]
wsWebSocketContainer.responseFail=The HTTP upgrade to WebSocket failed but partial data may have been received: Status Code [{0}], HTTP headers [{1}]
wsWebSocketContainer.sessionCloseFail=Session with ID [{0}] did not close cleanly
+wsWebSocketContainer.shutdown=The web application is stopping
wsWebSocketContainer.sslEngineFail=Unable to create SSLEngine to support SSL/TLS connections
wsWebSocketContainer.unsupportedAuthScheme=Failed to handle HTTP response code [{0}]. Unsupported Authentication scheme [{1}] returned in response
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org