[tomcat] branch master updated (b7d59b2 -> 916b57c)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from b7d59b2 Add empty ApplicationBufferHandler for completeness new 066f8c2 Correct comment new 916b57c Run through an export/import cycle to clean up The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../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/buildutil/translate/Import.java | 2 +- .../apache/tomcat/util/net/LocalStrings.properties | 4 ++-- 9 files changed, 35 insertions(+), 35 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Correct comment
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 066f8c29283f209b062f8c28abe18995d415c0fe
Author: Mark Thomas
AuthorDate: Tue Dec 8 09:08:08 2020 +
Correct comment
---
java/org/apache/tomcat/buildutil/translate/Import.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java
b/java/org/apache/tomcat/buildutil/translate/Import.java
index f15ec4c..ae40353 100644
--- a/java/org/apache/tomcat/buildutil/translate/Import.java
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -45,7 +45,7 @@ public class Import {
// Skip the original
if (language.length() == 0) {
-// Comment this line out if the originals needs to be exported.
+// Comment this line out if the originals need to be imported.
return;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Run through an export/import cycle to clean up
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
AuthorDate: Tue Dec 8 09:11:40 2020 +
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
without being defined in a
contextConfig.role.link=Security role name [{0}] used in a without
being defined in a
diff --git a/java/org/apache/catalina/startup/LocalStrings_es.properties
b/java/org/apache/catalina/startup/LocalStrings_es.properties
index 5c68d8a..26f 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 @
[tomcat] branch master updated: Fix escaping
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
The following commit(s) were added to refs/heads/master by this push:
new 19ac293 Fix escaping
19ac293 is described below
commit 19ac2930d4ed4948683ffbee600d9506363e44e9
Author: Mark Thomas
AuthorDate: Tue Dec 8 09:18:21 2020 +
Fix escaping
---
java/org/apache/jasper/resources/LocalStrings.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index 509d2ea..cf79400 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -76,7 +76,7 @@ jsp.error.file.already.registered=Recursive include of file
[{0}]
jsp.error.file.cannot.read=Cannot read file: [{0}]
jsp.error.file.not.found=JSP file [{0}] not found
jsp.error.flush=Exception occurred when flushing data
-jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type'
attributes. If 'fragment' is present, 'type' is fixed as '{0}'
+jsp.error.fragmentwithtype=Cannot specify both ''fragment'' and ''type''
attributes. If ''fragment'' is present, ''type'' is fixed as ''{0}''
jsp.error.function.classnotfound=The class [{0}] specified in TLD for the
function [{1}] cannot be found: [{2}]
jsp.error.include.exception=Unable to include [{0}]
jsp.error.include.tag=Invalid jsp:include tag
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Updates to POEditor.com
All, As you are probably aware, the Apache Tomcat project uses POEditor.com to manage the i18n translations used by the project. The POEditor team have implemented a change that means it is no longer necessary for us to escape single quotes when using them in translated strings. The appropriate escaping is now added automatically when the strings are exported. The current translations have been updated to reflect this. We have seen an immediate benefit of this change. I am currently in the middle of re-exporting the translations from POEditor.coma and importing them into the Tomcat source code to confirm that POEDitor's automatic update didn't break anything. So far I have found no errors and a handful of instances where we were not escaping correctly that have been automatically corrected. Remember, anyone can create a POEditor.com account and start helping with the translations. https://poeditor.com/projects/view?id=221603 Thanks, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/06: Remove unnecessary space
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 a956bd9e0c1d4b4a099e597dabbc84e3f3fd32a2
Author: Mark Thomas
AuthorDate: Tue Dec 8 09:30:44 2020 +
Remove unnecessary space
---
java/org/apache/catalina/filters/LocalStrings_cs.properties | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/filters/LocalStrings_cs.properties
b/java/org/apache/catalina/filters/LocalStrings_cs.properties
index b44fa04..1eb63cd 100644
--- a/java/org/apache/catalina/filters/LocalStrings_cs.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_cs.properties
@@ -17,8 +17,7 @@ corsFilter.invalidPreflightMaxAge=Nelze načíst preflightMaxAge
csrfPrevention.invalidRandomClass=Nelze vytvořit zdroj Random pomocí třídy
[{0}]
-expiresFilter.noExpirationConfigured=\n\
-Dotaz [{0}] se statusem odpovědi [{1}] content-type [{2}], bez vypršení
nakonfigurován
+expiresFilter.noExpirationConfigured=Dotaz [{0}] se statusem odpovědi [{1}]
content-type [{2}], bez vypršení nakonfigurován
expiresFilter.noExpirationConfiguredForContentType=Nebyla nalezena konfigurace
Expires pro content-type [{0}]
expiresFilter.startingPointInvalid=Neplatný počáteční bod
(access|now|modification|a|m) [{0}] v předpisu [{1}]
expiresFilter.unsupportedStartingPoint=Nepodporovaný startingPoint [{0}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (19ac293 -> b8d71d5)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 19ac293 Fix escaping new a956bd9 Remove unnecessary space new 2e15b49 Remove unnecessary new lines new fbfca20 Fix escaping new 8e8a5c3 Correct escaping new eb4532d Improve French translations (remm) new b8d71d5 Fix escaping The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/catalina/deploy/LocalStrings_fr.properties | 2 +- .../apache/catalina/filters/LocalStrings_cs.properties| 3 +-- .../org/apache/catalina/ha/tcp/LocalStrings_fr.properties | 2 +- java/org/apache/catalina/realm/LocalStrings_fr.properties | 2 +- .../apache/catalina/security/LocalStrings_fr.properties | 4 ++-- .../apache/catalina/startup/LocalStrings_fr.properties| 2 +- .../catalina/tribes/membership/LocalStrings_fr.properties | 2 +- java/org/apache/coyote/http11/LocalStrings_fr.properties | 2 ++ java/org/apache/coyote/http2/LocalStrings_es.properties | 3 +-- java/org/apache/coyote/http2/LocalStrings_fr.properties | 4 +++- .../apache/jasper/resources/LocalStrings_es.properties| 2 +- .../apache/jasper/resources/LocalStrings_fr.properties| 15 +-- .../apache/jasper/resources/LocalStrings_ja.properties| 11 +++ .../org/apache/tomcat/util/net/LocalStrings_es.properties | 3 +-- .../org/apache/tomcat/util/net/LocalStrings_fr.properties | 7 +++ webapps/docs/changelog.xml| 7 +++ 16 files changed, 46 insertions(+), 25 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/06: Remove unnecessary new lines
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 2e15b497f3de8aec888e76ed52e33cbcc4bb828f
Author: Mark Thomas
AuthorDate: Tue Dec 8 09:33:08 2020 +
Remove unnecessary new lines
---
java/org/apache/coyote/http2/LocalStrings_es.properties| 3 +--
java/org/apache/tomcat/util/net/LocalStrings_es.properties | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings_es.properties
b/java/org/apache/coyote/http2/LocalStrings_es.properties
index df04f64..acd5243 100644
--- a/java/org/apache/coyote/http2/LocalStrings_es.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_es.properties
@@ -13,8 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-abstractStream.windowSizeInc=\n\
-Conexión [{0}], Flujo [{1}], aumente el control de flujo de la ventana en
[{2}] para [{3}]\n
+abstractStream.windowSizeInc=Conexión [{0}], Flujo [{1}], aumente el control
de flujo de la ventana en [{2}] para [{3}]\n
connectionPrefaceParser.mismatch=Una sequencia de byte no esperada fue
recibida al inicio del prefacio de cliente [{0}]
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_es.properties
b/java/org/apache/tomcat/util/net/LocalStrings_es.properties
index 1efc227..54493f3 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_es.properties
@@ -35,8 +35,7 @@ endpoint.err.unexpected=Error inesperado al procesar conector
endpoint.init.bind=Ligado de conector falló: [{0}] [{1}]
endpoint.init.listen=Escucha de conector falló: [{0}] [{1}]
endpoint.init.notavail=APR no disponible
-endpoint.invalidJmxNameSslHostCert=\n\
-Imposible generar un nombre de objeto JMX válido para el
SSLHostConfigCertificate asociado con el servidor [{0}] y el tipo de
certificado [{1}]\n
+endpoint.invalidJmxNameSslHostCert=Imposible generar un nombre de objeto JMX
válido para el SSLHostConfigCertificate asociado con el servidor [{0}] y el
tipo de certificado [{1}]\n
endpoint.jsse.noSslContext=No se encontró ningún conexto SSLContext para el
hostname [{0}]\n
endpoint.nio.stopLatchAwaitInterrupted=Este hilo fue interrumpido mientras
esperaba porque los encuestadores se detuvieran
endpoint.noSslHostConfig=No se encontró elemento SSLHostConfig con nombre de
máquina [{0}] para machear el defaultSSLHostConfigName para el conector [{1}]\n
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/06: Fix escaping
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 fbfca2049afc41544bac2e12c8e26d6bb1027e7d
Author: Mark Thomas
AuthorDate: Tue Dec 8 09:33:16 2020 +
Fix escaping
---
java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 1ee32f3..fe27ecf 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -69,7 +69,7 @@ jsp.error.file.already.registered=El archivo [{0}] ya se ha
visto, ¿podría ser
jsp.error.file.cannot.read=No se puede leer el archivo: [{0}]
jsp.error.file.not.found=Archivo JSP [{0}] no encontrado
jsp.error.flush=Excepción sucedida al vaciar los datos
-jsp.error.fragmentwithtype=No puede especificar ambos atributos 'fragment' y
'type'. Si está presente 'fragment', 'type' se pone como '{0}'
+jsp.error.fragmentwithtype=No puede especificar ambos atributos ''fragment'' y
''type''. Si está presente ''fragment'', ''type'' se pone como ''{0}''
jsp.error.function.classnotfound=La clase [{0}] especificada en el TLD para la
función [{1}] no se puede hallar: [{2}]
jsp.error.include.exception=No se puede incluir [{0}]
jsp.error.include.tag=Tag jsp:include no válido
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/06: Improve French translations (remm)
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 eb4532d714d092372fe50a59ae52cac138c26f99
Author: Mark Thomas
AuthorDate: Tue Dec 8 09:42:27 2020 +
Improve French translations (remm)
---
java/org/apache/coyote/http11/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/http2/LocalStrings_fr.properties| 2 ++
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 7 +++
webapps/docs/changelog.xml | 7 +++
4 files changed, 18 insertions(+)
diff --git a/java/org/apache/coyote/http11/LocalStrings_fr.properties
b/java/org/apache/coyote/http11/LocalStrings_fr.properties
index d7938b8..5293856 100644
--- a/java/org/apache/coyote/http11/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_fr.properties
@@ -16,6 +16,8 @@
abstractHttp11Protocol.alpnConfigured=Le connecteur [{0}] a été configuré pour
supporter la négociation de [{1}] avec ALPN
abstractHttp11Protocol.alpnWithNoAlpn=Le gestionnaire de mise à niveau [{0}]
pour [{1}] ne supporte qu''une mise à niveau via ALPN mais il a été configuré
pour le connecteur [{2}] qui ne supporte pas ALPN
abstractHttp11Protocol.httpUpgradeConfigured=Le connecteur [{0}] a été
configuré pour supporter la mise à niveau de HTTP vers [{1}]
+abstractHttp11Protocol.upgradeJmxNameFail=Impossible de créer l'ObjectName
pour l'enregistrement JMX du protocole d'upgrade
+abstractHttp11Protocol.upgradeJmxRegistrationFail=Impossible d'enregistrer le
protocole d'upgrade dans JMX
http11processor.fallToDebug=\ Note : les occurrences suivantes d'erreurs
d'analyse de requête HTTP seront enregistrées au niveau DEBUG.
http11processor.header.parse=Erreur lors de l'analyse d'un en-tête de requête
HTTP
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 7ae1ea3..faa29f9 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -72,6 +72,8 @@ http2Parser.processFrameWindowUpdate.debug=Connection [{0}],
Flux [{1}], Incrém
http2Parser.processFrameWindowUpdate.invalidIncrement=La trame de mise à jour
de la fenêtre a été reçue avec un incrément invalide [{0}]
http2Parser.swallow.debug=Connection [{0}], Flux [{1}], Avalé [{2}] octets
+http2Protocol.jmxRegistration.fail=L'enregistrement dans JMX du protocole
HTTP/2 a échoué
+
pingManager.roundTripTime=Connection [{0}] Le temps d''aller retour est de
[{1}]ns
stream.clientCancel=Le client a réinitialisé la stream avant que la réponse ne
soit complète
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index f02cc4d..ad2f072 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -13,6 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+acceptor.stop.fail=Le thread [{0}] de l''accepteur ne s''est pas arrêté
proprement
+acceptor.stop.interrupted=Une interruption s''est produite lors de l''attente
de l''arrêt du thread [{0}] de l''accepteur
+
channel.nio.interrupted=Le thread en cours a été interrompu
channel.nio.ssl.appInputNotEmpty=Le tampon d'entrée de l'application contient
toujours des données, des données ont été perdues
channel.nio.ssl.appOutputNotEmpty=Le tampon de sortie de l'application
contient toujours des données, des données ont été perdues
@@ -93,6 +96,7 @@ endpoint.launch.fail=Impossible de démarrer le nouvel
exécutable
endpoint.nio.keyProcessingError=Erreur lors du traitement de la clé de
sélection
endpoint.nio.latchMustBeZero=Le compte du latch doit être à zéro ou null
endpoint.nio.nullLatch=Le latch ne peut être null
+endpoint.nio.nullSocketChannel=Le canal du socket est invalide car null lors
du traitement de l'évênement du poller
endpoint.nio.pollerEventError=Erreur lors du traitement de l'évènement du
poller
endpoint.nio.registerFail=Echec d'enregistrement du socket avec le sélecteur
du poller
endpoint.nio.selectorCloseFail=Impossible de fermer le sélecteur lors de la
fermeture du poller
@@ -150,6 +154,9 @@ socket.apr.write.error=Erreur inattendue [{0}] lors de
l''écriture de données
socket.closed=Le socket associé à cette connection a été fermé
socket.sslreneg=Exception lors de la renégociation de la connection SSL
+socketWrapper.readTimeout=Timeout en lecture
+socketWrapper.writeTimeout=Timeout en écriture
+
sslHostConfig.certificate.notype=Plusieurs certificats ont été spécifiés et au
moins un n'a pas d'attribut type
sslHostConfig.certificateVerificationInvalid=La valeur de vérification de
certificat [{0}] n''est pas reconnue
sslHostConfig.fileNotFound=Le fichier [{0}] configuré n''exi
[tomcat] 06/06: Fix escaping
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 b8d71d547aa865f05846f02461adb977b878f644
Author: Mark Thomas
AuthorDate: Tue Dec 8 09:50:17 2020 +
Fix escaping
---
java/org/apache/jasper/resources/LocalStrings_ja.properties | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties
b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index 93e99c2..cd75e42 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -77,7 +77,7 @@ jsp.error.file.already.registered=ファイル [{0}] の再帰的な取り込み
jsp.error.file.cannot.read=ファイルが読めません: [{0}]
jsp.error.file.not.found=JSP ファイル [{0}] が見つかりません
jsp.error.flush=データをフラッシュする際に例外が発生しました。
-jsp.error.fragmentwithtype='fragment'属性と'type'属性を両方指定できません。'fragment'が存在する場合には'type'は'{0}'に固定されます
+jsp.error.fragmentwithtype=''fragment''属性と''type''属性を両方指定できません。''fragment''が存在する場合には''type''は''{0}''に固定されます
jsp.error.function.classnotfound=TLDの中で関数 [{1}] に指定されているクラス [{0}] が見つかりません:
[{2}]
jsp.error.include.exception=[{0}] を include 出来ません
jsp.error.include.tag=無効なjsp:includeタグです
@@ -357,7 +357,8 @@ JSPファイルの場所は次のオプションで指定するか、\n\
\-source Set the -source argument to the compiler (default
1.8)\n\
\-target Set the -target argument to the compiler (default
1.8)\n
jspc.warning.tldInWebInfLib=TLDファイルは/ WEB-INF/libに置かないでください。
-jspc.webfrg.footer=\n\
+jspc.webfrg.footer=\n\
+\n\
\n
jspc.webfrg.header=\n\
http://xmlns.jcp.org/xml/ns/javaee"\n\
@@ -378,14 +379,16 @@ jspc.webinc.footer=\n\
\n\
\n
-jspc.webinc.header=\n\
\n\
\n
jspc.webinc.insertEnd=
jspc.webinc.insertStart=
-jspc.webxml.footer=\n\
+jspc.webxml.footer=\n\
+\n\
\n
jspc.webxml.header=\n\
http://xmlns.jcp.org/xml/ns/javaee"\n\
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/06: Correct escaping
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 8e8a5c3d0b823acb9617f01c44c085b79ed41be5
Author: Mark Thomas
AuthorDate: Tue Dec 8 09:39:42 2020 +
Correct escaping
---
.../org/apache/catalina/deploy/LocalStrings_fr.properties | 2 +-
.../org/apache/catalina/ha/tcp/LocalStrings_fr.properties | 2 +-
java/org/apache/catalina/realm/LocalStrings_fr.properties | 2 +-
.../apache/catalina/security/LocalStrings_fr.properties | 4 ++--
.../apache/catalina/startup/LocalStrings_fr.properties| 2 +-
.../catalina/tribes/membership/LocalStrings_fr.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_fr.properties | 2 +-
.../apache/jasper/resources/LocalStrings_fr.properties| 15 +--
8 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/catalina/deploy/LocalStrings_fr.properties
b/java/org/apache/catalina/deploy/LocalStrings_fr.properties
index 5824a19..82027dd 100644
--- a/java/org/apache/catalina/deploy/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/deploy/LocalStrings_fr.properties
@@ -17,7 +17,7 @@ namingResources.cleanupCloseFailed=Impossible d''invoquer la
méthode [{0}] de l
namingResources.cleanupCloseSecurity=Incapacité de récupérer la méthode [{0}]
pour la resource [{1}] dans le conteneur [{2}]. Aucun nettoyage effectué pour
cette resource.
namingResources.cleanupNoClose=La ressource [{0}] du container [{1}] n''a pas
de [{2}] méthode donc aucun nettoyage de la ressource n''a pu être effectué
namingResources.cleanupNoContext=Impossible de récupérer le contexte de
nommage JNDI dans le conteneur [{0}] donc aucun nettoyage de ce conteneur n''a
pu être effectué
-namingResources.cleanupNoResource=Impossible de récupérer la ressource JNDI
[{1}] dans le conteneur [{2}] donc aucun nettoyage de la ressource n'a pu être
effectué
+namingResources.cleanupNoResource=Impossible de récupérer la ressource JNDI
[{1}] dans le conteneur [{2}] donc aucun nettoyage de la ressource n''a pu être
effectué
namingResources.ejbLookupLink=La référence à un EJB [{0}] spéficie à la fois
un ejb-link and et un lookup-name
namingResources.envEntryLookupValue=L''entrée d''environnement [{0}] spécifie
à la fois un lookup-name et une valeur
namingResources.mbeanCreateFail=Échec de création d''un MBean pour la resource
nommée ("naming resource") [{0}]
diff --git a/java/org/apache/catalina/ha/tcp/LocalStrings_fr.properties
b/java/org/apache/catalina/ha/tcp/LocalStrings_fr.properties
index 3281c65..54aa799 100644
--- a/java/org/apache/catalina/ha/tcp/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/ha/tcp/LocalStrings_fr.properties
@@ -23,7 +23,7 @@ ReplicationValve.invoke.uri=Invocation de la requête de
réplication sur [{0}]
ReplicationValve.nocluster=Aucun cluster de configuré pour cette requête
ReplicationValve.resetDeltaRequest=Le cluster se suffit à lui-même :
réinitialisation du delta de la requête de session [{0}]
ReplicationValve.send.failure=Impossible d'effectuer la requête de réplication
-ReplicationValve.send.invalid.failure=Incapable d'envoyer le message invalide
de la session [id={0}] sur le cluster
+ReplicationValve.send.invalid.failure=Incapable d''envoyer le message invalide
de la session [id={0}] sur le cluster
ReplicationValve.session.found=Le Contexte [{0}] a touvé la session [{1}] mais
ce n''est pas une ClusterSession.
ReplicationValve.session.indicator=Contexte [{0}] : la primarité de la session
[{1}] dans l''attribut de requête [{2}] est [{3}].
ReplicationValve.session.invalid=Contexte [{0}] : la session demandée [{1}]
est invalide, non répliquée, ou enlevée sur ce nœud
diff --git a/java/org/apache/catalina/realm/LocalStrings_fr.properties
b/java/org/apache/catalina/realm/LocalStrings_fr.properties
index 854c9bd..b79f79c 100644
--- a/java/org/apache/catalina/realm/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_fr.properties
@@ -95,7 +95,7 @@ realmBase.authenticateSuccess=Le nom d''utilisateur [{0}] a
été authentifié a
realmBase.cannotGetRoles=Impossible d''obtenir les rôles du principal [{0}]
realmBase.createUsernameRetriever.ClassCastException=La classe [{0}] n''est
pas un X509UsernameRetriever.
realmBase.createUsernameRetriever.newInstance=Impossible de créer un objet du
type [{0}]
-realmBase.credentialNotDelegated=Les identifiants de l'utilisateur [{0}} n'ont
pas été délégués alors que leur stockage a été requis
+realmBase.credentialNotDelegated=Les identifiants de l''utilisateur [{0}}
n''ont pas été délégués alors que leur stockage a été requis
realmBase.delegatedCredentialFail=Impossible d''obtenir les identifiants
délégués pour l''utilisateur [{0}]
realmBase.digest=Erreur lors du hachage de l''identifiant utilisateur
realmBase.forbidden=L'accès à la ressource demandée a été interdit
diff --git a/java/org/apache/catalina/sec
[tomcat] branch master updated (b8d71d5 -> 74d1dcb)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from b8d71d5 Fix escaping new b79220c Fix escaping new 16ef7de Improvements to Korean translations (woonsan) new a69eb70 Align formatting new dc1f1ab Align formatting new 74d1dcb Improvements to Chinese translations. Provided by leeyazhou. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/catalina/tribes/util/LocalStrings_ko.properties | 2 +- java/org/apache/coyote/LocalStrings_ko.properties| 2 +- java/org/apache/coyote/LocalStrings_zh_CN.properties | 3 ++- java/org/apache/coyote/http11/LocalStrings_ko.properties | 4 +++- java/org/apache/coyote/http11/LocalStrings_zh_CN.properties | 3 ++- java/org/apache/coyote/http2/LocalStrings_ko.properties | 2 ++ java/org/apache/jasper/resources/LocalStrings_ko.properties | 5 +++-- java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 9 ++--- java/org/apache/tomcat/util/http/LocalStrings_ko.properties | 4 ++-- java/org/apache/tomcat/util/http/LocalStrings_pt_BR.properties | 3 ++- java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties | 9 ++--- .../apache/tomcat/util/http/parser/LocalStrings_ko.properties| 2 +- .../apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties | 3 ++- java/org/apache/tomcat/util/net/LocalStrings_ko.properties | 7 +++ java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties| 4 webapps/docs/changelog.xml | 6 ++ 16 files changed, 50 insertions(+), 18 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/05: Fix escaping
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 b79220c5dc1728fca7ede13ea6e387b276e9a3d4
Author: Mark Thomas
AuthorDate: Tue Dec 8 10:03:51 2020 +
Fix escaping
---
java/org/apache/catalina/tribes/util/LocalStrings_ko.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings_ko.properties | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
b/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
index c8e6694..713fea3 100644
--- a/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
@@ -15,7 +15,7 @@
arrays.keyoffset.outOfBounds=keyoffset이 범위를 초과합니다.
arrays.length.outOfBounds=키 내에 충분한 데이터 엘리먼트들이 존재하지 않습니다. 길이가 범위 밖에 있습니다.
-arrays.malformed.arrays=바이트 배열은 반드시 ''{1,3,4,5,6}''과 같이 표현되어야 합니다.
+arrays.malformed.arrays=바이트 배열은 반드시 '{1,3,4,5,6}'과 같이 표현되어야 합니다.
arrays.srcoffset.outOfBounds=srcoffset이 범위 밖입니다.
executorFactory.not.running=Executor가 실행 중이 아닙니다. 명령을 강제로 큐에 넣을 수 없습니다.
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties
b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index d2afc7e..d9bbb06 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -77,7 +77,7 @@ jsp.error.file.already.registered=파일 [{0}]의 재귀적인 include입니다.
jsp.error.file.cannot.read=파일을 읽을 수 없습니다: [{0}]
jsp.error.file.not.found=파일 [{0}]을(를) 찾을 수 없습니다.
jsp.error.flush=데이터를 배출하는 중 예외가 발생했습니다.
-jsp.error.fragmentwithtype='fragment'와 'type' 속성, 둘 다를 지정할 수 없습니다. 만일
'fragment'이 지정되면, 'type'은 '{0}'으로 고정됩니다.
+jsp.error.fragmentwithtype=''fragment''와 ''type'' 속성, 둘 다를 지정할 수 없습니다. 만일
''fragment''이 지정되면, ''type''은 ''{0}''으로 고정됩니다.
jsp.error.function.classnotfound=function [{1}]을(를) 위하여 TLD에 지정된, 클래스
[{0}]을(를) 찾을 수 없습니다: [{2}]
jsp.error.include.exception=[{0}]을(를) include할 수 없습니다.
jsp.error.include.tag=유효하지 않은 jsp:include 태그
@@ -380,7 +380,8 @@ End of content automatically created by Apache Tomcat
JspC.\n\
-->\n\
\n\
\n
-jspc.webinc.header=\n\
\n\
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/05: Improvements to Korean translations (woonsan)
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 16ef7de4d3822e9683d5a403bd2c086011e86853
Author: Mark Thomas
AuthorDate: Tue Dec 8 10:05:24 2020 +
Improvements to Korean translations (woonsan)
Also some alignment of formatting
---
java/org/apache/coyote/LocalStrings_ko.properties | 2 +-
java/org/apache/coyote/http11/LocalStrings_ko.properties | 4 +++-
java/org/apache/coyote/http2/LocalStrings_ko.properties| 2 ++
java/org/apache/tomcat/util/http/LocalStrings_ko.properties| 4 ++--
java/org/apache/tomcat/util/http/parser/LocalStrings_ko.properties | 2 +-
java/org/apache/tomcat/util/net/LocalStrings_ko.properties | 7 +++
webapps/docs/changelog.xml | 3 +++
7 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/coyote/LocalStrings_ko.properties
b/java/org/apache/coyote/LocalStrings_ko.properties
index 9ec8f1e..d4c3a44 100644
--- a/java/org/apache/coyote/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/LocalStrings_ko.properties
@@ -26,7 +26,7 @@
abstractConnectionHandler.socketexception.debug=SocketException들은 정상적
abstractConnectionHandler.upgradeCreate=소켓 wrapper [{1}]을(를) 위한 업그레이드 프로세서
[{0}]을(를) 생성했습니다.
abstractProcessor.fallToDebug=\n\
-비고: 요청에 대한 파싱 오류들이 더 발생하는 경우 DEBUG 레벨 로그로 기록될 것입니다.
+\ 비고: 요청에 대한 파싱 오류들이 더 발생하는 경우 DEBUG 레벨 로그로 기록될 것입니다.
abstractProcessor.hostInvalid=호스트 [{0}]은(는) 유효하지 않습니다.
abstractProcessor.httpupgrade.notsupported=HTTP 업그레이드는 이 프로토콜에 의해 지원되지 않습니다.
abstractProcessor.noExecute=이 프로세서가 현재 SocketWrapper와 연관되어 있지 않기 때문에, 처리 작업을
컨테이너 쓰레드로 이관할 수 없습니다.
diff --git a/java/org/apache/coyote/http11/LocalStrings_ko.properties
b/java/org/apache/coyote/http11/LocalStrings_ko.properties
index 980999b..e0cbdd0 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ko.properties
@@ -16,9 +16,11 @@
abstractHttp11Protocol.alpnConfigured=[{0}] connector는 ALPN을 통해 [{1}](으)로
negotiation을 지원하도록 설정되었습니다.
abstractHttp11Protocol.alpnWithNoAlpn=[{1}]을(를) 위한 업그레이드 핸들러 [{0}]은(는) 오직
ALPN을 통한 업그레이드만 지원합니다만, 해당 업그레이드 핸들러가 ALPN을 지원하지 않는 [{2}] Connector를 위해 설정되어
있습니다.
abstractHttp11Protocol.httpUpgradeConfigured=[{0}] connector가, [{1}](으)로 HTTP
업그레이드를 지원하도록 설정되어 있습니다.
+abstractHttp11Protocol.upgradeJmxNameFail=업그레이드 프로토콜을 JMX에 등록하기 위해 사용할
ObjectName을 생성하지 못했습니다.
+abstractHttp11Protocol.upgradeJmxRegistrationFail=업그레이드 프로토콜을 JMX에 등록하지 못했습니다.
http11processor.fallToDebug=\n\
-비고: HTTP 요청 파싱 오류들이 더 발생하는 경우 DEBUG 레벨 로그로 기록될 것입니다.
+\ 비고: HTTP 요청 파싱 오류들이 더 발생하는 경우 DEBUG 레벨 로그로 기록될 것입니다.
http11processor.header.parse=HTTP 요청 헤더를 파싱하는 중 오류 발생
http11processor.request.finish=요청을 완료하는 중 오류 발생
http11processor.request.inconsistentHosts=요청 행(request line)에 지정된 호스트가, 호스트
헤더와 일관되지 않습니다.
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index a2bad0c..dbed164 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -72,6 +72,8 @@ http2Parser.processFrameWindowUpdate.debug=연결 [{0}], 스트림
[{1}], 윈도
http2Parser.processFrameWindowUpdate.invalidIncrement=유효하지 않은 증분 크기인 [{0}]와(과)
함께, 윈도우 변경 프레임을 받았습니다.
http2Parser.swallow.debug=연결 [{0}], 스트림 [{1}], [{2}] 바이트를 처리하지 않고 건너뛰었습니다.
+http2Protocol.jmxRegistration.fail=HTTP/2 프로토콜을 JMX에 등록하지 못했습니다.
+
pingManager.roundTripTime=연결 [{0}]: 라운드 트립 시간이 [{1}] 나노초(ns)로 측정되었습니다.
stream.clientCancel=응답이 완료되기 전에 클라이언트가 스트림을 리셋했습니다.
diff --git a/java/org/apache/tomcat/util/http/LocalStrings_ko.properties
b/java/org/apache/tomcat/util/http/LocalStrings_ko.properties
index f2b226e..9ceb6f8 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings_ko.properties
@@ -28,11 +28,11 @@ parameters.decodeFail.debug=문자 디코딩 실패. 값 [{1}](으)로 설정된
parameters.decodeFail.info=문자 디코딩이 실패했습니다. 값 [{1}]을(를) 가진 파라미터 [{0}]은(는)
무시되었습니다. 주의: 여기서 인용된 이름과 값은 디코딩 실패로 인해 데이터가 손상되었을 수 있습니다. 손상되지 않은 원본 데이터를 보시려면,
로그 레벨을 디버그 레벨로 하십시오.
parameters.emptyChunk=빈 파라미터 chunk는 무시됩니다.
parameters.fallToDebug=\n\
-비고: 파라미터 오류들이 더 발생하는 경우 DEBUG 레벨 로그로 기록될 것입니다.
+\ 비고: 파라미터 오류들이 더 발생하는 경우 DEBUG 레벨 로그로 기록될 것입니다.
parameters.invalidChunk=[{0}] 바이트에서 시작하고 [{1}] 바이트에서 끝나며 값이 [{2}]인, 유효하지 않은
chunk는 무시됩니다.
parameters.maxCountFail=단일 요청 ([{0}])에 허용되는 최대 요청 파라미터들의 개수 보다 더 많은 파라미터들이
탐지되었습니다. 이 한계값을 초과하는 파라미터들은 무시되었습니다. 이 한계값을 변경하기 위해서는 Connector의
maxParameterCount 속성을 설정하십시오.
parameters.maxCountFail.fallToDebug=\n\
-비고: 이 오류가 더 발생하는 경우 DEBUG 레벨 로그로 기록될 것입니다.
+\ 비고: 이 오류가 더 발생하는 경우 DEBUG 레벨 로그로 기록될 것입니다.
parameters.multipleDecodingFail=문자 디코딩이 실패했습니다. 전체 [{0}]개의 실패가 탐지되었지만, 오직 첫번째
실패만 로그에 기록되었습니다. 모든 실패들을 로그에 남기려면 로그 레벨을 디버그 레벨로 설정하십시오.
parameters.noequal=위
[tomcat] 04/05: Align formatting
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 dc1f1abe397cf2ad2bcfbcfddaabea8e269dfbbd
Author: Mark Thomas
AuthorDate: Tue Dec 8 10:08:43 2020 +
Align formatting
---
java/org/apache/coyote/LocalStrings_zh_CN.properties | 3 ++-
java/org/apache/coyote/http11/LocalStrings_zh_CN.properties | 3 ++-
java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 9 ++---
java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties | 9 ++---
.../apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties | 3 ++-
5 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/coyote/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/LocalStrings_zh_CN.properties
index 6291918..864cbfa 100644
--- a/java/org/apache/coyote/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/LocalStrings_zh_CN.properties
@@ -25,7 +25,8 @@
abstractConnectionHandler.protocolexception.debug=ProtocolExceptions是正常的
abstractConnectionHandler.socketexception.debug=(:SocketException是正常的，忽略
abstractConnectionHandler.upgradeCreate=为套接字包装程序[{1}]创建了升级处理器[{0}]
-abstractProcessor.fallToDebug=注意：更多的请求解析错误将以DEBUG级别日志进行记录。
+abstractProcessor.fallToDebug=\n\
+\ 注意：更多的请求解析错误将以DEBUG级别日志进行记录。
abstractProcessor.hostInvalid=[{0}] 是无效主机
abstractProcessor.httpupgrade.notsupported=此协议不支持HTTP升级（upgrade）。
abstractProcessor.noExecute=无法将处理传输到容器线程，因为此处理器当前未与SocketWrapper关联
diff --git a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
index b1aa136..9429a95 100644
--- a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
@@ -17,7 +17,8 @@ abstractHttp11Protocol.alpnConfigured=[{0}]连接器已配置为支持通过ALPN
abstractHttp11Protocol.alpnWithNoAlpn=[{1}]的升级处理程序[{0}]仅支持通过ALPN升级，但已为不支持ALPN的[{2}]连接器配置
abstractHttp11Protocol.httpUpgradeConfigured=[{0}]连接器已配置为支持HTTP升级到[{1}]
-http11processor.fallToDebug=注意：HTTP请求解析错误的进一步发生将记录在DEBUG级别。
+http11processor.fallToDebug=\n\
+\ 注意：HTTP请求解析错误的进一步发生将记录在DEBUG级别。
http11processor.header.parse=解析 HTTP 请求 header 错误
http11processor.request.finish=完成请求时出错
http11processor.request.inconsistentHosts=请求行中指定的主机与主机头不一致。
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index d8b88ad..b26f1d6 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -357,7 +357,8 @@ jsp.文件在哪\n\
\-threadCount 编译使用的线程数.\n\
\ ("2.0C" 意味着每个内核有两个线程)\n
jspc.warning.tldInWebInfLib=TLD文件不应放在/WEB-INF/lib中”
-jspc.webfrg.footer=\n\
+jspc.webfrg.footer=\n\
+\n\
\n
jspc.webfrg.header=\n\
http://xmlns.jcp.org/xml/ns/javaee"\n\
@@ -376,13 +377,15 @@ jspc.webinc.footer=\n\
\n
-jspc.webinc.header=\n\
\n
jspc.webinc.insertEnd=
jspc.webinc.insertStart=
-jspc.webxml.footer=\n\
+jspc.webxml.footer=\n\
+\n\
\n
jspc.webxml.header=\n\
http://xmlns.jcp.org/xml/ns/javaee"\n\
diff --git a/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
index 703308b..cea40f5 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
@@ -13,7 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-cookies.fallToDebug=␣注意：将在调试级别记录进一步出现的Cookie错误。
+cookies.fallToDebug=\n\
+\ 注意：将在调试级别记录进一步出现的Cookie错误。
cookies.invalidCookieToken=Cookie：cookie无效。值不是令牌或引用值
cookies.invalidSameSiteCookies=未知设置[{0}]，必须是以下之一：unset、none、lax、strict。默认值为unset。
cookies.invalidSpecial=Cookies：未知特殊的Cookie
@@ -26,10 +27,12 @@ parameters.copyFail=无法创建以调试日志记录为目的的原始参数值
parameters.decodeFail.debug=字符解码失败.参数 [{0}]和值 [{1}]被忽略
parameters.decodeFail.info=字符解码失败。值为[{1}]的参数[{0}]已被忽略。请注意，此处引用的名称和值可能由于解码失败而损坏。使用调试级别日志记录查看原始的、未损坏的值。
parameters.emptyChunk=忽略空参数块
-parameters.fallToDebug=注：更多的参数错误将以DEBUG级别日志进行记录。
+parameters.fallToDebug=\n\
+\ 注：更多的参数错误将以DEBUG级别日志进行记录。
parameters.invalidChunk=从字节[{0}]开始到字节[{1}]结束的无效块，忽略值[{2}]
parameters.maxCountFail=检测到单个请求（[{0}]）的最大请求参数数（GET加POST）。 超出此限制的任何参数都被忽略。
要更改此限制，请在Connector上设置maxParameterCount属性。
-parameters.maxCountFail.fallToDebug=注意:更多的错误信息只在debug级别日志中记录
+parameters.maxCountFail.fallToDebug=\n\
+\ 注意:更多的错误信息只在debug级别日志中记录
parameters.multipleDecodingFail=字符解码失败。总共检测到[{0}]个失败，但只记录了第一个失败。为此记录器启用调试级别日志记录以记录所有故障。
parameters.noequal=):参数从位置[{0}]开始，到位置[{1}]结束，值为[{2}]，后面没有“=”字符
diff --git
a/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
index f90af7e..5ee4117 100644
--- a/java/org/apache/tomcat/util/http/parser
[tomcat] 03/05: Align formatting
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 a69eb700eae14b280bcae75e2a02c9c1298d9b91 Author: Mark Thomas AuthorDate: Tue Dec 8 10:07:03 2020 + Align formatting --- java/org/apache/tomcat/util/http/LocalStrings_pt_BR.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/http/LocalStrings_pt_BR.properties b/java/org/apache/tomcat/util/http/LocalStrings_pt_BR.properties index 5c096b3..9d295c7 100644 --- a/java/org/apache/tomcat/util/http/LocalStrings_pt_BR.properties +++ b/java/org/apache/tomcat/util/http/LocalStrings_pt_BR.properties @@ -13,4 +13,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -parameters.fallToDebug=\ Nota: próximas ocorrências do parâmetro erro serão registradas no log do tipo DEBUG +parameters.fallToDebug=\n\ +\ Nota: próximas ocorrências do parâmetro erro serão registradas no log do tipo DEBUG - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/05: Improvements to Chinese translations. Provided by leeyazhou.
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 74d1dcba19d895e9ff08e4369e1f6c123cefbc03
Author: Mark Thomas
AuthorDate: Tue Dec 8 10:09:46 2020 +
Improvements to Chinese translations. Provided by leeyazhou.
---
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 4
webapps/docs/changelog.xml| 3 +++
2 files changed, 7 insertions(+)
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
index 870af79..159c72e 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -13,6 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+acceptor.stop.fail=接收器线程[{0}]未能干净的停止
+acceptor.stop.interrupted=等待接收器线程[{0}]停止时收到中断信号
+
channel.nio.interrupted=当前线程被中断。
channel.nio.ssl.appInputNotEmpty=应用程序输入缓冲区仍然包含数据。数据将会丢失。
channel.nio.ssl.appOutputNotEmpty=应用程序输出缓冲区仍包含数据。数据可能会丢失。
@@ -93,6 +96,7 @@ endpoint.launch.fail=无法启动新的可运行文件
endpoint.nio.keyProcessingError=处理选择键时出错
endpoint.nio.latchMustBeZero=闩锁必须为0或空
endpoint.nio.nullLatch=闩锁不能为空
+endpoint.nio.nullSocketChannel=处理轮训事件时出现无效的空套接字通道
endpoint.nio.pollerEventError=处理轮询器事件时出错
endpoint.nio.registerFail=无法用轮询器中的选择器注册套接字。
endpoint.nio.selectorCloseFail=关闭轮询器时未能关闭选择器
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4ccb48c..89f50f1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,9 @@
+Improvements to Chinese translations. Provided by leeyazhou. (markt)
+
+
Improvements to French translations. (remm)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Align formatting
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
The following commit(s) were added to refs/heads/master by this push:
new 047d2f2 Align formatting
047d2f2 is described below
commit 047d2f2bfd8f18becfd3bf847aafc4dd628cb3a8
Author: Mark Thomas
AuthorDate: Tue Dec 8 10:15:00 2020 +
Align formatting
---
java/org/apache/coyote/LocalStrings_cs.properties| 3 ++-
java/org/apache/coyote/LocalStrings_de.properties| 3 ++-
java/org/apache/coyote/LocalStrings_es.properties| 3 ++-
java/org/apache/coyote/LocalStrings_fr.properties| 3 ++-
java/org/apache/coyote/LocalStrings_ja.properties| 3 ++-
java/org/apache/coyote/http11/LocalStrings_cs.properties | 3 ++-
java/org/apache/coyote/http11/LocalStrings_fr.properties | 3 ++-
java/org/apache/coyote/http11/LocalStrings_ja.properties | 3 ++-
java/org/apache/tomcat/util/http/LocalStrings_cs.properties | 9 ++---
java/org/apache/tomcat/util/http/LocalStrings_de.properties | 6 --
java/org/apache/tomcat/util/http/LocalStrings_es.properties | 6 --
java/org/apache/tomcat/util/http/LocalStrings_fr.properties | 9 ++---
java/org/apache/tomcat/util/http/LocalStrings_ja.properties | 9 ++---
.../apache/tomcat/util/http/parser/LocalStrings_cs.properties| 3 ++-
.../apache/tomcat/util/http/parser/LocalStrings_fr.properties| 3 ++-
.../apache/tomcat/util/http/parser/LocalStrings_ja.properties| 3 ++-
16 files changed, 48 insertions(+), 24 deletions(-)
diff --git a/java/org/apache/coyote/LocalStrings_cs.properties
b/java/org/apache/coyote/LocalStrings_cs.properties
index 827a1b5..e485896 100644
--- a/java/org/apache/coyote/LocalStrings_cs.properties
+++ b/java/org/apache/coyote/LocalStrings_cs.properties
@@ -15,7 +15,8 @@
abstractConnectionHandler.processorPop=Získaný zpracovatel [{0}] z cache
-abstractProcessor.fallToDebug=\ Poznámka: další výskyty chyb ze zpracování
dotazu budou zalogovány na úrovni DEBUG.
+abstractProcessor.fallToDebug=\n\
+\ Poznámka: další výskyty chyb ze zpracování dotazu budou zalogovány na úrovni
DEBUG.
abstractProcessor.hostInvalid=Host [{0}] je neplatný
abstractProcessor.httpupgrade.notsupported=HTTP upgrade není podporován tímto
protokolem
diff --git a/java/org/apache/coyote/LocalStrings_de.properties
b/java/org/apache/coyote/LocalStrings_de.properties
index 1b66a7a..5f37d72 100644
--- a/java/org/apache/coyote/LocalStrings_de.properties
+++ b/java/org/apache/coyote/LocalStrings_de.properties
@@ -17,7 +17,8 @@ abstractConnectionHandler.oome=Verarbeitung der Anfrage
fehlgeschlagen
abstractConnectionHandler.processorPop=Prozessor [{0}] wurde aus dem Cache
genommen.
abstractConnectionHandler.socketexception.debug=SocketExceptions sind normal,
werden ignoriert
-abstractProcessor.fallToDebug=Info: Weitere Vorkommen von Fehlern beim Parsen
der Anfragen werden mit DEBUG Level ausgegeben
+abstractProcessor.fallToDebug=\n\
+\ Info: Weitere Vorkommen von Fehlern beim Parsen der Anfragen werden mit
DEBUG Level ausgegeben
abstractProcessor.hostInvalid=Der Host [{0}] ist nicht gültig.
abstractProcessor.httpupgrade.notsupported=HTTP-Upgrade wird von diesem
Protokol nicht unterstützt
diff --git a/java/org/apache/coyote/LocalStrings_es.properties
b/java/org/apache/coyote/LocalStrings_es.properties
index 2e10f0a..c2fce07 100644
--- a/java/org/apache/coyote/LocalStrings_es.properties
+++ b/java/org/apache/coyote/LocalStrings_es.properties
@@ -16,7 +16,8 @@
abstractConnectionHandler.error=Error leyendo requerimiento, ignorado
abstractConnectionHandler.processorPop=Sacando procesador [{0}] de la cache
-abstractProcessor.fallToDebug=Nota: futuras ocurrencias de la solicitud the
parseo de errores será logueada con nivel DEBUG.
+abstractProcessor.fallToDebug=\n\
+\ Nota: futuras ocurrencias de la solicitud the parseo de errores será
logueada con nivel DEBUG.
abstractProcessor.hostInvalid=El host [{0}] no es válido\n
abstractProcessor.httpupgrade.notsupported=La actualización HTTP no esta
soportada por esta protocol
abstractProcessor.socket.ssl=Excepción obteniendo atributos SSL
diff --git a/java/org/apache/coyote/LocalStrings_fr.properties
b/java/org/apache/coyote/LocalStrings_fr.properties
index 80af8e6..7178c7a 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -25,7 +25,8 @@ abstractConnectionHandler.protocolexception.debug=Les
ProtocolExceptions sont no
abstractConnectionHandler.socketexception.debug=Les SocketException sont
normales et sont ignorées
abstractConnectionHandler.upgradeCreate=Création du processeur pour l''upgrade
[{0}] du wrapper du socket [{1}]
-abstractProcessor.fallToDebug=\ Note : les occurrences suivantes d'erreurs
d'analyse de requête ser
[tomcat] branch 9.0.x updated: Back-port translation updates
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 6bcafe4 Back-port translation updates
6bcafe4 is described below
commit 6bcafe457a62e27b16cdccfd3121198bd070ce94
Author: Mark Thomas
AuthorDate: Tue Dec 8 11:26:03 2020 +
Back-port translation updates
---
.../org/apache/catalina/deploy/LocalStrings_fr.properties | 2 +-
.../apache/catalina/filters/LocalStrings_cs.properties| 3 +--
.../org/apache/catalina/ha/tcp/LocalStrings_fr.properties | 2 +-
java/org/apache/catalina/realm/LocalStrings_fr.properties | 2 +-
.../apache/catalina/security/LocalStrings_fr.properties | 4 ++--
.../apache/catalina/startup/LocalStrings_fr.properties| 2 +-
.../catalina/tribes/membership/LocalStrings_fr.properties | 2 +-
.../catalina/tribes/util/LocalStrings_ko.properties | 2 +-
java/org/apache/coyote/LocalStrings_cs.properties | 3 ++-
java/org/apache/coyote/LocalStrings_de.properties | 3 ++-
java/org/apache/coyote/LocalStrings_es.properties | 3 ++-
java/org/apache/coyote/LocalStrings_fr.properties | 3 ++-
java/org/apache/coyote/LocalStrings_ja.properties | 3 ++-
java/org/apache/coyote/LocalStrings_ko.properties | 2 +-
java/org/apache/coyote/LocalStrings_zh_CN.properties | 3 ++-
java/org/apache/coyote/http11/LocalStrings_cs.properties | 3 ++-
java/org/apache/coyote/http11/LocalStrings_fr.properties | 5 -
java/org/apache/coyote/http11/LocalStrings_ja.properties | 3 ++-
java/org/apache/coyote/http11/LocalStrings_ko.properties | 4 +++-
.../apache/coyote/http11/LocalStrings_zh_CN.properties| 3 ++-
java/org/apache/coyote/http2/LocalStrings_es.properties | 3 +--
java/org/apache/coyote/http2/LocalStrings_fr.properties | 4 +++-
java/org/apache/coyote/http2/LocalStrings_ko.properties | 2 ++
java/org/apache/jasper/resources/LocalStrings.properties | 2 +-
.../apache/jasper/resources/LocalStrings_es.properties| 2 +-
.../apache/jasper/resources/LocalStrings_fr.properties| 15 +--
.../apache/jasper/resources/LocalStrings_ja.properties| 11 +++
.../apache/jasper/resources/LocalStrings_ko.properties| 5 +++--
.../apache/jasper/resources/LocalStrings_zh_CN.properties | 9 ++---
.../apache/tomcat/util/http/LocalStrings_cs.properties| 9 ++---
.../apache/tomcat/util/http/LocalStrings_de.properties| 6 --
.../apache/tomcat/util/http/LocalStrings_es.properties| 6 --
.../apache/tomcat/util/http/LocalStrings_fr.properties| 9 ++---
.../apache/tomcat/util/http/LocalStrings_ja.properties| 9 ++---
.../apache/tomcat/util/http/LocalStrings_ko.properties| 4 ++--
.../apache/tomcat/util/http/LocalStrings_pt_BR.properties | 3 ++-
.../apache/tomcat/util/http/LocalStrings_zh_CN.properties | 9 ++---
.../tomcat/util/http/parser/LocalStrings_cs.properties| 3 ++-
.../tomcat/util/http/parser/LocalStrings_fr.properties| 3 ++-
.../tomcat/util/http/parser/LocalStrings_ja.properties| 3 ++-
.../tomcat/util/http/parser/LocalStrings_ko.properties| 2 +-
.../tomcat/util/http/parser/LocalStrings_zh_CN.properties | 3 ++-
.../org/apache/tomcat/util/net/LocalStrings_es.properties | 3 +--
.../org/apache/tomcat/util/net/LocalStrings_fr.properties | 7 +++
.../org/apache/tomcat/util/net/LocalStrings_ko.properties | 7 +++
.../apache/tomcat/util/net/LocalStrings_zh_CN.properties | 4
webapps/docs/changelog.xml| 13 +
47 files changed, 145 insertions(+), 68 deletions(-)
diff --git a/java/org/apache/catalina/deploy/LocalStrings_fr.properties
b/java/org/apache/catalina/deploy/LocalStrings_fr.properties
index 5824a19..82027dd 100644
--- a/java/org/apache/catalina/deploy/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/deploy/LocalStrings_fr.properties
@@ -17,7 +17,7 @@ namingResources.cleanupCloseFailed=Impossible d''invoquer la
méthode [{0}] de l
namingResources.cleanupCloseSecurity=Incapacité de récupérer la méthode [{0}]
pour la resource [{1}] dans le conteneur [{2}]. Aucun nettoyage effectué pour
cette resource.
namingResources.cleanupNoClose=La ressource [{0}] du container [{1}] n''a pas
de [{2}] méthode donc aucun nettoyage de la ressource n''a pu être effectué
namingResources.cleanupNoContext=Impossible de récupérer le contexte de
nommage JNDI dans le conteneur [{0}] donc aucun nettoyage de ce conteneur n''a
pu être effectué
-namingResources.cleanupNoResource=Impossible de récupérer la ressource JNDI
[{1}] dans le conteneur [{2}] donc aucun nettoyage de la ressource n'a pu être
effectué
+namingResources.cleanupNoResource=Impossible de récupérer la ressource JNDI
[{1}] dans le conteneur [{2}] donc aucun nettoyage de la ressource n''a
[tomcat] branch 8.5.x updated: Back-port i18n updates and fixes
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
The following commit(s) were added to refs/heads/8.5.x by this push:
new db9b4b6 Back-port i18n updates and fixes
db9b4b6 is described below
commit db9b4b6276f38bcf5729c84671bd9961261ba2b1
Author: Mark Thomas
AuthorDate: Tue Dec 8 11:29:29 2020 +
Back-port i18n updates and fixes
---
java/org/apache/catalina/deploy/LocalStrings_fr.properties | 2 +-
java/org/apache/catalina/ha/tcp/LocalStrings_fr.properties | 2 +-
java/org/apache/catalina/realm/LocalStrings_fr.properties | 2 +-
.../org/apache/catalina/security/LocalStrings_fr.properties | 4 ++--
.../catalina/tribes/membership/LocalStrings_fr.properties | 2 +-
.../apache/catalina/tribes/util/LocalStrings_ko.properties | 2 +-
java/org/apache/coyote/LocalStrings_de.properties | 3 ++-
java/org/apache/coyote/LocalStrings_es.properties | 3 ++-
java/org/apache/coyote/LocalStrings_fr.properties | 3 ++-
java/org/apache/coyote/LocalStrings_ja.properties | 3 ++-
java/org/apache/coyote/LocalStrings_ko.properties | 2 +-
java/org/apache/coyote/LocalStrings_zh_CN.properties| 3 ++-
java/org/apache/coyote/http11/LocalStrings_fr.properties| 5 -
java/org/apache/coyote/http11/LocalStrings_ja.properties| 3 ++-
java/org/apache/coyote/http11/LocalStrings_ko.properties| 4 +++-
java/org/apache/coyote/http11/LocalStrings_zh_CN.properties | 3 ++-
java/org/apache/coyote/http2/LocalStrings_es.properties | 3 +--
java/org/apache/coyote/http2/LocalStrings_fr.properties | 4 +++-
java/org/apache/coyote/http2/LocalStrings_ko.properties | 2 ++
java/org/apache/jasper/resources/LocalStrings.properties| 2 +-
java/org/apache/jasper/resources/LocalStrings_fr.properties | 13 -
java/org/apache/jasper/resources/LocalStrings_ja.properties | 9 ++---
java/org/apache/jasper/resources/LocalStrings_ko.properties | 3 ++-
.../apache/jasper/resources/LocalStrings_zh_CN.properties | 9 ++---
java/org/apache/tomcat/util/http/LocalStrings_de.properties | 6 --
java/org/apache/tomcat/util/http/LocalStrings_es.properties | 6 --
java/org/apache/tomcat/util/http/LocalStrings_fr.properties | 9 ++---
java/org/apache/tomcat/util/http/LocalStrings_ja.properties | 9 ++---
java/org/apache/tomcat/util/http/LocalStrings_ko.properties | 4 ++--
.../apache/tomcat/util/http/LocalStrings_zh_CN.properties | 9 ++---
.../tomcat/util/http/parser/LocalStrings_fr.properties | 3 ++-
.../tomcat/util/http/parser/LocalStrings_ja.properties | 3 ++-
.../tomcat/util/http/parser/LocalStrings_ko.properties | 2 +-
.../tomcat/util/http/parser/LocalStrings_zh_CN.properties | 3 ++-
java/org/apache/tomcat/util/net/LocalStrings_es.properties | 3 +--
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 3 +++
java/org/apache/tomcat/util/net/LocalStrings_ko.properties | 3 +++
webapps/docs/changelog.xml | 13 +
38 files changed, 113 insertions(+), 54 deletions(-)
diff --git a/java/org/apache/catalina/deploy/LocalStrings_fr.properties
b/java/org/apache/catalina/deploy/LocalStrings_fr.properties
index 5824a19..82027dd 100644
--- a/java/org/apache/catalina/deploy/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/deploy/LocalStrings_fr.properties
@@ -17,7 +17,7 @@ namingResources.cleanupCloseFailed=Impossible d''invoquer la
méthode [{0}] de l
namingResources.cleanupCloseSecurity=Incapacité de récupérer la méthode [{0}]
pour la resource [{1}] dans le conteneur [{2}]. Aucun nettoyage effectué pour
cette resource.
namingResources.cleanupNoClose=La ressource [{0}] du container [{1}] n''a pas
de [{2}] méthode donc aucun nettoyage de la ressource n''a pu être effectué
namingResources.cleanupNoContext=Impossible de récupérer le contexte de
nommage JNDI dans le conteneur [{0}] donc aucun nettoyage de ce conteneur n''a
pu être effectué
-namingResources.cleanupNoResource=Impossible de récupérer la ressource JNDI
[{1}] dans le conteneur [{2}] donc aucun nettoyage de la ressource n'a pu être
effectué
+namingResources.cleanupNoResource=Impossible de récupérer la ressource JNDI
[{1}] dans le conteneur [{2}] donc aucun nettoyage de la ressource n''a pu être
effectué
namingResources.ejbLookupLink=La référence à un EJB [{0}] spéficie à la fois
un ejb-link and et un lookup-name
namingResources.envEntryLookupValue=L''entrée d''environnement [{0}] spécifie
à la fois un lookup-name et une valeur
namingResources.mbeanCreateFail=Échec de création d''un MBean pour la resource
nommée ("naming resource") [{0}]
diff --git a/java/org/apache/catalina/ha/tcp/LocalStrings_fr.properties
b/java/org/apache/catalina/ha/tcp/LocalStrings_fr.properties
index 3281c65..54aa799 100644
--- a/java/org/apach
[tomcat] branch 7.0.x updated: Back-port fixes and updates
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new a854ecf Back-port fixes and updates
a854ecf is described below
commit a854ecf084a56c306d6f54dea2186bdc05fc7bff
Author: Mark Thomas
AuthorDate: Tue Dec 8 11:34:18 2020 +
Back-port fixes and updates
---
java/org/apache/catalina/deploy/LocalStrings_fr.properties | 2 +-
java/org/apache/catalina/ha/tcp/LocalStrings_fr.properties | 2 +-
java/org/apache/catalina/realm/LocalStrings_fr.properties | 2 +-
.../org/apache/catalina/security/LocalStrings_fr.properties | 4 ++--
java/org/apache/coyote/LocalStrings_de.properties | 3 ++-
java/org/apache/coyote/LocalStrings_es.properties | 3 ++-
java/org/apache/coyote/LocalStrings_fr.properties | 3 ++-
java/org/apache/coyote/LocalStrings_ja.properties | 3 ++-
java/org/apache/coyote/LocalStrings_ko.properties | 2 +-
java/org/apache/coyote/LocalStrings_zh_CN.properties| 3 ++-
java/org/apache/coyote/http11/LocalStrings_fr.properties| 3 ++-
java/org/apache/coyote/http11/LocalStrings_ja.properties| 3 ++-
java/org/apache/coyote/http11/LocalStrings_ko.properties| 2 +-
java/org/apache/coyote/http11/LocalStrings_zh_CN.properties | 3 ++-
java/org/apache/jasper/resources/LocalStrings.properties| 2 +-
java/org/apache/jasper/resources/LocalStrings_fr.properties | 13 -
java/org/apache/jasper/resources/LocalStrings_ja.properties | 9 ++---
java/org/apache/jasper/resources/LocalStrings_ko.properties | 3 ++-
.../apache/jasper/resources/LocalStrings_zh_CN.properties | 9 ++---
java/org/apache/tomcat/util/http/LocalStrings_de.properties | 6 --
java/org/apache/tomcat/util/http/LocalStrings_es.properties | 6 --
java/org/apache/tomcat/util/http/LocalStrings_fr.properties | 9 ++---
java/org/apache/tomcat/util/http/LocalStrings_ja.properties | 9 ++---
java/org/apache/tomcat/util/http/LocalStrings_ko.properties | 4 ++--
.../apache/tomcat/util/http/LocalStrings_zh_CN.properties | 9 ++---
webapps/docs/changelog.xml | 9 +
26 files changed, 83 insertions(+), 43 deletions(-)
diff --git a/java/org/apache/catalina/deploy/LocalStrings_fr.properties
b/java/org/apache/catalina/deploy/LocalStrings_fr.properties
index 5824a19..82027dd 100644
--- a/java/org/apache/catalina/deploy/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/deploy/LocalStrings_fr.properties
@@ -17,7 +17,7 @@ namingResources.cleanupCloseFailed=Impossible d''invoquer la
méthode [{0}] de l
namingResources.cleanupCloseSecurity=Incapacité de récupérer la méthode [{0}]
pour la resource [{1}] dans le conteneur [{2}]. Aucun nettoyage effectué pour
cette resource.
namingResources.cleanupNoClose=La ressource [{0}] du container [{1}] n''a pas
de [{2}] méthode donc aucun nettoyage de la ressource n''a pu être effectué
namingResources.cleanupNoContext=Impossible de récupérer le contexte de
nommage JNDI dans le conteneur [{0}] donc aucun nettoyage de ce conteneur n''a
pu être effectué
-namingResources.cleanupNoResource=Impossible de récupérer la ressource JNDI
[{1}] dans le conteneur [{2}] donc aucun nettoyage de la ressource n'a pu être
effectué
+namingResources.cleanupNoResource=Impossible de récupérer la ressource JNDI
[{1}] dans le conteneur [{2}] donc aucun nettoyage de la ressource n''a pu être
effectué
namingResources.ejbLookupLink=La référence à un EJB [{0}] spéficie à la fois
un ejb-link and et un lookup-name
namingResources.envEntryLookupValue=L''entrée d''environnement [{0}] spécifie
à la fois un lookup-name et une valeur
namingResources.mbeanCreateFail=Échec de création d''un MBean pour la resource
nommée ("naming resource") [{0}]
diff --git a/java/org/apache/catalina/ha/tcp/LocalStrings_fr.properties
b/java/org/apache/catalina/ha/tcp/LocalStrings_fr.properties
index 5fadc62..818b302 100644
--- a/java/org/apache/catalina/ha/tcp/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/ha/tcp/LocalStrings_fr.properties
@@ -23,7 +23,7 @@ ReplicationValve.invoke.uri=Invocation de la requête de
réplication sur [{0}]
ReplicationValve.nocluster=Aucun cluster de configuré pour cette requête
ReplicationValve.resetDeltaRequest=Le cluster se suffit à lui-même :
réinitialisation du delta de la requête de session [{0}]
ReplicationValve.send.failure=Impossible d'effectuer la requête de réplication
-ReplicationValve.send.invalid.failure=Incapable d'envoyer le message invalide
de la session [id={0}] sur le cluster
+ReplicationValve.send.invalid.failure=Incapable d''envoyer le message invalide
de la session [id={0}] sur le cluster
ReplicationValve.session.found=Le Contexte [{0}] a touvé la session [{1}] mais
ce n''est pas une ClusterSession.
ReplicationVal
buildbot failure in on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1824 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] a854ecf084a56c306d6f54dea2186bdc05fc7bff Blamelist: Mark Thomas BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64965] New: IllegalStateException is thrown in JspContextWrapper.findAttribute()
https://bz.apache.org/bugzilla/show_bug.cgi?id=64965
Bug ID: 64965
Summary: IllegalStateException is thrown in
JspContextWrapper.findAttribute()
Product: Tomcat 9
Version: 9.0.40
Hardware: All
OS: All
Status: NEW
Severity: minor
Priority: P2
Component: Jasper
Assignee: dev@tomcat.apache.org
Reporter: andreas.bergan...@gmail.com
Target Milestone: -
We get an IllegalStateException from JspContextWrapper.findAttribute() in our
logs every now and then due to the session being invalid while resolving EL
variables.
In PageContextImpl.findAttribute() this exception is caught. But the exception
is not caught in JspContextWrapper.findAttribute(). Shouldn't the same error
handling be applied to JspContextWrapper? And according to the javadoc in
JspContext the findAttribute method should not throw IllegalStateException. Or
is there a reason for not catching that exception?
In PageContextImpl.findAttribute():
try {
o = session.getAttribute(name);
} catch(IllegalStateException ise) {
// Session has been invalidated.
// Ignore and fall through to application scope.
}
In JspContextWrapper.findAttribute():
if (getSession() != null) {
o = rootJspCtxt.getAttribute(name, SESSION_SCOPE);
}
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64872] Inefficient enum resolution in JSPs
https://bz.apache.org/bugzilla/show_bug.cgi?id=64872 --- Comment #28 from Mark Thomas --- There needs to be agreement from the Tomcat committers to add all of this. I'm confident the new interface will be accepted. I'm not sure about the optimised implementations. I can't be any moire precise that 2021Q1 at the moment. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64872] Inefficient enum resolution in JSPs
https://bz.apache.org/bugzilla/show_bug.cgi?id=64872 --- Comment #29 from John Engebretson --- Thank you! :) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64965] IllegalStateException is thrown in JspContextWrapper.findAttribute()
https://bz.apache.org/bugzilla/show_bug.cgi?id=64965 --- Comment #1 from Remy Maucherat --- I read all the javadoc and verified and I agree with this. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: 64965: Avoid JspContextWrapper ISE in findAttribute
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 73adbe7 64965: Avoid JspContextWrapper ISE in findAttribute
73adbe7 is described below
commit 73adbe757c209343cc9507c5c7d98c7aa78b9d75
Author: remm
AuthorDate: Tue Dec 8 16:24:39 2020 +0100
64965: Avoid JspContextWrapper ISE in findAttribute
JspContextWrapper.findAttribute should ignore expired sessions rather
than throw an IllegalStateException.
---
java/org/apache/jasper/runtime/JspContextWrapper.java | 7 ++-
webapps/docs/changelog.xml| 9 +
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/runtime/JspContextWrapper.java
b/java/org/apache/jasper/runtime/JspContextWrapper.java
index 707bdd2..746be09 100644
--- a/java/org/apache/jasper/runtime/JspContextWrapper.java
+++ b/java/org/apache/jasper/runtime/JspContextWrapper.java
@@ -200,7 +200,12 @@ public class JspContextWrapper extends PageContext
implements VariableResolver {
o = rootJspCtxt.getAttribute(name, REQUEST_SCOPE);
if (o == null) {
if (getSession() != null) {
-o = rootJspCtxt.getAttribute(name, SESSION_SCOPE);
+try {
+o = rootJspCtxt.getAttribute(name, SESSION_SCOPE);
+} catch (IllegalStateException ise) {
+// Session has been invalidated.
+// Ignore and fall through to application scope.
+}
}
if (o == null) {
o = rootJspCtxt.getAttribute(name, APPLICATION_SCOPE);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 89f50f1..92a937a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,15 @@
+
+
+
+64965: JspContextWrapper.findAttribute should
+ignore expired sessions rather than throw an
+IllegalStateException. (remm)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: 64965: Avoid JspContextWrapper ISE in findAttribute
This is an automated email from the ASF dual-hosted git repository.
remm 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 a511d72 64965: Avoid JspContextWrapper ISE in findAttribute
a511d72 is described below
commit a511d720b941bff888a5aa455b960c1ad990ebe3
Author: remm
AuthorDate: Tue Dec 8 16:24:39 2020 +0100
64965: Avoid JspContextWrapper ISE in findAttribute
JspContextWrapper.findAttribute should ignore expired sessions rather
than throw an IllegalStateException.
---
java/org/apache/jasper/runtime/JspContextWrapper.java | 7 ++-
webapps/docs/changelog.xml| 9 +
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/runtime/JspContextWrapper.java
b/java/org/apache/jasper/runtime/JspContextWrapper.java
index 2b60097..f969851 100644
--- a/java/org/apache/jasper/runtime/JspContextWrapper.java
+++ b/java/org/apache/jasper/runtime/JspContextWrapper.java
@@ -200,7 +200,12 @@ public class JspContextWrapper extends PageContext
implements VariableResolver {
o = rootJspCtxt.getAttribute(name, REQUEST_SCOPE);
if (o == null) {
if (getSession() != null) {
-o = rootJspCtxt.getAttribute(name, SESSION_SCOPE);
+try {
+o = rootJspCtxt.getAttribute(name, SESSION_SCOPE);
+} catch (IllegalStateException ise) {
+// Session has been invalidated.
+// Ignore and fall through to application scope.
+}
}
if (o == null) {
o = rootJspCtxt.getAttribute(name, APPLICATION_SCOPE);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a984667..020b57f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,15 @@
+
+
+
+64965: JspContextWrapper.findAttribute should
+ignore expired sessions rather than throw an
+IllegalStateException. (remm)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: 64965: Avoid JspContextWrapper ISE in findAttribute
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new eb951f1 64965: Avoid JspContextWrapper ISE in findAttribute
eb951f1 is described below
commit eb951f1d05528cd38ab015b4f473e54f31d6f2a8
Author: remm
AuthorDate: Tue Dec 8 16:24:39 2020 +0100
64965: Avoid JspContextWrapper ISE in findAttribute
JspContextWrapper.findAttribute should ignore expired sessions rather
than throw an IllegalStateException.
---
java/org/apache/jasper/runtime/JspContextWrapper.java | 7 ++-
webapps/docs/changelog.xml| 9 +
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/runtime/JspContextWrapper.java
b/java/org/apache/jasper/runtime/JspContextWrapper.java
index 2b60097..f969851 100644
--- a/java/org/apache/jasper/runtime/JspContextWrapper.java
+++ b/java/org/apache/jasper/runtime/JspContextWrapper.java
@@ -200,7 +200,12 @@ public class JspContextWrapper extends PageContext
implements VariableResolver {
o = rootJspCtxt.getAttribute(name, REQUEST_SCOPE);
if (o == null) {
if (getSession() != null) {
-o = rootJspCtxt.getAttribute(name, SESSION_SCOPE);
+try {
+o = rootJspCtxt.getAttribute(name, SESSION_SCOPE);
+} catch (IllegalStateException ise) {
+// Session has been invalidated.
+// Ignore and fall through to application scope.
+}
}
if (o == null) {
o = rootJspCtxt.getAttribute(name, APPLICATION_SCOPE);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index eb7309e..09dc89f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -131,6 +131,15 @@
+
+
+
+64965: JspContextWrapper.findAttribute should
+ignore expired sessions rather than throw an
+IllegalStateException. (remm)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: 64965: Avoid JspContextWrapper ISE in findAttribute
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 6d01814 64965: Avoid JspContextWrapper ISE in findAttribute
6d01814 is described below
commit 6d01814cba1fe45b860176feabbed247edab839e
Author: remm
AuthorDate: Tue Dec 8 16:24:39 2020 +0100
64965: Avoid JspContextWrapper ISE in findAttribute
JspContextWrapper.findAttribute should ignore expired sessions rather
than throw an IllegalStateException.
---
java/org/apache/jasper/runtime/JspContextWrapper.java | 7 ++-
webapps/docs/changelog.xml| 9 +
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/runtime/JspContextWrapper.java
b/java/org/apache/jasper/runtime/JspContextWrapper.java
index 5845b4f..677bc49 100644
--- a/java/org/apache/jasper/runtime/JspContextWrapper.java
+++ b/java/org/apache/jasper/runtime/JspContextWrapper.java
@@ -187,7 +187,12 @@ public class JspContextWrapper extends PageContext
implements VariableResolver {
o = rootJspCtxt.getAttribute(name, REQUEST_SCOPE);
if (o == null) {
if (getSession() != null) {
-o = rootJspCtxt.getAttribute(name, SESSION_SCOPE);
+try {
+o = rootJspCtxt.getAttribute(name, SESSION_SCOPE);
+} catch (IllegalStateException ise) {
+// Session has been invalidated.
+// Ignore and fall through to application scope.
+}
}
if (o == null) {
o = rootJspCtxt.getAttribute(name, APPLICATION_SCOPE);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d9ea700..dd24280 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -133,6 +133,15 @@
+
+
+
+64965: JspContextWrapper.findAttribute should
+ignore expired sessions rather than throw an
+IllegalStateException. (remm)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64965] IllegalStateException is thrown in JspContextWrapper.findAttribute()
https://bz.apache.org/bugzilla/show_bug.cgi?id=64965 Remy Maucherat changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Remy Maucherat --- This will be fixed in Tomcat 10.0.1, 9.0.42, 8.5.62 and 7.0.108. Thanks. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Bug 64965] IllegalStateException is thrown in JspContextWrapper.findAttribute()
15 minutes from initial report to 4 versions patched and issue resolved. Nice. Mark On 08/12/2020 15:35, bugzi...@apache.org wrote: > https://bz.apache.org/bugzilla/show_bug.cgi?id=64965 > > Remy Maucherat changed: > >What|Removed |Added > > Status|NEW |RESOLVED > Resolution|--- |FIXED > > --- Comment #2 from Remy Maucherat --- > This will be fixed in Tomcat 10.0.1, 9.0.42, 8.5.62 and 7.0.108. Thanks. > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1825 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] 6d01814cba1fe45b860176feabbed247edab839e Blamelist: remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Snapshot published for Jakarta EE migration tool
On 01/12/2020 17:09, Mark Thomas wrote: > Hi all, > > I've just published the following snapshot: > > https://repository.apache.org/content/groups/snapshots/org/apache/tomcat/jakartaee-migration/0.1.0-SNAPSHOT/ > > This isn't a formal RC as I am expecting there to be some issues. Please > take a look and report any issues back to this thread. > > I hope to clean things up and be in a position to start a formal release > vote late this week / early next. Ping. Anyone found any issues? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 10.0.0
On 03/12/2020 10:43, Mark Thomas wrote: > The proposed 10.0.0 release is: > [ ] Broken - do not release > [X] Beta - go ahead and release as 10.0.0 (beta) > [ ] Stable - go ahead and release as 10.0.0 (stable) Unit tests pass for NIO, NIO2 and APR/Native on Windows, Linux and MacOs. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat 10.0.0
The following votes were case: Binding: +1 (beta): remm, isapir, mturk, mgrigorov, ebourg, markt No other votes were cast. The vote therefore passes. Thanks to everyone who contributed to this release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r44887 - /dev/tomcat/tomcat-10/v10.0.0/ /release/tomcat/tomcat-10/v10.0.0/
Author: markt Date: Tue Dec 8 17:25:17 2020 New Revision: 44887 Log: Release Apache Tomcat 10.0.0 (beta) Added: release/tomcat/tomcat-10/v10.0.0/ - copied from r44886, dev/tomcat/tomcat-10/v10.0.0/ Removed: dev/tomcat/tomcat-10/v10.0.0/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Add 10.0.0 release date
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 The following commit(s) were added to refs/heads/master by this push: new 0ee5e6a Add 10.0.0 release date 0ee5e6a is described below commit 0ee5e6a71d306a68d652ab5d72bf008a71c0b311 Author: Mark Thomas AuthorDate: Tue Dec 8 17:22:15 2020 + Add 10.0.0 release date --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 92a937a..39cc55e 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -147,7 +147,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.41
On 03/12/2020 13:11, Mark Thomas wrote: > The proposed 9.0.41 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 9.0.41 Unit tests pass for NIO, NIO2 and APR/Native on Windows, Linux and MacOs. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat 9.0.41
The following votes were cast: Binding: +1: remm, isapir, mturk, ebourg, mgrigorov, kkolinko, markt The vote therefore passes. Thanks to everybody who contributed to this release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r44888 - /dev/tomcat/tomcat-9/v9.0.41/ /release/tomcat/tomcat-9/v9.0.41/
Author: markt Date: Tue Dec 8 17:33:59 2020 New Revision: 44888 Log: Release Apache Tomcat 9.0.41 Added: release/tomcat/tomcat-9/v9.0.41/ - copied from r44887, dev/tomcat/tomcat-9/v9.0.41/ Removed: dev/tomcat/tomcat-9/v9.0.41/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Add release date for 9.0.41
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 The following commit(s) were added to refs/heads/9.0.x by this push: new 534b416 Add release date for 9.0.41 534b416 is described below commit 534b416db3a678d502f714fc44ec575094b6d272 Author: Mark Thomas AuthorDate: Tue Dec 8 17:34:37 2020 + Add release date for 9.0.41 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 020b57f..0e485c5 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -147,7 +147,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.61
On 03/12/2020 14:49, Mark Thomas wrote: > The proposed 8.5.61 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.5.61 Unit tests pass for NIO, NIO2 and APR/Native on Windows, Linux and MacOs. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat 8.5.61
The following votes were cast: Binding: +1: remm, isapir, schultz, mturk, mgrigorov, markt The vote therefore passes. Thank you to everyone who contributed to this release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r44889 - /dev/tomcat/tomcat-8/v8.5.61/ /release/tomcat/tomcat-8/v8.5.61/
Author: markt Date: Tue Dec 8 17:40:57 2020 New Revision: 44889 Log: Release Tomcat 8.5.61 Added: release/tomcat/tomcat-8/v8.5.61/ - copied from r44888, dev/tomcat/tomcat-8/v8.5.61/ Removed: dev/tomcat/tomcat-8/v8.5.61/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Add release date for 8.5.61
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 The following commit(s) were added to refs/heads/8.5.x by this push: new 87bb195 Add release date for 8.5.61 87bb195 is described below commit 87bb195fb4395dbc1379488413c0e58da475e2d7 Author: Mark Thomas AuthorDate: Tue Dec 8 17:41:38 2020 + Add release date for 8.5.61 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 09dc89f..96be4a9 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -154,7 +154,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Snapshot published for Jakarta EE migration tool
On Tue, Dec 8, 2020, 19:13 Mark Thomas wrote: > On 01/12/2020 17:09, Mark Thomas wrote: > > Hi all, > > > > I've just published the following snapshot: > > > > > https://repository.apache.org/content/groups/snapshots/org/apache/tomcat/jakartaee-migration/0.1.0-SNAPSHOT/ > > > > This isn't a formal RC as I am expecting there to be some issues. Please > > take a look and report any issues back to this thread. > > > > I hope to clean things up and be in a position to start a formal release > > vote late this week / early next. > > Ping. Anyone found any issues? > I've built the latest master to test 10.0.0 and migrated Apache Wicket 9.x examples. I will re-test tomorrow with the jar from Maven! > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
