This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 916b57c521582af77f704fbec95be86fa0ae0937
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Dec 8 09:11:40 2020 +0000
Run through an export/import cycle to clean up
Fix alphabetical order
Remove unnecessary spaces
---
.../catalina/connector/LocalStrings.properties | 2 +-
.../catalina/startup/LocalStrings.properties | 2 +-
.../catalina/startup/LocalStrings_es.properties | 2 +-
.../catalina/startup/LocalStrings_fr.properties | 26 +++++++++++-----------
.../catalina/startup/LocalStrings_ko.properties | 26 +++++++++++-----------
.../apache/catalina/valves/LocalStrings.properties | 4 ++--
.../jasper/resources/LocalStrings.properties | 2 +-
.../apache/tomcat/util/net/LocalStrings.properties | 4 ++--
8 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings.properties
b/java/org/apache/catalina/connector/LocalStrings.properties
index 11aaf22..04dec93 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -29,8 +29,8 @@ coyoteConnector.parseBodyMethodNoTrace=TRACE method MUST NOT
include an entity (
coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed
coyoteConnector.protocolHandlerInitializationFailed=Protocol handler
initialization failed
coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler
instantiation failed
-coyoteConnector.protocolHandlerNoAprListener=The configured protocol [{0}]
requires the AprLifecycleListener which is not available
coyoteConnector.protocolHandlerNoAprLibrary=The configured protocol [{0}]
requires the APR/native library which is not available
+coyoteConnector.protocolHandlerNoAprListener=The configured protocol [{0}]
requires the AprLifecycleListener which is not available
coyoteConnector.protocolHandlerPauseFailed=Protocol handler pause failed
coyoteConnector.protocolHandlerResumeFailed=Protocol handler resume failed
coyoteConnector.protocolHandlerStartFailed=Protocol handler start failed
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/startup/LocalStrings_es.properties
b/java/org/apache/catalina/startup/LocalStrings_es.properties
index 5c68d8a..999926f 100644
--- a/java/org/apache/catalina/startup/LocalStrings_es.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_es.properties
@@ -112,7 +112,7 @@ versionLoggerListener.prop=System property:
{0} = {1}
versionLoggerListener.serverInfo.server.built=Server built:
{0}
versionLoggerListener.serverInfo.server.number=Número de versión de servidor:
{0}
versionLoggerListener.serverInfo.server.version=Nombre de la versión del
servidor: {0}
-versionLoggerListener.vm.vendor =Vededor JVM: {0}
+versionLoggerListener.vm.vendor=Vededor JVM: {0}
versionLoggerListener.vm.version=JVM Version: {0}
webAnnotationSet.invalidInjection=El método de inyección de anotación no es un
recurso válido
diff --git a/java/org/apache/catalina/startup/LocalStrings_fr.properties
b/java/org/apache/catalina/startup/LocalStrings_fr.properties
index ce17686..b3afed9 100644
--- a/java/org/apache/catalina/startup/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_fr.properties
@@ -165,19 +165,19 @@ userConfig.error=Erreur lors du déploiement de
l''application web pour l''utili
userConfig.start="UserConfig" : Traitement du "START"
userConfig.stop="UserConfig" : Traitement du "STOP"
-versionLoggerListener.arg =Argument de la ligne de
commande : {0}
-versionLoggerListener.catalina.base =CATALINA_BASE :
{0}
-versionLoggerListener.catalina.home =CATALINA_HOME :
{0}
-versionLoggerListener.env =Variable d''environnement :
{0} = {1}
-versionLoggerListener.java.home =Java Home :
{0}
-versionLoggerListener.os.arch =Architecture :
{0}
-versionLoggerListener.os.name =Nom de l''OS :
{0}
-versionLoggerListener.os.version =Version OS :
{0}
-versionLoggerListener.prop =Propriété système :
{0} = {1}
-versionLoggerListener.serverInfo.server.built =Serveur compilé :
{0}
-versionLoggerListener.serverInfo.server.number =Version du serveur :
{0}
+versionLoggerListener.arg=Argument de la ligne de commande : {0}
+versionLoggerListener.catalina.base=CATALINA_BASE : {0}
+versionLoggerListener.catalina.home=CATALINA_HOME : {0}
+versionLoggerListener.env=Variable d''environnement : {0} = {1}
+versionLoggerListener.java.home=Java Home : {0}
+versionLoggerListener.os.arch=Architecture : {0}
+versionLoggerListener.os.name=Nom de l''OS : {0}
+versionLoggerListener.os.version=Version OS : {0}
+versionLoggerListener.prop=Propriété système : {0} = {1}
+versionLoggerListener.serverInfo.server.built=Serveur compilé :
{0}
+versionLoggerListener.serverInfo.server.number=Version du serveur :
{0}
versionLoggerListener.serverInfo.server.version=Nom version serveur :
{0}
-versionLoggerListener.vm.vendor =Fournisseur de la JVM :
{0}
-versionLoggerListener.vm.version =Version JVM :
{0}
+versionLoggerListener.vm.vendor=Fournisseur de la JVM : {0}
+versionLoggerListener.vm.version=Version JVM : {0}
webAnnotationSet.invalidInjection=L'annotation d'injection de ressource de la
méthode est invalide
diff --git a/java/org/apache/catalina/startup/LocalStrings_ko.properties
b/java/org/apache/catalina/startup/LocalStrings_ko.properties
index 547ec5b..bd68886 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ko.properties
@@ -165,19 +165,19 @@ userConfig.error=사용자 [{0}]을(를) 위한 웹 애플리케이션을 배치
userConfig.start=UserConfig: START 처리 중
userConfig.stop=UserConfig: STOP 처리 중
-versionLoggerListener.arg =명령 행 아규먼트: {0}
-versionLoggerListener.catalina.base =CATALINA_BASE: {0}
-versionLoggerListener.catalina.home =CATALINA_HOME: {0}
-versionLoggerListener.env =환경 변수: {0} = {1}
-versionLoggerListener.java.home =자바 홈: {0}
-versionLoggerListener.os.arch =아키텍처: {0}
-versionLoggerListener.os.name =운영체제 이름: {0}
-versionLoggerListener.os.version =운영체제 버전: {0}
-versionLoggerListener.prop =시스템 프로퍼티: {0} = {1}
-versionLoggerListener.serverInfo.server.built =Server 빌드 시각: {0}
-versionLoggerListener.serverInfo.server.number =Server 버전 번호: {0}
+versionLoggerListener.arg=명령 행 아규먼트: {0}
+versionLoggerListener.catalina.base=CATALINA_BASE: {0}
+versionLoggerListener.catalina.home=CATALINA_HOME: {0}
+versionLoggerListener.env=환경 변수: {0} = {1}
+versionLoggerListener.java.home=자바 홈: {0}
+versionLoggerListener.os.arch=아키텍처: {0}
+versionLoggerListener.os.name=운영체제 이름: {0}
+versionLoggerListener.os.version=운영체제 버전: {0}
+versionLoggerListener.prop=시스템 프로퍼티: {0} = {1}
+versionLoggerListener.serverInfo.server.built=Server 빌드 시각: {0}
+versionLoggerListener.serverInfo.server.number=Server 버전 번호: {0}
versionLoggerListener.serverInfo.server.version=서버 버전 이름: {0}
-versionLoggerListener.vm.vendor =JVM 벤더: {0}
-versionLoggerListener.vm.version =JVM 버전: {0}
+versionLoggerListener.vm.vendor=JVM 벤더: {0}
+versionLoggerListener.vm.version=JVM 버전: {0}
webAnnotationSet.invalidInjection=유효하지 않은 메소드 리소스 injection annotation입니다.
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties
b/java/org/apache/catalina/valves/LocalStrings.properties
index 111dd4d..7dfd92e 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.noPort=Request does not contain a valid server port. Request
denied.
remoteCidrValve.noRemoteIp=Client does not have an IP address. Request denied.
@@ -148,5 +150,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/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index 9729a14..509d2ea 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -292,8 +292,8 @@ jsp.warning.mappedFile=Warning: Invalid value for the
initParam mappedFile. Will
jsp.warning.maxLoadedJsps=Warning: Invalid value for the initParam
maxLoadedJsps. Will use the default value of "-1"
jsp.warning.modificationTestInterval=Warning: Invalid value for the initParam
modificationTestInterval. Will use the default value of "4" seconds
jsp.warning.noJarScanner=Warning: No org.apache.tomcat.JarScanner set in
ServletContext. Falling back to default JarScanner implementation.
-jsp.warning.quoteAttributeEL=Warning: Invalid value for the initParam
quoteAttributeEL. Will use the default value of "false"
jsp.warning.poolTagsWithExtends=Warning: Invalid value for the initParam
poolTagsWithExtends. Will use the default value of "false"
+jsp.warning.quoteAttributeEL=Warning: Invalid value for the initParam
quoteAttributeEL. Will use the default value of "false"
jsp.warning.recompileOnFail=Warning: Invalid value for the initParam
recompileOnFail. Will use the default value of "false"
jsp.warning.strictGetProperty=Warning: Invalid value for the initParam
strictGetProperty. Will use the default value of "true"
jsp.warning.strictQuoteEscaping=Warning: Invalid value for the initParam
strictQuoteEscaping. Will use the default value of "true"
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index a6bb669..bcf697c 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-acceptor.stop.fail= The acceptor thread [{0}] did not stop cleanly
+acceptor.stop.fail=The acceptor thread [{0}] did not stop cleanly
acceptor.stop.interrupted=Interrupt was received while waiting for the
acceptor thread [{0}] to stop
channel.nio.interrupted=The current thread was interrupted
@@ -171,8 +171,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
