[VOTE] Release Apache Tomcat 10.0.19
The proposed Apache Tomcat 10.0.19 release is now available for voting. Apache Tomcat 10.0.x implements Jakarta EE 9 and, as such, the primary package for all the specification APIs has changed from javax.* to jakarta.* Applications that run on Tomcat 9 will not run on Tomcat 10 without changes. Java EE applications designed for Tomcat 9 and earlier may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert them to Jakarta EE and copy them to the webapps directory The notable changes compared to 10.0.18 are: - Update the packaged version of the Tomcat Native Library to 1.2.32 to pick up Windows binaries built with OpenSSL 1.1.1n. - Improve logging of unknown HTTP/2 settings frames. Pull request by Thomas Hoffmann. - Add additional warnings if incompatible TLS configurations are used such as HTTP/2 with CLIENT-CERT authentication Along with lots of other bug fixes and improvements. For full details, see the changelog: https://nightlies.apache.org/tomcat/tomcat-10.0.x/docs/changelog.html It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.19/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1365 The tag is: https://github.com/apache/tomcat/tree/10.0.19 0b4fe866e5a4e06481e5019be9468e10790647ba The proposed 10.0.19 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 10.0.19 (stable) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r53445 - in /dev/tomcat/tomcat-10/v10.0.19: ./ bin/ bin/embed/ src/
Author: markt Date: Tue Mar 29 23:45:33 2022 New Revision: 53445 Log: Upload 10.0.19 for voting Added: dev/tomcat/tomcat-10/v10.0.19/ dev/tomcat/tomcat-10/v10.0.19/KEYS dev/tomcat/tomcat-10/v10.0.19/README.html dev/tomcat/tomcat-10/v10.0.19/RELEASE-NOTES dev/tomcat/tomcat-10/v10.0.19/bin/ dev/tomcat/tomcat-10/v10.0.19/bin/README.html dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19-deployer.tar.gz (with props) dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19-deployer.tar.gz.asc dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19-deployer.tar.gz.sha512 dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19-deployer.zip (with props) dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19-deployer.zip.asc dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19-deployer.zip.sha512 dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19-fulldocs.tar.gz (with props) dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19-fulldocs.tar.gz.asc dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19-windows-x64.zip (with props) dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19-windows-x64.zip.asc dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19-windows-x64.zip.sha512 dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19-windows-x86.zip (with props) dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19-windows-x86.zip.asc dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19-windows-x86.zip.sha512 dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19.exe (with props) dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19.exe.asc dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19.exe.sha512 dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19.tar.gz (with props) dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19.tar.gz.asc dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19.tar.gz.sha512 dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19.zip (with props) dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19.zip.asc dev/tomcat/tomcat-10/v10.0.19/bin/apache-tomcat-10.0.19.zip.sha512 dev/tomcat/tomcat-10/v10.0.19/bin/embed/ dev/tomcat/tomcat-10/v10.0.19/bin/embed/apache-tomcat-10.0.19-embed.tar.gz (with props) dev/tomcat/tomcat-10/v10.0.19/bin/embed/apache-tomcat-10.0.19-embed.tar.gz.asc dev/tomcat/tomcat-10/v10.0.19/bin/embed/apache-tomcat-10.0.19-embed.tar.gz.sha512 dev/tomcat/tomcat-10/v10.0.19/bin/embed/apache-tomcat-10.0.19-embed.zip (with props) dev/tomcat/tomcat-10/v10.0.19/bin/embed/apache-tomcat-10.0.19-embed.zip.asc dev/tomcat/tomcat-10/v10.0.19/bin/embed/apache-tomcat-10.0.19-embed.zip.sha512 dev/tomcat/tomcat-10/v10.0.19/src/ dev/tomcat/tomcat-10/v10.0.19/src/apache-tomcat-10.0.19-src.tar.gz (with props) dev/tomcat/tomcat-10/v10.0.19/src/apache-tomcat-10.0.19-src.tar.gz.asc dev/tomcat/tomcat-10/v10.0.19/src/apache-tomcat-10.0.19-src.tar.gz.sha512 dev/tomcat/tomcat-10/v10.0.19/src/apache-tomcat-10.0.19-src.zip (with props) dev/tomcat/tomcat-10/v10.0.19/src/apache-tomcat-10.0.19-src.zip.asc dev/tomcat/tomcat-10/v10.0.19/src/apache-tomcat-10.0.19-src.zip.sha512 Added: dev/tomcat/tomcat-10/v10.0.19/KEYS == --- dev/tomcat/tomcat-10/v10.0.19/KEYS (added) +++ dev/tomcat/tomcat-10/v10.0.19/KEYS Tue Mar 29 23:45:33 2022 @@ -0,0 +1,453 @@ +This file contains the PGP keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-BEGIN PGP PUBLIC KEY BLOCK- +Comment: GPGTools - http://gpgtools.org + +mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX +pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t +6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K +GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz +4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M +UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF +kUi8BjCHDcSgE/IReKUanjHzm4XSymKDTeqqzidi4k6PDD4jyHb8k8vxi6qT6Udn +lcfo5NBkkUT1TauhEy8ktHhbl9k60BvvMBP9l6cURiJg1WS77egI4P/82oPbzzFi +GFqXyJKULVgxtdQ3JikCpodp3f1fh6PlYZwkW4xCJLJucJ5MiQp07HAkMVW5w+k8
Re: Potential mention on the website
I worry that putting much more than a simple link on the which version page could cause confusion. Something like: "For users wanting a Java EE / Jakarta EE container that supports additional specifications like XXX see Apache TomEE." My preference is for a new menu item - probably under misc - called "Related Apache Projects" (a shorter, snappier title preferred) where we can link to the various ASF projects related to Tomcat and have a paragraph or two on each project. Off the top of my head, there is Ant (initially created to build Tomcat), Commons Pool, DBCP, Modeler, Daemon (all spun off from Tomcat), httpd, TomEE and probably a bunch I have forgotten about. Mark On 30/03/2022 00:25, David Blevins wrote: On Mar 28, 2022, at 10:12 AM, Christopher Schultz wrote: David, On 3/26/22 14:13, David Blevins wrote: I've never had the bravery to ask Why the heck not? Perhaps it's a Geronimo hangover, but I never wanted to risk creating a situation where people felt forced or inadvertently create conflict. but would there be some willingness to consider adding a mention of TomEE on the Tomcat website? I'm up for it. I can't imagine anyone on the Tomcat PMC would have any problem with this. Anyone? Any sign of pushback and I'll happily drop -- it's far more important to maintain good will, respect boundaries and keep things friendly. If there was some warmness to the idea, perhaps something very subtle at the bottom of the Tomcat description on the front page, "For distributions of Tomcat that contain Jakarta REST, Jakarta CDI, Jakarta Enterprise Beans (EJB) and similar specifications see Apache TomEE." I guess the question would be "where is the best place to put this?" Does TomEE have versions that track Tomcat versions in any way? Or do you just use whatever version is "best at the time of packaging" or whatever? For example, relegating TomEE to the "download" page(s) would mean that someone would have to know they want to download a specific Tomcat version, then decide at the last second that they instead want TomEE. If you don't release new versions every month (ish, like we do), then we could easily get out of sync. It's a mix. Each TomEE major version will fix itself to a Tomcat major version. - TomEE 7 (Java EE 7) uses Tomcat 8.5 - TomEE 8 (Java EE 8) uses Tomcat 9 - TomEE 9 (Jakarta EE 9.x) uses Tomcat 10 TomEE 9 is still in milestone, but should be released in a few months. We've been basing our version numbers on the Java EE / Jakarta EE spec number. For Tomcat 10.1, TomEE 10, Jakarta EE 10, they'll be pretty close and might possibly sync perfectly at 11 -- for a while at least. On release speed, we definitely don't keep up with Tomcat pace -- we're more once a quarter than once a month. As well it can take us many months longer to reach final as there's a lot more in the box to certify. I'm thinking that maybe what we should do it put TomEE on the "Which version?" page (https://tomcat.apache.org/whichversion.html). Below the grid of spec versions and associated Tomcat versions, we could put a heading which says something along the lines of "Jakarta Foo + Bar are packaged with TomEE" and just throw the user over to whatever page at TomEE makes the most sense. My only concern would be to properly inform users what is happening. I'm an Eclipse user and any time I have to download a new version from their web site I have to re-learn the differences between "Eclipse IDE for Java Developers" and "Eclipse IDE for Java and DSL Developers" and "Eclipse IDE for Enterprise Java and Web Developers" and I guess whatever the hell Thelia is, now. I wouldn't want anyone to inadvertently install TomEE if all they really want is Tomcat or "only" install Tomcat when they need the additional features and APIs that TomEE provides. Perhaps just a reference to here would be sufficient: https://tomee.apache.org/comparison.html I'm open to what people think is the right. The whichversion.html page idea could be good. A nice thing about a heading on the whichversion.html page is that it's something we can link to in the tomcat.apache.org website, say "https://tomcat.apache.org/whichversion.html#tomee; or something. When twitter polls like this happen we can paste the link and hopefully not see 50% of people saying "yes": - https://twitter.com/brunoborges/status/1507591056086343681 There were several TomEE mentions there, but my experience is unless they see it mentioned on the Tomcat website they often perceive it skeptically as a competitive effort against Tomcat. Under the heading we could have a few sentences with a bit more detail on which specs (the most popular ones as the full list is large), perhaps the Tomcat to TomEE version mapping, and a link to the https://tomee.apache.org/comparison.html page. Something brief, that's no bigger (ideally smaller) than the "Alpha / Beta / Stable" heading so as not to distract too much.
[tomcat] branch 8.5.x updated: Back-port updates to translations
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 a23d06d Back-port updates to translations a23d06d is described below commit a23d06d9c78b8a1e68faa97d3bdcc398ce98edfb Author: Mark Thomas AuthorDate: Wed Mar 30 00:30:49 2022 +0100 Back-port updates to translations --- java/javax/el/LocalStrings_de.properties | 38 +++-- java/javax/el/LocalStrings_es.properties | 44 +++ java/javax/el/LocalStrings_fr.properties | 52 +- java/javax/el/LocalStrings_ja.properties | 62 +++--- java/javax/el/LocalStrings_ko.properties | 58 ++-- java/javax/el/LocalStrings_ru.properties | 50 + java/javax/el/LocalStrings_zh_CN.properties| 60 ++--- .../authenticator/LocalStrings_de.properties | 2 + .../jaspic/LocalStrings_es.properties | 2 + .../catalina/connector/LocalStrings_es.properties | 2 + .../catalina/connector/LocalStrings_fr.properties | 2 + .../catalina/connector/LocalStrings_ja.properties | 2 + .../connector/LocalStrings_zh_CN.properties| 2 + .../catalina/core/LocalStrings_es.properties | 4 +- .../catalina/core/LocalStrings_fr.properties | 4 +- .../catalina/core/LocalStrings_ja.properties | 2 + .../catalina/core/LocalStrings_ko.properties | 4 +- .../catalina/core/LocalStrings_zh_CN.properties| 4 +- .../catalina/filters/LocalStrings_fr.properties| 3 ++ .../catalina/filters/LocalStrings_ja.properties| 3 ++ .../catalina/filters/LocalStrings_ko.properties| 3 ++ .../catalina/filters/LocalStrings_zh_CN.properties | 3 ++ .../catalina/manager/LocalStrings_es.properties| 1 + .../manager/host/LocalStrings_de.properties| 2 + .../mbeans/LocalStrings_es.properties} | 2 +- .../catalina/security/LocalStrings_fr.properties | 2 + .../catalina/security/LocalStrings_ja.properties | 2 + .../catalina/security/LocalStrings_ko.properties | 2 + .../security/LocalStrings_zh_CN.properties | 2 + .../catalina/session/LocalStrings_de.properties| 1 + .../catalina/startup/LocalStrings_de.properties| 3 ++ .../catalina/startup/LocalStrings_fr.properties| 3 ++ .../catalina/startup/LocalStrings_ja.properties| 2 + .../catalina/startup/LocalStrings_ko.properties| 2 + .../catalina/startup/LocalStrings_zh_CN.properties | 2 + .../tribes/group}/LocalStrings_de.properties | 2 +- .../group/interceptors/LocalStrings_de.properties | 1 + .../catalina/tribes/io/LocalStrings_de.properties | 1 + .../catalina/util/LocalStrings_fr.properties | 1 + .../catalina/util/LocalStrings_ja.properties | 1 + .../catalina/util/LocalStrings_zh_CN.properties| 1 + .../catalina/valves/LocalStrings_zh_CN.properties | 2 +- java/org/apache/coyote/LocalStrings.properties | 2 +- .../coyote/http11/LocalStrings_de.properties | 2 +- .../coyote/http11/LocalStrings_es.properties | 1 + .../apache/coyote/http2/LocalStrings_de.properties | 3 +- .../apache/coyote/http2/LocalStrings_fr.properties | 2 + .../apache/coyote/http2/LocalStrings_ja.properties | 2 + .../apache/coyote/http2/LocalStrings_ko.properties | 2 + .../coyote/http2/LocalStrings_zh_CN.properties | 2 + .../jasper/resources/LocalStrings_de.properties| 4 +- .../jasper/resources/LocalStrings_ja.properties| 3 +- .../jasper/resources/LocalStrings_ko.properties| 1 + .../jasper/resources/LocalStrings_zh_CN.properties | 1 + .../util/http/parser/LocalStrings_de.properties| 1 + .../tomcat/util/net/LocalStrings_de.properties | 2 +- .../tomcat/util/net/LocalStrings_fr.properties | 3 +- .../tomcat/util/net/LocalStrings_ja.properties | 3 +- .../tomcat/util/net/LocalStrings_ko.properties | 1 + .../tomcat/util/net/LocalStrings_zh_CN.properties | 2 + .../util/net/openssl/LocalStrings_es.properties| 1 + .../tomcat/util/scan/LocalStrings_de.properties| 1 + .../LocalStrings_fr.properties}| 3 +- .../LocalStrings_ja.properties}| 3 +- .../LocalStrings_ko.properties}| 3 +- .../LocalStrings_zh_CN.properties} | 3 +- .../tomcat/websocket/LocalStrings.properties | 2 +- .../websocket/server/LocalStrings_es.properties| 1 + .../websocket/server/LocalStrings_fr.properties| 1 + .../websocket/server/LocalStrings_ja.properties| 1 + .../websocket/server/LocalStrings_ko.properties| 1 + .../websocket/server/LocalStrings_zh_CN.properties | 1 + webapps/docs/changelog.xml | 13 + 73 files changed, 360 insertions(+), 152 deletions(-) diff --git
Re: Potential mention on the website
> On Mar 28, 2022, at 10:12 AM, Christopher Schultz > wrote: > > David, > > On 3/26/22 14:13, David Blevins wrote: >> I've never had the bravery to ask > > Why the heck not? Perhaps it's a Geronimo hangover, but I never wanted to risk creating a situation where people felt forced or inadvertently create conflict. > >> but would there be some willingness to consider adding a mention of >> TomEE on the Tomcat website? > > I'm up for it. I can't imagine anyone on the Tomcat PMC would have any > problem with this. Anyone? > >> Any sign of pushback and I'll happily drop -- it's far more important >> to maintain good will, respect boundaries and keep things friendly. >> If there was some warmness to the idea, perhaps something very subtle >> at the bottom of the Tomcat description on the front page, "For >> distributions of Tomcat that contain Jakarta REST, Jakarta CDI, >> Jakarta Enterprise Beans (EJB) and similar specifications see Apache >> TomEE." > I guess the question would be "where is the best place to put this?" Does > TomEE have versions that track Tomcat versions in any way? Or do you just use > whatever version is "best at the time of packaging" or whatever? > > For example, relegating TomEE to the "download" page(s) would mean that > someone would have to know they want to download a specific Tomcat version, > then decide at the last second that they instead want TomEE. If you don't > release new versions every month (ish, like we do), then we could easily get > out of sync. It's a mix. Each TomEE major version will fix itself to a Tomcat major version. - TomEE 7 (Java EE 7) uses Tomcat 8.5 - TomEE 8 (Java EE 8) uses Tomcat 9 - TomEE 9 (Jakarta EE 9.x) uses Tomcat 10 TomEE 9 is still in milestone, but should be released in a few months. We've been basing our version numbers on the Java EE / Jakarta EE spec number. For Tomcat 10.1, TomEE 10, Jakarta EE 10, they'll be pretty close and might possibly sync perfectly at 11 -- for a while at least. On release speed, we definitely don't keep up with Tomcat pace -- we're more once a quarter than once a month. As well it can take us many months longer to reach final as there's a lot more in the box to certify. > I'm thinking that maybe what we should do it put TomEE on the "Which > version?" page (https://tomcat.apache.org/whichversion.html). Below the grid > of spec versions and associated Tomcat versions, we could put a heading which > says something along the lines of "Jakarta Foo + Bar are packaged with TomEE" > and just throw the user over to whatever page at TomEE makes the most sense. > > My only concern would be to properly inform users what is happening. I'm an > Eclipse user and any time I have to download a new version from their web > site I have to re-learn the differences between "Eclipse IDE for Java > Developers" and "Eclipse IDE for Java and DSL Developers" and "Eclipse IDE > for Enterprise Java and Web Developers" and I guess whatever the hell Thelia > is, now. > > I wouldn't want anyone to inadvertently install TomEE if all they really want > is Tomcat or "only" install Tomcat when they need the additional features and > APIs that TomEE provides. Perhaps just a reference to here would be > sufficient: https://tomee.apache.org/comparison.html I'm open to what people think is the right. The whichversion.html page idea could be good. A nice thing about a heading on the whichversion.html page is that it's something we can link to in the tomcat.apache.org website, say "https://tomcat.apache.org/whichversion.html#tomee; or something. When twitter polls like this happen we can paste the link and hopefully not see 50% of people saying "yes": - https://twitter.com/brunoborges/status/1507591056086343681 There were several TomEE mentions there, but my experience is unless they see it mentioned on the Tomcat website they often perceive it skeptically as a competitive effort against Tomcat. Under the heading we could have a few sentences with a bit more detail on which specs (the most popular ones as the full list is large), perhaps the Tomcat to TomEE version mapping, and a link to the https://tomee.apache.org/comparison.html page. Something brief, that's no bigger (ideally smaller) than the "Alpha / Beta / Stable" heading so as not to distract too much. If people are up for it, a very brief mention on the main page that links to the whichversion.html page would be effective. My gut is unless we put something there, most people won't see it and we'll likely only educate 5% or 10% of people who say "yes" to polls like one above. -David smime.p7s Description: S/MIME cryptographic signature
[tomcat] 01/01: Tag 10.0.19
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to tag 10.0.19 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 0b4fe866e5a4e06481e5019be9468e10790647ba Author: Mark Thomas AuthorDate: Wed Mar 30 00:22:14 2022 +0100 Tag 10.0.19 --- build.properties.default | 2 +- webapps/docs/changelog.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties.default b/build.properties.default index a3b75ae..e07331d 100644 --- a/build.properties.default +++ b/build.properties.default @@ -33,7 +33,7 @@ version.major=10 version.minor=0 version.build=19 version.patch=0 -version.suffix=-dev +version.suffix= # - Reproducible builds - # Uncomment and set to current time for reproducible builds diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 2195c9d..487b444 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,7 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] tag 10.0.19 created (now 0b4fe86)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 10.0.19 in repository https://gitbox.apache.org/repos/asf/tomcat.git. at 0b4fe86 (commit) This tag includes the following new commits: new 0b4fe86 Tag 10.0.19 The 1 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. - 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: Back-port updated translations
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 53f251a Back-port updated translations 53f251a is described below commit 53f251a0a24173c4c2d1a877a9a0b19a12401544 Author: Mark Thomas AuthorDate: Wed Mar 30 00:17:45 2022 +0100 Back-port updated translations --- java/javax/el/LocalStrings_cs.properties | 38 +++-- java/javax/el/LocalStrings_de.properties | 38 +++-- java/javax/el/LocalStrings_es.properties | 44 +++ java/javax/el/LocalStrings_fr.properties | 52 +- java/javax/el/LocalStrings_ja.properties | 62 +++--- java/javax/el/LocalStrings_ko.properties | 58 ++-- java/javax/el/LocalStrings_pt_BR.properties| 37 +++-- java/javax/el/LocalStrings_ru.properties | 50 + java/javax/el/LocalStrings_zh_CN.properties| 60 ++--- .../authenticator/LocalStrings_de.properties | 2 + .../jaspic/LocalStrings_es.properties | 2 + .../catalina/connector/LocalStrings_es.properties | 2 + .../catalina/connector/LocalStrings_fr.properties | 2 + .../catalina/connector/LocalStrings_ja.properties | 2 + .../connector/LocalStrings_zh_CN.properties| 2 + .../catalina/core/LocalStrings_es.properties | 2 + .../catalina/core/LocalStrings_fr.properties | 2 + .../catalina/core/LocalStrings_ja.properties | 2 + .../catalina/core/LocalStrings_ko.properties | 2 + .../catalina/core/LocalStrings_zh_CN.properties| 2 + .../catalina/filters/LocalStrings_fr.properties| 3 ++ .../catalina/filters/LocalStrings_ja.properties| 3 ++ .../catalina/filters/LocalStrings_ko.properties| 3 ++ .../catalina/filters/LocalStrings_zh_CN.properties | 3 ++ .../catalina/manager/LocalStrings_es.properties| 1 + .../manager/host/LocalStrings_de.properties| 2 + .../mbeans}/LocalStrings_es.properties | 2 +- .../catalina/mbeans/LocalStrings_fr.properties | 2 + .../catalina/mbeans/LocalStrings_ja.properties | 2 + .../catalina/mbeans/LocalStrings_ko.properties | 2 + .../catalina/mbeans/LocalStrings_zh_CN.properties | 2 + .../catalina/security/LocalStrings_fr.properties | 2 + .../catalina/security/LocalStrings_ja.properties | 2 + .../catalina/security/LocalStrings_ko.properties | 2 + .../security/LocalStrings_zh_CN.properties | 2 + .../catalina/session/LocalStrings_de.properties| 1 + .../catalina/startup/LocalStrings_de.properties| 3 ++ .../catalina/startup/LocalStrings_fr.properties| 1 + .../catalina/startup/LocalStrings_ja.properties| 1 + .../catalina/startup/LocalStrings_ko.properties| 1 + .../catalina/startup/LocalStrings_zh_CN.properties | 3 +- .../tribes/group/LocalStrings_de.properties} | 2 +- .../group/interceptors/LocalStrings_de.properties | 1 + .../catalina/tribes/io/LocalStrings_de.properties | 1 + .../membership/cloud/LocalStrings_de.properties| 2 + .../catalina/util/LocalStrings_fr.properties | 1 + .../catalina/util/LocalStrings_ja.properties | 1 + .../catalina/util/LocalStrings_zh_CN.properties| 1 + .../catalina/valves/LocalStrings_zh_CN.properties | 2 +- .../coyote/http11/LocalStrings_de.properties | 2 +- .../coyote/http11/LocalStrings_es.properties | 1 + .../coyote/http2/LocalStrings_zh_CN.properties | 3 ++ .../jasper/resources/LocalStrings_de.properties| 4 +- .../jasper/resources/LocalStrings_ja.properties| 3 +- .../jasper/resources/LocalStrings_ko.properties| 3 +- .../jasper/resources/LocalStrings_zh_CN.properties | 1 + .../util/digester/LocalStrings_es.properties | 1 + .../util/http/parser/LocalStrings_de.properties| 1 + .../tomcat/util/net/LocalStrings_de.properties | 2 +- .../tomcat/util/net/LocalStrings_fr.properties | 2 + .../tomcat/util/net/LocalStrings_ja.properties | 2 + .../tomcat/util/net/LocalStrings_ko.properties | 1 + .../tomcat/util/net/LocalStrings_zh_CN.properties | 2 + .../util/net/openssl/LocalStrings_es.properties| 1 + .../tomcat/util/scan/LocalStrings_de.properties| 1 + .../util/security/LocalStrings_fr.properties | 3 ++ .../util/security/LocalStrings_ja.properties | 3 ++ .../util/security/LocalStrings_ko.properties | 3 ++ .../util/security/LocalStrings_zh_CN.properties| 3 ++ .../websocket/server/LocalStrings_es.properties| 1 + .../websocket/server/LocalStrings_fr.properties| 1 + .../websocket/server/LocalStrings_ja.properties| 1 + .../websocket/server/LocalStrings_ko.properties| 1 + .../websocket/server/LocalStrings_zh_CN.properties | 1 +
[VOTE] Release Apache Tomcat 10.1.0-M13
The proposed Apache Tomcat 10.1.0-M13 release is now available for voting. Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 without changes. Java EE applications designed for Tomcat 9 and earlier may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert them to Jakarta EE and copy them to the webapps directory. The notable changes compared to 10.1.0-M12 are: - Update the packaged version of the Tomcat Native Library to 1.2.32 to pick up Windows binaries built with OpenSSL 1.1.1n. - Improve logging of unknown HTTP/2 settings frames. Pull request by Thomas Hoffmann. - Update the JASPIC 2.0 API to Jakarta Authentication 3.0 (JASPIC was renamed for Jakarta EE 10) For full details, see the change log: https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M13/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1364 The tag is: https://github.com/apache/tomcat/tree/10.1.0-M13 faa2582152d9dcbcb444700df340e10a85fc375f The proposed 10.1.0-M13 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 10.1.0-M13 (alpha) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Increment version for next development cycle
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new fefde12 Increment version for next development cycle fefde12 is described below commit fefde123ace5ebaf7691c229c0025827abce41a9 Author: Mark Thomas AuthorDate: Tue Mar 29 23:52:21 2022 +0100 Increment version for next development cycle --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index 9e49bda..4c3bc21 100644 --- a/build.properties.default +++ b/build.properties.default @@ -33,7 +33,7 @@ version.major=10 version.minor=1 version.build=0 version.patch=0 -version.suffix=-M13-dev +version.suffix=-M14-dev # - Reproducible builds - # Uncomment and set to current time for reproducible builds diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index a1429de..199599e 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=10.1.0-M13 +maven.asf.release.deploy.version=10.1.0-M14 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ae875af..b49d9a1 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r53444 - in /dev/tomcat/tomcat-10/v10.1.0-M13: ./ bin/ bin/embed/ src/
Author: markt Date: Tue Mar 29 22:50:47 2022 New Revision: 53444 Log: Upload 10.1.0-M13 for voting Added: dev/tomcat/tomcat-10/v10.1.0-M13/ dev/tomcat/tomcat-10/v10.1.0-M13/KEYS dev/tomcat/tomcat-10/v10.1.0-M13/README.html dev/tomcat/tomcat-10/v10.1.0-M13/RELEASE-NOTES dev/tomcat/tomcat-10/v10.1.0-M13/bin/ dev/tomcat/tomcat-10/v10.1.0-M13/bin/README.html dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13-deployer.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13-deployer.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13-deployer.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13-deployer.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13-deployer.zip.asc dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13-deployer.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13-fulldocs.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13-fulldocs.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13-windows-x64.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13-windows-x64.zip.asc dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13-windows-x64.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13-windows-x86.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13-windows-x86.zip.asc dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13-windows-x86.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13.exe (with props) dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13.exe.asc dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13.exe.sha512 dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13.zip.asc dev/tomcat/tomcat-10/v10.1.0-M13/bin/apache-tomcat-10.1.0-M13.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M13/bin/embed/ dev/tomcat/tomcat-10/v10.1.0-M13/bin/embed/apache-tomcat-10.1.0-M13-embed.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M13/bin/embed/apache-tomcat-10.1.0-M13-embed.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M13/bin/embed/apache-tomcat-10.1.0-M13-embed.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M13/bin/embed/apache-tomcat-10.1.0-M13-embed.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M13/bin/embed/apache-tomcat-10.1.0-M13-embed.zip.asc dev/tomcat/tomcat-10/v10.1.0-M13/bin/embed/apache-tomcat-10.1.0-M13-embed.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M13/src/ dev/tomcat/tomcat-10/v10.1.0-M13/src/apache-tomcat-10.1.0-M13-src.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M13/src/apache-tomcat-10.1.0-M13-src.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M13/src/apache-tomcat-10.1.0-M13-src.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M13/src/apache-tomcat-10.1.0-M13-src.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M13/src/apache-tomcat-10.1.0-M13-src.zip.asc dev/tomcat/tomcat-10/v10.1.0-M13/src/apache-tomcat-10.1.0-M13-src.zip.sha512 Added: dev/tomcat/tomcat-10/v10.1.0-M13/KEYS == --- dev/tomcat/tomcat-10/v10.1.0-M13/KEYS (added) +++ dev/tomcat/tomcat-10/v10.1.0-M13/KEYS Tue Mar 29 22:50:47 2022 @@ -0,0 +1,453 @@ +This file contains the PGP keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-BEGIN PGP PUBLIC KEY BLOCK- +Comment: GPGTools - http://gpgtools.org + +mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX +pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t +6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K +GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz +4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M
[tomcat] 02/06: Back-port remaining updates to jakarta.el translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b7d390d0b11298aa0cf01d982044117c35dd7cdb
Author: Mark Thomas
AuthorDate: Tue Mar 29 23:42:12 2022 +0100
Back-port remaining updates to jakarta.el translations
---
java/jakarta/el/LocalStrings_cs.properties| 38 --
java/jakarta/el/LocalStrings_de.properties| 38 +++---
java/jakarta/el/LocalStrings_es.properties| 44 +++-
java/jakarta/el/LocalStrings_ko.properties| 58 +--
java/jakarta/el/LocalStrings_pt_BR.properties | 37 +++--
java/jakarta/el/LocalStrings_ru.properties| 50 +++
6 files changed, 212 insertions(+), 53 deletions(-)
diff --git a/java/jakarta/el/LocalStrings_cs.properties
b/java/jakarta/el/LocalStrings_cs.properties
index 1d4eed0..5a0e651 100644
--- a/java/jakarta/el/LocalStrings_cs.properties
+++ b/java/jakarta/el/LocalStrings_cs.properties
@@ -13,8 +13,38 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-elProcessor.defineFunctionInvalidMethod=Metoda [{0}] třídy [{1}] není public
static metoda
+beanNameELResolver.beanReadOnly=Název objektu typu bean [{0}] jen pro čtení
-importHandler.ambiguousStaticImport=Statický import [{0}] nelze zpracovat,
neboť koliduje s [{1}] (který byl již naimportován)
-importHandler.classNotFound=Třídu [{0}] nelze naimportovat, neboť nebyla
nalezena
-importHandler.invalidClassNameForStatic=Třída [{0}] uvedená pro statický
import [{1}] není platná
+elProcessor.defineFunctionInvalidClass=Třída [{0}] není veřejná
+elProcessor.defineFunctionInvalidMethod=Metoda [{0}] na třídě [{1}] není
veřejnou statickou metodou
+elProcessor.defineFunctionInvalidParameterList=Seznam parametrů [{0}] pro
metodu [{1}] na třídě [{2}] není platný
+elProcessor.defineFunctionInvalidParameterTypeName=Typ parametru [{0}] pro
metodu [{1}] na třídě [{2}] není platný
+elProcessor.defineFunctionNoMethod=Veřejnou statickou metodu [{0}] pro třídu
[{1}] nelze nalézt
+elProcessor.defineFunctionNullParams=Nejméně jeden ze vstupních parametrů byl
null
+
+expressionFactory.cannotCreate=Nelze vytvořit ExpressionFactory typu [{0}]
+expressionFactory.cannotFind=Nelze najít ExpressionFactory typu [{0}]
+expressionFactory.readFailed=Nezdařilo se přečíst [{0}]
+
+importHandler.ambiguousImport=Třídu [{0}] nelze importovat, protože je v
konfliktu s [{1}], který již byl importován
+importHandler.ambiguousStaticImport=Statický import [{0}] nelze zpracovat,
protože je v konfliktu s [{1}], který již byl importován
+importHandler.classNotFound=Třídu [{0}] nelze importovat, protože ji nelze
nalézt
+importHandler.invalidClassName=Název třídy pro import [{0}] musí obsahovat
balík
+importHandler.invalidClassNameForStatic=Třída [{0}] určená pro statický import
[{1}] není platná
+importHandler.invalidStaticName=Název statické metody nebo pole pro import
[{0}] musí obsahovat třídu
+importHandler.staticNotFound=Statický import [{0}] nebyl nalezen ve třídě
[{1}] pro import [{2}]
+
+lambdaExpression.tooFewArgs=Pouze [{0}] argumentů bylo poskytnuto pro výraz
lambda, který vyžaduje alespoň [{1}]
+
+objectNotAssignable=Nelze přidat objekt typu [{0}] do pole objektů typu [{1}].
+propertyNotFound=Vlastnost [{1}] nebyla nalezena u typu [{0}]
+propertyNotReadable=Vlastnost [{1}] není čitelná u typu [{0}]
+propertyNotWritable=Vlastnost [{1}] není zapisovatelná u typu [{0}]
+propertyReadError=Chyba při čtení [{1}] u typu [{0}]
+propertyWriteError=Chyba pri zápisu [{1}] u typu [{0}]
+
+staticFieldELResolver.methodNotFound=Nebyla nalezena žádná odpovídající
veřejná statická metoda s názvem [{0}] ve třídě [{1}]
+staticFieldELResolver.notWritable=Zápis do statických polí (v tomto případě
pole [{0}] pro třídu [{1}]) není povolen
+
+util.method.ambiguous=Nelze najít jednoznačnou metodu: {0}.{1}({2})
+util.method.notfound=Metoda nebyla nalezena: {0}.{1}({2})
diff --git a/java/jakarta/el/LocalStrings_de.properties
b/java/jakarta/el/LocalStrings_de.properties
index 402e9b5..16fe8c0 100644
--- a/java/jakarta/el/LocalStrings_de.properties
+++ b/java/jakarta/el/LocalStrings_de.properties
@@ -13,10 +13,38 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-elProcessor.defineFunctionInvalidClass=Die Klasse [{0}] ist nicht öffentlich
-elProcessor.defineFunctionInvalidMethod=Die Methode [{0}] der Klasse [{1}] ist
nicht public static
+beanNameELResolver.beanReadOnly=Der Beanname [{0}] ist schreibgeschützt.
-expressionFactory.cannotFind=Kann die ExpressionFactory mit dem Typ [{0}]
nicht finden
+elProcessor.defineFunctionInvalidClass=Die Klasse [{0}] ist nicht öffentlich.
+elProcessor.defineFunctionInvalidMethod=Die Methode [{0}] in der Klasse [{1}]
ist keine öffentliche statische Methode.
[tomcat] 01/06: Back-port updates to Japanese translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b01a94c63e4be0d7695350bf5680147cd909f3af
Author: Mark Thomas
AuthorDate: Tue Mar 29 23:41:03 2022 +0100
Back-port updates to Japanese translations
---
java/jakarta/el/LocalStrings_ja.properties | 62 +++---
.../catalina/connector/LocalStrings_ja.properties | 2 +
.../catalina/core/LocalStrings_ja.properties | 2 +
.../catalina/filters/LocalStrings_ja.properties| 3 ++
.../catalina/mbeans/LocalStrings_ja.properties | 2 +
.../catalina/security/LocalStrings_ja.properties | 2 +
.../catalina/startup/LocalStrings_ja.properties| 1 +
.../catalina/util/LocalStrings_ja.properties | 1 +
.../jasper/resources/LocalStrings_ja.properties| 3 +-
.../tomcat/util/net/LocalStrings_ja.properties | 2 +
.../util/security/LocalStrings_ja.properties | 3 ++
.../websocket/server/LocalStrings_ja.properties| 1 +
webapps/docs/changelog.xml | 3 ++
13 files changed, 55 insertions(+), 32 deletions(-)
diff --git a/java/jakarta/el/LocalStrings_ja.properties
b/java/jakarta/el/LocalStrings_ja.properties
index 151de7e..bf01b2b 100644
--- a/java/jakarta/el/LocalStrings_ja.properties
+++ b/java/jakarta/el/LocalStrings_ja.properties
@@ -13,40 +13,40 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-beanNameELResolver.beanReadOnly=Bean名[{0}]は読み取り専用です
-
-elProcessor.defineFunctionInvalidClass=クラス [{0}] はpublicではありません。
-elProcessor.defineFunctionInvalidMethod=クラス [{1}] のメソッド [{0}] は public static
メソッドではありません。
-elProcessor.defineFunctionInvalidParameterList=クラス [{2}] のメソッド [{1}]
に不正なパラメーターリスト [{0}] が指定されました。
-elProcessor.defineFunctionInvalidParameterTypeName=クラス [{2}] のメソッド [{1}]
のパラメータタイプ [{0}] が無効です
-elProcessor.defineFunctionNoMethod=クラス [{1}] のpublic staticメソッド [{0}]
が見つかりませんでした
-elProcessor.defineFunctionNullParams=1つ以上の入力パラメータがnullでした。
-
-expressionFactory.cannotCreate=型[{0}]のExpressionFactoryを作成できません。
-expressionFactory.cannotFind=[{0}]型のExpressionFactoryを見つけることができません。
-expressionFactory.readFailed=[{0}]の読み取りに失敗しました
-
-importHandler.ambiguousImport=クラス [{0}] はすでにインポートした [{1}] と衝突するためインポートできません。
-importHandler.ambiguousStaticImport=static import [{0}] はすでにインポートした [{1}]
と衝突するため処理できません。
-importHandler.classNotFound=存在しないクラス [{0}] はインポートできません。
+beanNameELResolver.beanReadOnly=Bean 名 [{0}] は読み取り専用です
+
+elProcessor.defineFunctionInvalidClass=クラス [{0}] は public ではありません
+elProcessor.defineFunctionInvalidMethod=クラス [{1}] のメソッド [{0}] は、public static
メソッドではありません
+elProcessor.defineFunctionInvalidParameterList=クラス [{2}]、メソッド [{1}]
のパラメーター・リスト [{0}] は無効です。
+elProcessor.defineFunctionInvalidParameterTypeName=クラス [{2}]、メソッド [{1}]
のパラメーター・タイプ [{0}] は無効です。
+elProcessor.defineFunctionNoMethod=クラス [{1}] の public static メソッド [{0}]
が見つかりませんでした
+elProcessor.defineFunctionNullParams=1 つ以上の入力パラメーターがヌルでした
+
+expressionFactory.cannotCreate=タイプ [{0}] の ExpressionFactory を作成できません
+expressionFactory.cannotFind=タイプ [{0}] の ExpressionFactory が見つかりません
+expressionFactory.readFailed=[{0}] を読み取れませんでした
+
+importHandler.ambiguousImport=クラス [{0}] は、既にインポート済みの [{1}]
と矛盾するため、インポートできませんでした
+importHandler.ambiguousStaticImport=static インポート [{0}] は、既にインポート済みの [{1}]
と矛盾するため、処理できませんでした
+importHandler.classNotFound=クラス [{0}] は、見つからなかったため、インポートできませんでした
importHandler.invalidClass=クラス[{0}]は publicで、(Java 9以降では)
エクスポートされたパッケージ中にあり、非abstract で非インタフェースである必要があります
-importHandler.invalidClassName=インポートするクラスの名前[{0}]にはパッケージが含まれている必要があります
-importHandler.invalidClassNameForStatic=クラス [{0}] の static import [{1}] は無効です
-importHandler.invalidStaticName=インポートするstaticメソッドまたはフィールドの名前[{0}]にはクラスが含まれている必要があります。
-importHandler.staticNotFound=インポート [{2}] の静的インポート [{0}] はクラス [{1}] で見つかりませんでした
+importHandler.invalidClassName=インポートするクラスの名前 [{0}] はパッケージを含む必要があります
+importHandler.invalidClassNameForStatic=static インポート [{1}] に指定されたクラス [{0}]
は無効です
+importHandler.invalidStaticName=インポートする static メソッドまたはフィールドの名前 [{0}]
は、クラスを含まなければなりません
+importHandler.staticNotFound=static インポート [{0}] が、インポート [{2}] のクラス [{1}]
で見つかりませんでした
-lambdaExpression.tooFewArgs=少なくとも [{1}] を必要とするラムダ式に対しては、[{0}] 引数のみが提供されました
+lambdaExpression.tooFewArgs=少なくとも [{1}] 個の引数を必要とするラムダ式に、[{0}] 個の引数しか指定されませんでした
-objectNotAssignable=クラス [{0}] のオブジェクトはクラス [{1}] のオブジェクト配列へ追加できません。
-propertyNotFound=プロパティ [{1}] がタイプ [{0}] で見つかりません
-propertyNotReadable=タイプ [{0}] でプロパティ [{1}] を読み込めません
-propertyNotWritable=プロパティ [{1}] はタイプ [{0}] に書き込み可能ではありません
-propertyReadError=タイプ [{0}] の [{1}] の読み取りエラー
-propertyWriteError=タイプ [{0}] の [{1}] への書き込みエラー
+objectNotAssignable=タイプ [{0}] のオブジェクトをタイプ [{1}] のオブジェクト配列に追加できません
+propertyNotFound=タイプ [{0}] でプロパティー [{1}] が見つかりません
+propertyNotReadable=タイプ [{0}] でプロパティー [{1}] を読み取れません
+propertyNotWritable=タイプ [{0}] でプロパティー [{1}] を書き込めません
+propertyReadError=タイプ [{0}] で
[tomcat] 04/06: Backport updates to Spanish translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ee09c3f59042e426c4ef7382ad5af053047c3285
Author: Mark Thomas
AuthorDate: Tue Mar 29 23:43:39 2022 +0100
Backport updates to Spanish translations
---
.../org/apache/catalina/authenticator/jaspic/LocalStrings_es.properties | 2 ++
java/org/apache/catalina/connector/LocalStrings_es.properties | 2 ++
java/org/apache/catalina/core/LocalStrings_es.properties| 2 ++
java/org/apache/catalina/manager/LocalStrings_es.properties | 1 +
java/org/apache/coyote/http11/LocalStrings_es.properties| 1 +
java/org/apache/tomcat/util/digester/LocalStrings_es.properties | 1 +
java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties | 1 +
java/org/apache/tomcat/websocket/server/LocalStrings_es.properties | 1 +
8 files changed, 11 insertions(+)
diff --git
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_es.properties
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_es.properties
index bfb8e0c..b2d7da9 100644
--- a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_es.properties
+++ b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_es.properties
@@ -15,4 +15,6 @@
authConfigFactoryImpl.zeroLengthAppContext=Un nombre de aplicación con nombre
de contexto de longitud cero no es válido
+persistentProviderRegistrations.deleteFail=El archivo temporal [{0}] no puede
ser eliminado
persistentProviderRegistrations.existsDeleteFail=El archivo temporal [{0}] ya
existe y no puede ser borrado
+persistentProviderRegistrations.moveFail=Fallo al mover [{0}] a [{1}]
diff --git a/java/org/apache/catalina/connector/LocalStrings_es.properties
b/java/org/apache/catalina/connector/LocalStrings_es.properties
index 12f7b6a..341b791 100644
--- a/java/org/apache/catalina/connector/LocalStrings_es.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_es.properties
@@ -59,4 +59,6 @@ inputBuffer.streamClosed=Flujo cerrado
requestFacade.nullRequest=El objeto de requerimiento ha sido reciclado y ya no
está asociado con esta fachada
+response.sendRedirectFail=Fallo al redirigir a [{0}]
+
responseFacade.nullResponse=El objeto de respuesta ha sido reciclado y ya no
está asociado con esta fachada
diff --git a/java/org/apache/catalina/core/LocalStrings_es.properties
b/java/org/apache/catalina/core/LocalStrings_es.properties
index 89d247d..08b2245 100644
--- a/java/org/apache/catalina/core/LocalStrings_es.properties
+++ b/java/org/apache/catalina/core/LocalStrings_es.properties
@@ -30,6 +30,8 @@ applicationContext.resourcePaths.iae=La Trayectoria [{0}] no
comienza con carác
applicationContext.role.iae=Un rol individual que se ha de declarar para el
contexto [{0}] no puede ser nulo o cadena vacía
applicationContext.roles.iae=Un arreglo de roles que se ha de declarar para el
contexto [{0}] no puede ser nulo o cadena vacía
applicationContext.setAttribute.namenull=El nombre no puede ser nulo
+applicationContext.setInitParam.ise=No es posible establecer parámetros de
inicialización luego de la inicialización del contexto
+applicationContext.setResponseEncoding.ise=Imposible establecer codificación
de respuesta para contexto [{0}], el contexto ya ha sido inicializado
applicationContext.setSessionTimeout.ise=El timeout de la sesión no pudo ser
fijado para el contexto [{0}] debido a que el contexto ha sido inicializado
applicationContext.setSessionTracking.iae.invalid=El modo de seguimiento de
sesión [{0}] requerido para el contexto [{1}] no está soportado por este
contexto
applicationContext.setSessionTracking.iae.ssl=Los modos de seguimiento de
sesión requeridos para el contexto [{0}], incluyó SSL y al menos otro modo. SSL
no se puede configurar con otros modos.
diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties
b/java/org/apache/catalina/manager/LocalStrings_es.properties
index 298767f..5fabfeb 100644
--- a/java/org/apache/catalina/manager/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_es.properties
@@ -28,6 +28,7 @@ htmlManagerServlet.appsVersion=Versión
htmlManagerServlet.connectorStateProcessingTime=Tiempo de procesamiento:
htmlManagerServlet.connectorStateTableTitleRequest=Solicitud
htmlManagerServlet.connectorStateTableTitleVHost=VHost
+htmlManagerServlet.connectorStateThreadBusy=Hilos ocupados actualmente:
htmlManagerServlet.deployButton=Desplegar
htmlManagerServlet.deployConfig=URL de archivo de Configuración XML:
htmlManagerServlet.deployPath=Trayectoria de Contexto (opcional):
diff --git a/java/org/apache/coyote/http11/LocalStrings_es.properties
b/java/org/apache/coyote/http11/LocalStrings_es.properties
index 422a2ad..9114044 100644
--- a/java/org/apache/coyote/http11/LocalStrings_es.properties
+++
[tomcat] 06/06: Backport updates to Chinese translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 205ef949add15e2991e7f795e35343441e725151
Author: Mark Thomas
AuthorDate: Tue Mar 29 23:44:34 2022 +0100
Backport updates to Chinese translations
---
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties| 3 +++
java/org/apache/jasper/resources/LocalStrings_zh_CN.properties| 1 +
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/tomcat/util/security/LocalStrings_zh_CN.properties| 3 +++
java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties | 1 +
5 files changed, 10 insertions(+)
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 0a79c8f..7ee13f9 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+abstractStream.setConnectionAllocationMade=连接 [{0}]，流 [{1}]，连接分配从 [{2}] 更改为
[{3}]
+abstractStream.setConnectionAllocationRequested=连接 [{0}]，流 [{1}]，请求的连接分配从
[{2}] 更改为 [{3}]
abstractStream.windowSizeDec=连接[{0}]，流[{1}]，将流控制窗口减少[{2}]到[{3}]
abstractStream.windowSizeInc=连接 [{0}], 流 [{1}], 增加流量控制窗口[{2}] 到 [{3}]
abstractStream.windowSizeTooBig=连接[{0}]，流[{1}]，窗口大小从[{2}]增加到[{3}]，超过了允许的最大值
@@ -144,6 +146,7 @@ upgradeHandler.releaseBacklog=连接[{0}]，流[{1}]已从待办事项列表中
upgradeHandler.reset.receive=连接[{0}],流[{1}],由于[{2}]而重置
upgradeHandler.rst.debug=连接[{0}]，流[{1}]，错误[{2}]，消息[{3}]，RST（关闭流）
upgradeHandler.sendPrefaceFail=连接[{0}]，给客户端发送前言失败
+upgradeHandler.sendfile.reservation=在发送文件写入之前的连接 [{0}]、流 [{1}]、连接预留 [{2}]、流预留
[{3}]
upgradeHandler.socketCloseFailed=关闭 socket 错误
upgradeHandler.startRequestBodyFrame.result=连接[{0}],流[{1}]startRequestBodyFrame返回[{2}]
upgradeHandler.stream.closed=流[{0}]已经关闭了一段时间
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index 77e7c64..78c43ea 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -49,6 +49,7 @@ jsp.error.cannotAddResolver=在第一次请求发生之后不能调用addELResol
jsp.error.classname=无法从.class文件确定类名
jsp.error.coerce_to_type=无法将值[{2}]强制为属性[{0}]的类型[{1}]。
jsp.error.compilation=编译文件时出错：[{0}[{1}]
+jsp.error.compilation.dependent=加载类[{0}]失败
jsp.error.compilation.jdt=编译错误
jsp.error.compilation.jdtProblemError=处理JDT问题列表时出错
jsp.error.compilation.source=加载源文件时出错[{0}]
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 827e4da..d759e22 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -80,6 +80,7 @@ endpoint.debug.unlock.localFail=无法确定[{0}]的本地地址
endpoint.debug.unlock.localNone=无法解除 [{0}] 的接受器，因为本地地址不可用
endpoint.duplicateSslHostName=为主机名[{0}]提供了多个SSLHostConfig元素。主机名必须唯一
endpoint.err.close=抓住异常试图关闭socket
+endpoint.err.duplicateAccept=检测到重复接收。这是一个已知的操作系统错误。请考虑报告您受到影响：https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1924298
endpoint.err.handshake=握手失败
endpoint.err.unexpected=处理套接字时意外错误
endpoint.executor.fail=执行器拒绝了用于处理的套接字[{0}]
@@ -160,6 +161,7 @@ sslHostConfig.certificateVerificationInvalid=证书认证值[{0}]未识别
sslHostConfig.fileNotFound=配置文件 [{0}] 不存在
sslHostConfig.invalid_truststore_password=提供的信任存储密码无法用于解锁和/或验证信任存储。正在重试使用空密码访问信任存储，该密码将跳过验证。
sslHostConfig.mismatch=属性[{0}]是在名为[{1}]的SSLHostConfig
上设置的，用于[{2}]配置语法，但SSLHostConfig 正与[{3}]配置语法一起使用
+sslHostConfig.opensslconf.alreadyset=尝试设置的另一个 OpenSSLConf 被忽略\n
sslHostConfig.opensslconf.null=(:忽略设置空OpenSSLConf 的尝试
sslHostConfig.prefix_missing=协议[{0}]已添加到名为[{1}]的SSLHostConfig
上的协议列表中。检查是否缺少一个+/-前缀。
diff --git a/java/org/apache/tomcat/util/security/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/security/LocalStrings_zh_CN.properties
index 7864aaf..bc021bb 100644
--- a/java/org/apache/tomcat/util/security/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/security/LocalStrings_zh_CN.properties
@@ -14,3 +14,6 @@
# limitations under the License.
concurrentMessageDigest.noDigest=摘要算法不可用
+
+privilegedSetAccessControlContext.lookupFailed=无法获取对字段
Thread.inheritedAccessControlContext 的引用
+privilegedSetAccessControlContext.setFailed=无法设置字段
Thread.inheritedAccessControlContext
diff --git
a/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties
index a41b171..3b7231a 100644
--- a/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties
+++
[tomcat] 03/06: Backport updates to German translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2eed18b3cc8baf9984a34b04d7d882eb38266a46
Author: Mark Thomas
AuthorDate: Tue Mar 29 23:43:18 2022 +0100
Backport updates to German translations
---
java/org/apache/catalina/authenticator/LocalStrings_de.properties | 2 ++
java/org/apache/catalina/manager/host/LocalStrings_de.properties | 2 ++
java/org/apache/catalina/session/LocalStrings_de.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_de.properties | 3 +++
.../util/scan => catalina/tribes/group}/LocalStrings_de.properties| 3 +--
.../catalina/tribes/group/interceptors/LocalStrings_de.properties | 1 +
java/org/apache/catalina/tribes/io/LocalStrings_de.properties | 1 +
.../catalina/tribes/membership/cloud/LocalStrings_de.properties | 2 ++
java/org/apache/coyote/http11/LocalStrings_de.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings_de.properties | 4 +++-
java/org/apache/tomcat/util/http/parser/LocalStrings_de.properties| 1 +
java/org/apache/tomcat/util/net/LocalStrings_de.properties| 2 +-
java/org/apache/tomcat/util/scan/LocalStrings_de.properties | 1 +
13 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_de.properties
b/java/org/apache/catalina/authenticator/LocalStrings_de.properties
index e5cdbcf..2915397 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_de.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_de.properties
@@ -17,7 +17,9 @@ authenticator.certificates=Keine Client Zertifikatskette im
Request
authenticator.check.found=Bereits authentifiziert [{0}]
authenticator.jaspicCleanSubjectFail=Konnte JASPIC Subject nicht leeren.
authenticator.jaspicServerAuthContextFail=Kontte keine JASPIC
ServerAuthContext Instanz erhalten
+authenticator.sessionExpired=Die erlaubte Zeit für den Login-Prozess wurde
überschritten. Wenn sie weiter machen wollen müssen sie entweder zwei mal
zurück klicken und den angeforderten Link erneut klicken oder den Browser
schließen und wieder öffnen
singleSignOn.debug.cookieCheck=SSO prüfe nach SSO Cookie
singleSignOn.debug.principalFound=SSO fand Principal [{0}] mut Authentication
Typ [{1}] im Cache
+singleSignOn.debug.removeSession=SSO entfernt Applications-Session [{0}] von
SSO Session [{1}]
singleSignOn.sessionExpire.hostNotFound=SSO kann Session [{0}] nicht ablaufen
lassen, da der Host nicht gefunden werden konnte
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_de.properties
b/java/org/apache/catalina/manager/host/LocalStrings_de.properties
index fbc87c3..c2b7355 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_de.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_de.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+hostManagerServlet.alreadyStarted=FEHLER - Host [{0}] wurde bereits gestartet
hostManagerServlet.listed=OK - Hosts aufgelistet
hostManagerServlet.managerXml=FAIL - Konnte manager.xml nicht installieren
hostManagerServlet.start=start: Starte Host mit Name [{0}]
@@ -33,4 +34,5 @@ htmlHostManagerServlet.hostsStart=Start
htmlHostManagerServlet.hostsStop=Stopp
htmlHostManagerServlet.manager=Host-Manager
htmlHostManagerServlet.messageLabel=Nachricht:
+htmlHostManagerServlet.persistTitle=Speichere Konfiguration
htmlHostManagerServlet.serverOSArch=Betriebssystemarchitektur
diff --git a/java/org/apache/catalina/session/LocalStrings_de.properties
b/java/org/apache/catalina/session/LocalStrings_de.properties
index a672c06..1e1cc89 100644
--- a/java/org/apache/catalina/session/LocalStrings_de.properties
+++ b/java/org/apache/catalina/session/LocalStrings_de.properties
@@ -28,4 +28,5 @@ standardManager.loading.exception=Ausnahme beim Laden der
persistierten Sitzunge
standardManager.managerLoad=Ausnahme beim Laden der Sitzungen aus dem
Persistenten Speicher
standardManager.managerUnload=Fehler beim Entladen der Session zu persistenten
Speicher
+standardSession.getAttributeNames.ise=getAttributeNames: Session bereits
ungültig
standardSession.notSerializable=Kann Session Attribut [{0}] für Sitzung [{1}]
nicht serialisieren
diff --git a/java/org/apache/catalina/startup/LocalStrings_de.properties
b/java/org/apache/catalina/startup/LocalStrings_de.properties
index 083e467..56f5b16 100644
--- a/java/org/apache/catalina/startup/LocalStrings_de.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_de.properties
@@ -22,6 +22,7 @@ contextConfig.contextMissing=Fehlende context.xml: [{0}]
contextConfig.defaultMissing=Keine globale web.xml gefunden
contextConfig.defaultPosition=Vorgekommen in Zeile [{0}] Spalte [{1}]
[tomcat] 05/06: Backport updates to Korean translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6f7d418fa63d3602e2d8aa4ac98a5e20a2524a85
Author: Mark Thomas
AuthorDate: Tue Mar 29 23:43:51 2022 +0100
Backport updates to Korean translations
---
java/org/apache/catalina/core/LocalStrings_ko.properties | 2 ++
java/org/apache/catalina/filters/LocalStrings_ko.properties| 3 +++
java/org/apache/catalina/mbeans/LocalStrings_ko.properties | 2 ++
java/org/apache/catalina/security/LocalStrings_ko.properties | 2 ++
java/org/apache/catalina/startup/LocalStrings_ko.properties| 1 +
java/org/apache/jasper/resources/LocalStrings_ko.properties| 1 +
java/org/apache/tomcat/util/net/LocalStrings_ko.properties | 1 +
java/org/apache/tomcat/util/security/LocalStrings_ko.properties| 3 +++
java/org/apache/tomcat/websocket/server/LocalStrings_ko.properties | 1 +
9 files changed, 16 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 30d4a92..971cd04 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -146,6 +146,8 @@ jreLeakListener.jarUrlConnCacheFail=기본 설정으로서, Jar URL 연결 캐
jreLeakListener.ldapPoolManagerFail=가능성 있는 메모리 누수들을 방지하기 위하여, Tomcat이 시작하는 동안,
com.sun.jndi.ldap.LdapPoolManager 클래스 생성을 개시하지 못했습니다. 이는 Sun JVM들이 아닌 환경에서 발생할
수 있습니다.
jreLeakListener.xmlParseFail=XML 파싱하는 과정에서, 메모리 누수들을 방지하려 시도하는 중 오류 발생
+listener.notServer=리스너 엘리먼트는 서버 엘리먼트 내에 위치해야 합니다만, 현재 [{0}] 내에 있습니다.
+
naming.addEnvEntry=Environment 엔트리 [{0}]을(를) 추가합니다.
naming.addResourceEnvRef=리소스 env ref [{0}]을(를) 추가합니다.
naming.bindFailed=객체를 바인딩하지 못했습니다: [{0}]
diff --git a/java/org/apache/catalina/filters/LocalStrings_ko.properties
b/java/org/apache/catalina/filters/LocalStrings_ko.properties
index bebae92..5067898 100644
--- a/java/org/apache/catalina/filters/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_ko.properties
@@ -62,7 +62,10 @@ remoteIpFilter.invalidRemoteAddress=보고된 원격 주소 [{0}](이)가 유효
requestFilter.deny=프로퍼티 [{1}]에 기반하여, [{0}]을(를) 위한 요청이 거부되었습니다.
+restCsrfPreventionFilter.fetch.debug=CSRF Fetch 요청이 성공적으로 처리되었습니다 - 응답에 nonce가
추가되었습니다. 요청 메소드: [{0}], URI [{1}].
restCsrfPreventionFilter.invalidNonce=CSRF nonce validation 실패
+restCsrfPreventionFilter.invalidNonce.debug=REST를 위한 CSRF 유효성 검증 실패! 메소드가
[{0}]이고 URI가 [{1}]인 요청이 거절될 것입니다. 상세정보: 요청이 세션 ID를 포함했는지 여부 [{2}]; 요청된 세션이
존재하는지 여부 [{3}]; CSRF nonce가 요청에 존재하는지 여부 [{4}]; CSRF nonce가 세션에 존재하는지 여부 [{5}].
+restCsrfPreventionFilter.multipleNonce.debug=다른 CSRF nonce들이 요청 파라미터들로
전달되었습니다만, 그것들 중 어느 것도 사용되지 않을 것입니다. 요청 메소드: [{0}], URI [{1}].
webDavFilter.xpProblem=WebdavFixFilter: XP-x64-SP2 클라이언트는, WebDAV 서블릿과 정상 동작하지
않는 것으로 알려져 있습니다.
webDavFilter.xpRootContext=WebdavFixFilter: XP-x64-SP2 클라이언트는, 오직 루트 컨텍스트와 정상
동작할 것입니다.
diff --git a/java/org/apache/catalina/mbeans/LocalStrings_ko.properties
b/java/org/apache/catalina/mbeans/LocalStrings_ko.properties
index c882873..377dbbc 100644
--- a/java/org/apache/catalina/mbeans/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/mbeans/LocalStrings_ko.properties
@@ -23,6 +23,8 @@ globalResources.createError.userDatabase.user=사용자 [{0}]을(를)
위한 사
globalResources.noNamingContext=서버를 위한 글로벌 Naming 컨텍스트가 정의되지 않았습니다.
globalResources.userDatabaseCreateError=[{0}]을(를) 위한 사용자 데이터베이스 MBean들을 생성하는 중
예외 발생
+listener.notServer=리스너 엘리먼트는 서버 엘리먼트 내에 위치해야 합니다만, 현재 [{0}] 내에 있습니다.
+
mBean.attributeNotFound=속성 [{0}]을(를) 찾을 수 없습니다.
mBean.nullAttribute=속성이 널입니다.
mBean.nullName=속성 이름이 널입니다.
diff --git a/java/org/apache/catalina/security/LocalStrings_ko.properties
b/java/org/apache/catalina/security/LocalStrings_ko.properties
index fc0e72b..0448fb2 100644
--- a/java/org/apache/catalina/security/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/security/LocalStrings_ko.properties
@@ -20,3 +20,5 @@ SecurityListener.checkUmaskSkip=umask를 결정할 수 없습니다. Tomcat이 W
SecurityListener.checkUserWarning=사용자 [{0}](으)로서 실행하면서, 프로그램 시작이 시도 되었습니다. 이
사용자로서 Tomcat을 실행하는 것은, Lifecycle 리스너인
org.apache.catalina.security.SecurityListener (보통
CATALINA_BASE/conf/server.xml에서 설정)에 의해 차단되었습니다.
SecurityUtil.doAsPrivilege=PrivilegedExceptionAction 블록을 실행하는 중 예외가 발생했습니다.
+
+listener.notServer=리스너 엘리먼트는 서버 엘리먼트 내에 위치해야 합니다만, 현재 [{0}] 내에 있습니다.
diff --git a/java/org/apache/catalina/startup/LocalStrings_ko.properties
b/java/org/apache/catalina/startup/LocalStrings_ko.properties
index 0f5f08f..967dc36 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ko.properties
@@ -146,6 +146,7 @@ hostConfig.undeploy=컨텍스트 [{0}]의 배치를 제거합니다.
hostConfig.undeployVersion=활성화된 세션이 없는, 컨텍스트 [{0}]의 이전 버전의 배치를 제거합니다.
listener.createFailed=선택 사항인 리스터 [{0}]이(가)
[tomcat] branch 10.0.x updated (d0e4a75 -> 205ef94)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from d0e4a75 Backport updates to French translations
new b01a94c Back-port updates to Japanese translations
new b7d390d Back-port remaining updates to jakarta.el translations
new 2eed18b Backport updates to German translations
new ee09c3f Backport updates to Spanish translations
new 6f7d418 Backport updates to Korean translations
new 205ef94 Backport updates to Chinese translations
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:
java/jakarta/el/LocalStrings_cs.properties | 38 +++--
java/jakarta/el/LocalStrings_de.properties | 38 +++--
java/jakarta/el/LocalStrings_es.properties | 44 +++
java/jakarta/el/LocalStrings_ja.properties | 62 +++---
java/jakarta/el/LocalStrings_ko.properties | 58 ++--
java/jakarta/el/LocalStrings_pt_BR.properties | 37 +++--
java/jakarta/el/LocalStrings_ru.properties | 50 +
.../authenticator/LocalStrings_de.properties | 2 +
.../jaspic/LocalStrings_es.properties | 2 +
.../catalina/connector/LocalStrings_es.properties | 2 +
.../catalina/connector/LocalStrings_ja.properties | 2 +
.../catalina/core/LocalStrings_es.properties | 2 +
.../catalina/core/LocalStrings_ja.properties | 2 +
.../catalina/core/LocalStrings_ko.properties | 2 +
.../catalina/filters/LocalStrings_ja.properties| 3 ++
.../catalina/filters/LocalStrings_ko.properties| 3 ++
.../catalina/manager/LocalStrings_es.properties| 1 +
.../manager/host/LocalStrings_de.properties| 2 +
.../catalina/mbeans/LocalStrings_ja.properties | 2 +
.../catalina/mbeans/LocalStrings_ko.properties | 2 +
.../catalina/security/LocalStrings_ja.properties | 2 +
.../catalina/security/LocalStrings_ko.properties | 2 +
.../catalina/session/LocalStrings_de.properties| 1 +
.../catalina/startup/LocalStrings_de.properties| 3 ++
.../catalina/startup/LocalStrings_ja.properties| 1 +
.../catalina/startup/LocalStrings_ko.properties| 1 +
.../group}/LocalStrings_de.properties | 2 +-
.../group/interceptors/LocalStrings_de.properties | 1 +
.../catalina/tribes/io/LocalStrings_de.properties | 1 +
.../membership/cloud/LocalStrings_de.properties| 2 +
.../catalina/util/LocalStrings_ja.properties | 1 +
.../coyote/http11/LocalStrings_de.properties | 2 +-
.../coyote/http11/LocalStrings_es.properties | 1 +
.../coyote/http2/LocalStrings_zh_CN.properties | 3 ++
.../jasper/resources/LocalStrings_de.properties| 4 +-
.../jasper/resources/LocalStrings_ja.properties| 3 +-
.../jasper/resources/LocalStrings_ko.properties| 1 +
.../jasper/resources/LocalStrings_zh_CN.properties | 1 +
.../util/digester/LocalStrings_es.properties | 1 +
.../util/http/parser/LocalStrings_de.properties| 1 +
.../tomcat/util/net/LocalStrings_de.properties | 2 +-
.../tomcat/util/net/LocalStrings_ja.properties | 2 +
.../tomcat/util/net/LocalStrings_ko.properties | 1 +
.../tomcat/util/net/LocalStrings_zh_CN.properties | 2 +
.../util/net/openssl/LocalStrings_es.properties| 1 +
.../tomcat/util/scan/LocalStrings_de.properties| 1 +
.../util/security/LocalStrings_ja.properties | 3 ++
.../util/security/LocalStrings_ko.properties | 3 ++
.../util/security/LocalStrings_zh_CN.properties| 3 ++
.../websocket/server/LocalStrings_es.properties| 1 +
.../websocket/server/LocalStrings_ja.properties| 1 +
.../websocket/server/LocalStrings_ko.properties| 1 +
.../websocket/server/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml | 3 ++
54 files changed, 324 insertions(+), 89 deletions(-)
create mode 100644 java/jakarta/el/LocalStrings_ru.properties
copy java/org/apache/catalina/{ha/authenticator =>
tribes/group}/LocalStrings_de.properties (85%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Backport updates to French translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d0e4a758dd4b2a7d278b75b93e4ab27786031285
Author: Mark Thomas
AuthorDate: Tue Mar 29 23:40:12 2022 +0100
Backport updates to French translations
---
java/jakarta/el/LocalStrings_fr.properties | 52 +++---
.../catalina/connector/LocalStrings_fr.properties | 2 +
.../catalina/core/LocalStrings_fr.properties | 2 +
.../catalina/filters/LocalStrings_fr.properties| 3 ++
.../catalina/mbeans/LocalStrings_fr.properties | 2 +
.../catalina/security/LocalStrings_fr.properties | 2 +
.../catalina/startup/LocalStrings_fr.properties| 1 +
.../catalina/util/LocalStrings_fr.properties | 1 +
.../tomcat/util/net/LocalStrings_fr.properties | 2 +
.../util/security/LocalStrings_fr.properties | 3 ++
.../websocket/server/LocalStrings_fr.properties| 1 +
webapps/docs/changelog.xml | 3 ++
12 files changed, 48 insertions(+), 26 deletions(-)
diff --git a/java/jakarta/el/LocalStrings_fr.properties
b/java/jakarta/el/LocalStrings_fr.properties
index 384b2a4..75b4889 100644
--- a/java/jakarta/el/LocalStrings_fr.properties
+++ b/java/jakarta/el/LocalStrings_fr.properties
@@ -17,36 +17,36 @@ beanNameELResolver.beanReadOnly=Le nom de bean [{0}] est en
lecture seule
elProcessor.defineFunctionInvalidClass=La classe [{0}] n''est pas publique
elProcessor.defineFunctionInvalidMethod=La méthode [{0}] sur la classe [{1}]
n''est pas une méthode statique publique
-elProcessor.defineFunctionInvalidParameterList=La liste de paramètres [{0}]
pour la méthode [{1}] de la classe [{2}] n''est pas valide
-elProcessor.defineFunctionInvalidParameterTypeName=Le type [{0}] du paramètre
de la méthode [{1}] sur la classe [{2}] n''est pas valide
-elProcessor.defineFunctionNoMethod=Une méthode statique et publique [{0}] n''a
pas pu être trouvée sur la classe [{1}]
-elProcessor.defineFunctionNullParams=On ou plusieurs paramètres d'entrée sont
null
-
-expressionFactory.cannotCreate=Impossible de créer une ExpressionFactory de
type [{0}]
-expressionFactory.cannotFind=Impossible de trouver une ExpressionFactory de
type [{0}]
-expressionFactory.readFailed=Impossible de lire [{0}]
-
-importHandler.ambiguousImport=La classe [{0}] n''a pas pu être importée car
elle entre en conflit avec [{1}] qui a déjà été importée
-importHandler.ambiguousStaticImport=L''import statique [{0}] ne peut pas être
traité parce qu''il est en conflit avec [{1}] qui a déjà été importé
-importHandler.classNotFound=La classe [{0}] n''a pu être importée, vu qu''on
ne l''a pas trouvée
+elProcessor.defineFunctionInvalidParameterList=La liste de paramètres [{0}]
pour la méthode [{1}] sur la classe [{2}] n''est pas valide
+elProcessor.defineFunctionInvalidParameterTypeName=Le type de paramètre [{0}]
pour la méthode [{1}] sur la classe [{2}] n''est pas valide
+elProcessor.defineFunctionNoMethod=Une méthode statique publique [{0}] sur la
classe [{1}] est introuvable
+elProcessor.defineFunctionNullParams=Un ou plusieurs des paramètres en entrée
avaient une valeur nulle
+
+expressionFactory.cannotCreate=Impossible de créer ExpressionFactory de type
[{0}]
+expressionFactory.cannotFind=Impossible de trouver ExpressionFactory de type
[{0}]
+expressionFactory.readFailed=Echec de lecture de [{0}]
+
+importHandler.ambiguousImport=.La classe [{0}] n''a pas pu être importée car
elle est en conflit avec [{1}] qui est déjà importé
+importHandler.ambiguousStaticImport=L''importation statique [{0}] n''a pas pu
être traitée car elle est en conflit avec [{1}] qui est déjà importé
+importHandler.classNotFound=La classe [{0}] n''a pas pu être importée car elle
est introuvable
importHandler.invalidClass=La classe [{0}] doit être publique, non abstraite,
ne pas être une interface et (pour Java 9+) être dans un package exporté
-importHandler.invalidClassName=Le nom de la classe à importer [{0}] doit
comprendre un paquet
-importHandler.invalidClassNameForStatic=La classe [{0}] spécifiée pour
l''import statique [{1}] n''est pas valide
-importHandler.invalidStaticName=Le nom de la méthode statique ou champ à
importer [{0}] doit inclure une calsse
-importHandler.staticNotFound=L''importation statique [{0}] n''a pas été
trouvée dans la classe [{1}] pour [{2}]
+importHandler.invalidClassName=Le nom de la classe à importer [{0}] doit
inclure un package
+importHandler.invalidClassNameForStatic=La classe [{0}] spécifiée pour
l''importation statique [{1}] n''est pas valide
+importHandler.invalidStaticName=Le nom de la méthode ou de la zone statique à
importer [{0}] doit inclure une classe
+importHandler.staticNotFound=L''importation statique [{0}] est introuvable
dans la classe [{1}] pour l''importation [{2}]
-lambdaExpression.tooFewArgs=Seuls [{0}] arguments ont été fournis pour une
expression lambda qui en
[tomcat] 01/02: Backport updates to Chinese translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 87c98dcff5b60ed55390f12f7cc68635003349f8
Author: Mark Thomas
AuthorDate: Tue Mar 29 23:38:26 2022 +0100
Backport updates to Chinese translations
---
java/jakarta/el/LocalStrings_zh_CN.properties | 60 +++---
.../connector/LocalStrings_zh_CN.properties| 2 +
.../catalina/core/LocalStrings_zh_CN.properties| 2 +
.../catalina/filters/LocalStrings_zh_CN.properties | 3 ++
.../catalina/mbeans/LocalStrings_zh_CN.properties | 2 +
.../security/LocalStrings_zh_CN.properties | 2 +
.../catalina/startup/LocalStrings_zh_CN.properties | 3 +-
.../catalina/util/LocalStrings_zh_CN.properties| 1 +
.../catalina/valves/LocalStrings_zh_CN.properties | 2 +-
webapps/docs/changelog.xml | 7 +++
10 files changed, 52 insertions(+), 32 deletions(-)
diff --git a/java/jakarta/el/LocalStrings_zh_CN.properties
b/java/jakarta/el/LocalStrings_zh_CN.properties
index 434064f..249aad3 100644
--- a/java/jakarta/el/LocalStrings_zh_CN.properties
+++ b/java/jakarta/el/LocalStrings_zh_CN.properties
@@ -13,40 +13,40 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-beanNameELResolver.beanReadOnly=名称为[{0}]的bean只读
-
-elProcessor.defineFunctionInvalidClass=类[{0}]不是公共的
-elProcessor.defineFunctionInvalidMethod=类[{1}]的方法[{0}]不是公共静态方法
-elProcessor.defineFunctionInvalidParameterList=类[{2}]的方法[{1}]的参数列表[{0}]无效
-elProcessor.defineFunctionInvalidParameterTypeName=类[{2}]的方法[{1}]的参数类型[{0}]无效
-elProcessor.defineFunctionNoMethod=无法找到类[{1}]的公共静态方法[{0}]
-elProcessor.defineFunctionNullParams=一个或多个输入参数为null
-
-expressionFactory.cannotCreate=无法创建类型为[{0}]的表达式工厂
-expressionFactory.cannotFind=找不到类型为[{0}]的ExpressionFactory
-expressionFactory.readFailed=无法读取[{0}]
-
-importHandler.ambiguousImport=无法导入类[{0}]，因为它与已导入的[{1}]冲突
-importHandler.ambiguousStaticImport=无法处理静态导入[{0}]，因为它与已导入的[{1}]冲突
-importHandler.classNotFound=无法导入类[{0}]，因为无法找到它
+beanNameELResolver.beanReadOnly=Bean 名称 [{0}] 为只读项
+
+elProcessor.defineFunctionInvalidClass=类 [{0}] 不是公共类
+elProcessor.defineFunctionInvalidMethod=类 [{1}] 上的方法 [{0}] 不是公共静态方法
+elProcessor.defineFunctionInvalidParameterList=类 [{2}] 上方法 [{1}] 的参数列表 [{0}] 无效
+elProcessor.defineFunctionInvalidParameterTypeName=类 [{2}] 上方法 [{1}] 的参数类型
[{0}] 无效
+elProcessor.defineFunctionNoMethod=找不到类 [{1}] 上的公共静态方法 [{0}]
+elProcessor.defineFunctionNullParams=一个或多个输入参数为 null
+
+expressionFactory.cannotCreate=无法创建类型为 [{0}] 的 ExpressionFactory
+expressionFactory.cannotFind=找不到类型为 [{0}] 的 ExpressionFactory
+expressionFactory.readFailed=未能读取 [{0}]
+
+importHandler.ambiguousImport=未能导入类 [{0}]，因为它和已导入的 [{1}] 冲突
+importHandler.ambiguousStaticImport=未能处理静态导入 [{0}]，因为它和已导入的 [{1}] 冲突
+importHandler.classNotFound=未能导入类 [{0}]，因为找不到该类
importHandler.invalidClass=类[{0}]必须是公共的、非抽象的、非接口且（对于Java 9+）在一个导出包
-importHandler.invalidClassName=要导入的类的名称[{0}]必须包含一个包。
-importHandler.invalidClassNameForStatic=类[{0}]指定的静态导入[{1}]无效
-importHandler.invalidStaticName=导入 [{0}] 的静态方法或字段名称必须包含类
-importHandler.staticNotFound=导入[{2}]的类[{1}]中找不到静态导入[{0}]
+importHandler.invalidClassName=要导入的类的名称 [{0}] 必须包含软件包
+importHandler.invalidClassNameForStatic=为静态导入 [{1}] 指定的类 [{0}] 无效
+importHandler.invalidStaticName=要导入的静态方法或字段的名称 [{0}] 必须包含类
+importHandler.staticNotFound=在导入 [{2}] 的类 [{1}] 中找不到静态导入 [{0}]
-lambdaExpression.tooFewArgs=仅为至少需要[{1}]个参数的lambda表达式提供了[{0}]个参数
+lambdaExpression.tooFewArgs=对于至少需要 [{1}] 的 lambda 表达式，仅提供了 [{0}] 个自变量
-objectNotAssignable=无法将类型为[{0}]的对象添加到[{1}]类型的对象数组中
-propertyNotFound=类型[{0}]上找不到属性[{1}]
-propertyNotReadable=属性[{1}]在类型[{0}]上不可读
-propertyNotWritable=属性[{1}]在类型[{0}]上不可写
-propertyReadError=在类型[{0}]上读取[{1}]时出错
-propertyWriteError=在类型[{0}]上写入[{1}]时出错
+objectNotAssignable=无法将类型为 [{0}] 的对象添加到类型为 [{1}] 的对象阵列
+propertyNotFound=在类型 [{0}] 上未找到属性 [{1}]
+propertyNotReadable=属性 [{1}] 在类型 [{0}] 上不可读
+propertyNotWritable=属性 [{1}] 在类型 [{0}] 上不可写
+propertyReadError=在类型 [{0}] 上读取 [{1}] 时出错
+propertyWriteError=在类型 [{0}] 上写入 [{1}] 时出错
-staticFieldELResolver.methodNotFound=在类[{1}]上找不到名为[{0}]的匹配的公共静态方法
+staticFieldELResolver.methodNotFound=在类 [{1}] 上，找不到名为 [{0}] 的匹配公共静态方法
staticFieldELResolver.notFound=（Java 9+导出）类[{1}]上找不到名为[{0}]的公共静态字段
-staticFieldELResolver.notWritable=不允许写入静态字段（当前情况中为类[{1}]上的字段[{0}]）
+staticFieldELResolver.notWritable=不允许写入静态字段（在此情况下，这是类 [{1}] 上的字段 [{0}]）
-util.method.ambiguous=无法找到明确的方法：{0}.{1}({2})
+util.method.ambiguous=找不到明确的方法：{0}.{1}({2})
util.method.notfound=找不到方法：{0}.{1}({2})
diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index 0dc26ad..d6987d2 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -37,8 +37,10 @@
[tomcat] branch 10.0.x updated (3d3b03b -> d0e4a75)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 3d3b03b Set timestamp (currently unused) for next release new 87c98dc Backport updates to Chinese translations new d0e4a75 Backport updates to French translations 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: java/jakarta/el/LocalStrings_fr.properties | 52 +-- java/jakarta/el/LocalStrings_zh_CN.properties | 60 +++--- .../catalina/connector/LocalStrings_fr.properties | 2 + .../connector/LocalStrings_zh_CN.properties| 2 + .../catalina/core/LocalStrings_fr.properties | 2 + .../catalina/core/LocalStrings_zh_CN.properties| 2 + .../catalina/filters/LocalStrings_fr.properties| 3 ++ .../catalina/filters/LocalStrings_zh_CN.properties | 3 ++ .../catalina/mbeans/LocalStrings_fr.properties | 2 + .../catalina/mbeans/LocalStrings_zh_CN.properties | 2 + .../catalina/security/LocalStrings_fr.properties | 2 + .../security/LocalStrings_zh_CN.properties | 2 + .../catalina/startup/LocalStrings_fr.properties| 1 + .../catalina/startup/LocalStrings_zh_CN.properties | 3 +- .../catalina/util/LocalStrings_fr.properties | 1 + .../catalina/util/LocalStrings_zh_CN.properties| 1 + .../catalina/valves/LocalStrings_zh_CN.properties | 2 +- .../tomcat/util/net/LocalStrings_fr.properties | 2 + .../util/security/LocalStrings_fr.properties | 3 ++ .../websocket/server/LocalStrings_fr.properties| 1 + webapps/docs/changelog.xml | 10 21 files changed, 100 insertions(+), 58 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] tag 10.1.0-M13 created (now faa2582)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 10.1.0-M13 in repository https://gitbox.apache.org/repos/asf/tomcat.git. at faa2582 (commit) This tag includes the following new commits: new faa2582 Tag 10.1.0-M13 The 1 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. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/01: Tag 10.1.0-M13
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to tag 10.1.0-M13 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit faa2582152d9dcbcb444700df340e10a85fc375f Author: Mark Thomas AuthorDate: Tue Mar 29 23:21:10 2022 +0100 Tag 10.1.0-M13 --- build.properties.default | 2 +- webapps/docs/changelog.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties.default b/build.properties.default index 9e49bda..6bc0172 100644 --- a/build.properties.default +++ b/build.properties.default @@ -33,7 +33,7 @@ version.major=10 version.minor=1 version.build=0 version.patch=0 -version.suffix=-M13-dev +version.suffix=-M13 # - Reproducible builds - # Uncomment and set to current time for reproducible builds diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ae875af..6140124 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,7 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Set timestamp (currently unused) for next release
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new 3d3b03b Set timestamp (currently unused) for next release 3d3b03b is described below commit 3d3b03b0079b0d97d0d0a30b8b12b364df945b6f Author: Mark Thomas AuthorDate: Tue Mar 29 23:17:44 2022 +0100 Set timestamp (currently unused) for next release --- build.properties.default | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties.default b/build.properties.default index cffe97d..a3b75ae 100644 --- a/build.properties.default +++ b/build.properties.default @@ -38,8 +38,8 @@ version.suffix=-dev # - Reproducible builds - # Uncomment and set to current time for reproducible builds # Note: The value is in seconds (unlike milliseconds used by System.currentTimeMillis()). -#2022-01-15T12:00:00Z -#ant.tstamp.now=1642248000 +#2022-03-30T00:00:00Z +#ant.tstamp.now=1648598400 # - Source control flags - git.branch=10.0.x - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Set timestamp (currently unused) for next release
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new a154bf3 Set timestamp (currently unused) for next release a154bf3 is described below commit a154bf3a9487f0d3d85da4b7f375266545caeb3b Author: Mark Thomas AuthorDate: Tue Mar 29 23:17:44 2022 +0100 Set timestamp (currently unused) for next release --- build.properties.default | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties.default b/build.properties.default index 113954b..9e49bda 100644 --- a/build.properties.default +++ b/build.properties.default @@ -38,8 +38,8 @@ version.suffix=-M13-dev # - Reproducible builds - # Uncomment and set to current time for reproducible builds # Note: The value is in seconds (unlike milliseconds used by System.currentTimeMillis()). -#2022-02-21T12:00:00Z -#ant.tstamp.now=1645444800 +#2022-03-30T00:00:00Z +#ant.tstamp.now=1648598400 # - Source control flags - git.branch=main - 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: Keep format consistent with X509Certificate.getSubjectDN().getName()
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 79074de Keep format consistent with
X509Certificate.getSubjectDN().getName()
79074de is described below
commit 79074de8f2ee18d32e4d22109bf10a45eb6022ed
Author: Mark Thomas
AuthorDate: Tue Mar 29 22:58:04 2022 +0100
Keep format consistent with X509Certificate.getSubjectDN().getName()
---
java/org/apache/catalina/realm/X509SubjectDnRetriever.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
b/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
index 1602c91..d342154 100644
--- a/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
+++ b/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
@@ -18,6 +18,8 @@ package org.apache.catalina.realm;
import java.security.cert.X509Certificate;
+import javax.security.auth.x500.X500Principal;
+
/**
* An X509UsernameRetriever that returns a certificate's entire
* SubjectDN as the username.
@@ -26,6 +28,6 @@ public class X509SubjectDnRetriever implements
X509UsernameRetriever {
@Override
public String getUsername(X509Certificate clientCert) {
-return clientCert.getSubjectX500Principal().getName();
+return
clientCert.getSubjectX500Principal().getName(X500Principal.RFC1779);
}
}
-
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: Keep format consistent with X509Certificate.getSubjectDN().getName()
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 b21268d Keep format consistent with
X509Certificate.getSubjectDN().getName()
b21268d is described below
commit b21268dcebc3d470430227978caa4f168a3346d4
Author: Mark Thomas
AuthorDate: Tue Mar 29 22:58:04 2022 +0100
Keep format consistent with X509Certificate.getSubjectDN().getName()
---
java/org/apache/catalina/realm/X509SubjectDnRetriever.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
b/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
index 1602c91..d342154 100644
--- a/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
+++ b/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
@@ -18,6 +18,8 @@ package org.apache.catalina.realm;
import java.security.cert.X509Certificate;
+import javax.security.auth.x500.X500Principal;
+
/**
* An X509UsernameRetriever that returns a certificate's entire
* SubjectDN as the username.
@@ -26,6 +28,6 @@ public class X509SubjectDnRetriever implements
X509UsernameRetriever {
@Override
public String getUsername(X509Certificate clientCert) {
-return clientCert.getSubjectX500Principal().getName();
+return
clientCert.getSubjectX500Principal().getName(X500Principal.RFC1779);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Keep format consistent with X509Certificate.getSubjectDN().getName()
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 9565491 Keep format consistent with
X509Certificate.getSubjectDN().getName()
9565491 is described below
commit 9565491aaf0d01e2e1d372094c7c3a9c3701b317
Author: Mark Thomas
AuthorDate: Tue Mar 29 22:58:04 2022 +0100
Keep format consistent with X509Certificate.getSubjectDN().getName()
---
java/org/apache/catalina/realm/X509SubjectDnRetriever.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
b/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
index 1602c91..d342154 100644
--- a/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
+++ b/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
@@ -18,6 +18,8 @@ package org.apache.catalina.realm;
import java.security.cert.X509Certificate;
+import javax.security.auth.x500.X500Principal;
+
/**
* An X509UsernameRetriever that returns a certificate's entire
* SubjectDN as the username.
@@ -26,6 +28,6 @@ public class X509SubjectDnRetriever implements
X509UsernameRetriever {
@Override
public String getUsername(X509Certificate clientCert) {
-return clientCert.getSubjectX500Principal().getName();
+return
clientCert.getSubjectX500Principal().getName(X500Principal.RFC1779);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Keep format consistent with X509Certificate.getSubjectDN().getName()
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 167305e Keep format consistent with
X509Certificate.getSubjectDN().getName()
167305e is described below
commit 167305ee5d6c34aba292bcfd6e4bd547da1ec1d8
Author: Mark Thomas
AuthorDate: Tue Mar 29 22:58:04 2022 +0100
Keep format consistent with X509Certificate.getSubjectDN().getName()
---
java/org/apache/catalina/realm/X509SubjectDnRetriever.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
b/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
index 1602c91..d342154 100644
--- a/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
+++ b/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
@@ -18,6 +18,8 @@ package org.apache.catalina.realm;
import java.security.cert.X509Certificate;
+import javax.security.auth.x500.X500Principal;
+
/**
* An X509UsernameRetriever that returns a certificate's entire
* SubjectDN as the username.
@@ -26,6 +28,6 @@ public class X509SubjectDnRetriever implements
X509UsernameRetriever {
@Override
public String getUsername(X509Certificate clientCert) {
-return clientCert.getSubjectX500Principal().getName();
+return
clientCert.getSubjectX500Principal().getName(X500Principal.RFC1779);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #482: replace deprecated getSubjectDN()
markt-asf commented on pull request #482: URL: https://github.com/apache/tomcat/pull/482#issuecomment-1082404289 Ah. Problem solved. Just need to specify RFC 1779 format. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #482: replace deprecated getSubjectDN()
markt-asf commented on pull request #482: URL: https://github.com/apache/tomcat/pull/482#issuecomment-1082401729 There is an issue here. `getSubjectDN()` returns a DN that includes spaces between the attribute name/value pairs. `getSubjectX500Principal().getName()` does not include spaces. That is going to create backwards compatibility issues. This is going to need a re-think. I'll follow-up on the dev@ list -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65975] CLIENT-CERT authentication does not request cert from client and always denies access (401)
https://bz.apache.org/bugzilla/show_bug.cgi?id=65975 --- Comment #22 from Martin Stangl --- I will make a step by step guide but cannot do it before Saturday. -- 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
[GitHub] [tomcat] markt-asf commented on pull request #488: Donating EL Translations
markt-asf commented on pull request #488: URL: https://github.com/apache/tomcat/pull/488#issuecomment-1082392340 Thanks. I ended up applying this manually as it was easier to sync with POEditor that way. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #488: Donating EL Translations
markt-asf closed pull request #488: URL: https://github.com/apache/tomcat/pull/488 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Remove trailing space
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 9db3e21 Remove trailing space 9db3e21 is described below commit 9db3e21f08ffebeb7bc5e63a15988007cdef7f03 Author: Mark Thomas AuthorDate: Tue Mar 29 09:13:09 2022 +0100 Remove trailing space --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index b0f96d3..580b16a 100644 --- a/build.xml +++ b/build.xml @@ -2868,7 +2868,7 @@ skip.installer property in build.properties" /> - +
[tomcat] branch main updated: Expand coverage of translations for jakarta.el package.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new a84580e Expand coverage of translations for jakarta.el package.
a84580e is described below
commit a84580ecfe7401f34c4138de07de83e131c0a6fd
Author: Mark Thomas
AuthorDate: Tue Mar 29 21:02:12 2022 +0100
Expand coverage of translations for jakarta.el package.
Based on 488 from Volodymyr Siedlecki.
---
java/jakarta/el/LocalStrings_cs.properties| 41 +--
java/jakarta/el/LocalStrings_de.properties| 41 +--
java/jakarta/el/LocalStrings_es.properties| 56
java/jakarta/el/LocalStrings_fr.properties| 64 +++
java/jakarta/el/LocalStrings_ja.properties| 74 +--
java/jakarta/el/LocalStrings_ko.properties| 71 -
java/jakarta/el/LocalStrings_pt_BR.properties | 40 +--
java/jakarta/el/LocalStrings_ru.properties| 53 +++
java/jakarta/el/LocalStrings_zh_CN.properties | 72 +-
webapps/docs/changelog.xml| 4 ++
10 files changed, 342 insertions(+), 174 deletions(-)
diff --git a/java/jakarta/el/LocalStrings_cs.properties
b/java/jakarta/el/LocalStrings_cs.properties
index 1d4eed0..8195659 100644
--- a/java/jakarta/el/LocalStrings_cs.properties
+++ b/java/jakarta/el/LocalStrings_cs.properties
@@ -13,8 +13,41 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-elProcessor.defineFunctionInvalidMethod=Metoda [{0}] třídy [{1}] není public
static metoda
+beanNameELResolver.beanReadOnly=Název objektu typu bean [{0}] jen pro čtení
+
+elProcessor.defineFunctionInvalidClass=Třída [{0}] není veřejná
+elProcessor.defineFunctionInvalidMethod=Metoda [{0}] na třídě [{1}] není
veřejnou statickou metodou
+elProcessor.defineFunctionInvalidParameterList=Seznam parametrů [{0}] pro
metodu [{1}] na třídě [{2}] není platný
+elProcessor.defineFunctionInvalidParameterTypeName=Typ parametru [{0}] pro
metodu [{1}] na třídě [{2}] není platný
+elProcessor.defineFunctionNoMethod=Veřejnou statickou metodu [{0}] pro třídu
[{1}] nelze nalézt
+elProcessor.defineFunctionNullParams=Nejméně jeden ze vstupních parametrů byl
null
+
+expressionFactory.cannotCreate=Nelze vytvořit ExpressionFactory typu [{0}]
+expressionFactory.cannotFind=Nelze najít ExpressionFactory typu [{0}]
+expressionFactory.readFailed=Nezdařilo se přečíst [{0}]
+
+importHandler.ambiguousImport=Třídu [{0}] nelze importovat, protože je v
konfliktu s [{1}], který již byl importován
+importHandler.ambiguousStaticImport=Statický import [{0}] nelze zpracovat,
protože je v konfliktu s [{1}], který již byl importován
+importHandler.classNotFound=Třídu [{0}] nelze importovat, protože ji nelze
nalézt
+importHandler.invalidClass=Třída [{0}] musí být veřejná, v exportovaném balíku
(pro Java 9+), neabstraktní a nesmí být rozhraním
+importHandler.invalidClassName=Název třídy pro import [{0}] musí obsahovat
balík
+importHandler.invalidClassNameForStatic=Třída [{0}] určená pro statický import
[{1}] není platná
+importHandler.invalidStaticName=Název statické metody nebo pole pro import
[{0}] musí obsahovat třídu
+importHandler.staticNotFound=Statický import [{0}] nebyl nalezen ve třídě
[{1}] pro import [{2}]
+
+lambdaExpression.tooFewArgs=Pouze [{0}] argumentů bylo poskytnuto pro výraz
lambda, který vyžaduje alespoň [{1}]
+
+objectNotAssignable=Nelze přidat objekt typu [{0}] do pole objektů typu [{1}].
+propertyNotFound=Vlastnost [{1}] nebyla nalezena u typu [{0}]
+propertyNotReadable=Vlastnost [{1}] není čitelná u typu [{0}]
+propertyNotWritable=Vlastnost [{1}] není zapisovatelná u typu [{0}]
+propertyReadError=Chyba při čtení [{1}] u typu [{0}]
+propertyWriteError=Chyba pri zápisu [{1}] u typu [{0}]
+
+staticFieldELResolver.methodNotFound=Nebyla nalezena žádná odpovídající
veřejná statická metoda s názvem [{0}] ve třídě [{1}]
+staticFieldELResolver.notFound=Nebylo nalezeno žádné veřejné statické pole s
názvem [{0}] ve třídě [{1}] (exportované pro Java 9+)
+staticFieldELResolver.notWritable=Zápis do statických polí (v tomto případě
pole [{0}] pro třídu [{1}]) není povolen
+
+util.method.ambiguous=Nelze najít jednoznačnou metodu: {0}.{1}({2})
+util.method.notfound=Metoda nebyla nalezena: {0}.{1}({2})
-importHandler.ambiguousStaticImport=Statický import [{0}] nelze zpracovat,
neboť koliduje s [{1}] (který byl již naimportován)
-importHandler.classNotFound=Třídu [{0}] nelze naimportovat, neboť nebyla
nalezena
-importHandler.invalidClassNameForStatic=Třída [{0}] uvedená pro statický
import [{1}] není platná
diff --git a/java/jakarta/el/LocalStrings_de.properties
b/java/jakarta/el/LocalStrings_de.properties
index 402e9b5..0b8a092 100644
---
[tomcat] branch main updated: Improvements to Japanese translations contributed by tak7iji
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 18fb974 Improvements to Japanese translations contributed by tak7iji
18fb974 is described below
commit 18fb97414e8606b670e5909487dee0d4703e9992
Author: Mark Thomas
AuthorDate: Tue Mar 29 20:44:44 2022 +0100
Improvements to Japanese translations contributed by tak7iji
---
java/org/apache/catalina/connector/LocalStrings_ja.properties | 2 ++
java/org/apache/catalina/util/LocalStrings_ja.properties | 1 +
java/org/apache/jasper/resources/LocalStrings_ja.properties | 2 +-
java/org/apache/tomcat/util/net/LocalStrings_ja.properties| 1 +
webapps/docs/changelog.xml| 3 +++
5 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings_ja.properties
b/java/org/apache/catalina/connector/LocalStrings_ja.properties
index ddc2a24..38b42d1 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ja.properties
@@ -35,8 +35,10 @@ coyoteConnector.protocolHandlerStartFailed=プロトコルハンドラの起動
coyoteConnector.protocolHandlerStopFailed=プロトコルハンドラの停止に失敗しました。
coyoteInputStream.nbNotready=ノンブロッキングモードでは、以前の読み取りが完了して isReady() が true
を返すまで、ServletInputStream から読み取りできません。
+coyoteInputStream.null=入力バッファオブジェクトはリサイクルされ、このファサードに関連付けられなくなりました
coyoteOutputStream.nbNotready=ノンブロッキングモードでは直前の書き込みが完了し isReady() が true を返すまで
ServletOutputStream への書き込みはできません。
+coyoteOutputStream.null=出力バッファオブジェクトはリサイクルされ、このファサードに関連付けられなくなりました
coyoteRequest.alreadyAuthenticated=認証済みのリクエストです。
coyoteRequest.attributeEvent=属性イベントリスナによって例外が投げられました
diff --git a/java/org/apache/catalina/util/LocalStrings_ja.properties
b/java/org/apache/catalina/util/LocalStrings_ja.properties
index 631bf73..5f5eb33 100644
--- a/java/org/apache/catalina/util/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/util/LocalStrings_ja.properties
@@ -44,6 +44,7 @@ parameterMap.locked=ロックされたParameterMapは変更が許されません
resourceSet.locked=ロックされたResourceSetは変更が許されません
sessionIdGeneratorBase.createRandom=セッション ID を生成するための SecureRandom インスタンスの作成に
[{1}] ミリ秒かかりました。アルゴリズムは [{0}] です。
+sessionIdGeneratorBase.noSHA1PRNG=SecureRandomのデフォルトのSHA1PRNGアルゴリズムは、このJVMではサポートされていません。
プラットフォームのデフォルトを使用します。
sessionIdGeneratorBase.random=クラス [{0}] の乱数発生器の初期化の例外です
sessionIdGeneratorBase.randomAlgorithm=アルゴリズム [{0}] を使用して乱数ジェネレータを初期化する際の例外
sessionIdGeneratorBase.randomProvider=プロバイダ [{0}] を使用して乱数ジェネレータを初期化中に例外が発生しました
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties
b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index df4d4ab..9bf699a 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -273,7 +273,7 @@ jsp.message.scratch.dir.is=JSPエンジンのScratchdir: [{0}]
jsp.tldCache.noTldInDir=ディレクトリ [{0}] には TLD ファイルがありません。
jsp.tldCache.noTldInJar=[{0}]にTLDファイルが見つかりませんでした。
CATALINA_BASE/conf/catalina.propertiesファイルのtomcat.util.scan.StandardJarScanFilter.jarsToSkipプロパティにJARを追加することを検討してください。
jsp.tldCache.noTldInResourcePath=リソースパス [{0}] には TLD ファイルがありません。
-jsp.tldCache.noTldSummary=少なくとも1つのJARが、まだTLDを含んでいないTLDについてスキャンされました。
スキャンしたが、そこにTLDが見つからなかったJARの完全なリストについては、このロガーのデバッグログを有効にしてください。
スキャン中に不要なJARをスキップすると、起動時間とJSPのコンパイル時間が改善されます。
+jsp.tldCache.noTldSummary=少なくとも1つのJARでTLDをスキャンしましたが、TLDが含まれていませんでした。スキャンしたもののTLDが見つからなかったJARの完全なリストについては、このロガーのデバッグログを有効にしてください。スキャン中に不要なJARをスキップすると、起動時間とJSPのコンパイル時間が短縮されます。
jsp.tldCache.tldInDir=TLD ファイルをディレクトリ [{0}] で発見しました。
jsp.tldCache.tldInJar=JAR ファイル [{0}] の内部に TLD ファイルを発見しました。
jsp.tldCache.tldInResourcePath=リソースパス [{0}] にTLDファイルが見つかりました。
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
index 3f26048..88dc8fc 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
@@ -142,6 +142,7 @@ sslHostConfig.certificateVerificationInvalid=証明書検証値[{0}]が認識さ
sslHostConfig.fileNotFound=構成ファイル[{0}]は存在しません
sslHostConfig.invalid_truststore_password=提供されたトラストストアパスワードは、トラストストアのロック解除および検証に使用できませんでした。
検証をスキップするnullパスワードでトラストストアにアクセスしようとしました。
sslHostConfig.mismatch=[{0}] プロパティは [{1}] という名前のSSLHostConfigで設定され、[{2}]
構成構文用ですが、[{3}] 構成構文でSSLHostConfigが使用されています
+sslHostConfig.opensslconf.alreadyset=別のOpenSSLConfを設定しようとすると無視されます
sslHostConfig.opensslconf.null=Null OpenSSLConfを設定しようとしましたが無視されました
sslHostConfig.prefix_missing=[{1}]というSSLHostConfigのプロトコルのリストにプロトコル[{0}]が追加されました。
+/-接頭辞がないか確認してください。
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a464db7..24b7f43 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -222,6 +222,9 @@
[tomcat] branch main updated: Improvements to French translations (remm)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 85462e3 Improvements to French translations (remm)
85462e3 is described below
commit 85462e30fe812c907e1eb2e1f8dd6f9f207595c5
Author: Mark Thomas
AuthorDate: Tue Mar 29 20:40:59 2022 +0100
Improvements to French translations (remm)
---
java/org/apache/catalina/connector/LocalStrings_fr.properties | 2 ++
java/org/apache/catalina/util/LocalStrings_fr.properties | 1 +
webapps/docs/changelog.xml| 3 +++
3 files changed, 6 insertions(+)
diff --git a/java/org/apache/catalina/connector/LocalStrings_fr.properties
b/java/org/apache/catalina/connector/LocalStrings_fr.properties
index dba9dd7..c7f281c 100644
--- a/java/org/apache/catalina/connector/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_fr.properties
@@ -35,8 +35,10 @@ coyoteConnector.protocolHandlerStartFailed=Le démarrage du
gestionnaire de prot
coyoteConnector.protocolHandlerStopFailed=L'arrêt du gestionnaire de protocole
a échoué
coyoteInputStream.nbNotready=En mode non-bloquant, vous ne pouvez pas lire du
ServletInputStream tant que la lecture précédente n'est pas terminée et
isReady() renvoie "true"
+coyoteInputStream.null=Le tampon d'entrée a été recyclé et n'est plus associé
à cette facade
coyoteOutputStream.nbNotready=En mode non bloquant, vous ne devez pas écrire
sur la ServletOutputStream avant que l'écriture précédente ne soit terminée et
que isReady() ne renvoie true
+coyoteOutputStream.null=Le tampon de sortie a été recyclé et n'est plus
associé à cette facade
coyoteRequest.alreadyAuthenticated=Cette requête a déjà été authentifiée
coyoteRequest.attributeEvent=Une exception a été lancée par l'instance
d'écoute pour l'évènement attributs (attributes)
diff --git a/java/org/apache/catalina/util/LocalStrings_fr.properties
b/java/org/apache/catalina/util/LocalStrings_fr.properties
index 64d4c33..d39cffd 100644
--- a/java/org/apache/catalina/util/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/util/LocalStrings_fr.properties
@@ -44,6 +44,7 @@ parameterMap.locked=Aucune modification n'est autorisée sur
un ParameterMap ver
resourceSet.locked=Aucune modification n'est autorisée sur un ResourceSet
verrouillé
sessionIdGeneratorBase.createRandom=La création de l''instance de SecureRandom
pour le générateur d''id de session en utilisant [{0}] a pris [{1}]
millisecondes
+sessionIdGeneratorBase.noSHA1PRNG=L'algorithme SHA1PRNG par défaut de
SecureRandom n'est pas supporté par cette JVM, le défaut pour la plateforme
sera utilisé
sessionIdGeneratorBase.random=Exception durant l''initialisation de la classe
du générateur de nombre aléatoire [{0}]
sessionIdGeneratorBase.randomAlgorithm=Erreur lors de l''initialisation du
générateur de nombres aléatoires en utilisant l''algorithme [{0}]
sessionIdGeneratorBase.randomProvider=Exception lors de l''initialisation du
générateur de nombres aléatoires utilisant le fournisseur [{0}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d3ed21f..a464db7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -219,6 +219,9 @@
Improvements to Chinese translations contributed by 15625988003.
(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 main updated: Improvements to Chinese translations contributed by 15625988003
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new b20e814 Improvements to Chinese translations contributed by
15625988003
b20e814 is described below
commit b20e8146b1c252450ab0cd742e770e2ea007e5db
Author: Mark Thomas
AuthorDate: Tue Mar 29 20:38:41 2022 +0100
Improvements to Chinese translations contributed by 15625988003
---
java/org/apache/catalina/connector/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/catalina/filters/LocalStrings_zh_CN.properties | 3 +++
java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties| 2 ++
java/org/apache/catalina/security/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/util/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 3 +++
java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 5 +
.../apache/tomcat/util/descriptor/web/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties| 2 ++
java/org/apache/tomcat/util/security/LocalStrings_zh_CN.properties | 3 +++
.../org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml | 3 +++
13 files changed, 29 insertions(+)
diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index 30d896a..64c6f8b 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -35,8 +35,10 @@ coyoteConnector.protocolHandlerStartFailed=协议处理器启动失败
coyoteConnector.protocolHandlerStopFailed=协议处理程序.停止失败
coyoteInputStream.nbNotready=在非阻塞模式下，只有之前的读数据完成，并且isReady()方法返回true，你才可以使用
ServletInputStream 读取数据
+coyoteInputStream.null=输入缓冲对象已被回收，不再与此外观关联\n
coyoteOutputStream.nbNotready=在非阻塞模式下，在上一次写入完成且isReady（）返回true之前，您不能写入ServletOutputStream
+coyoteOutputStream.null=输出缓冲对象已被回收，不再与此 '外观' 关联
coyoteRequest.alreadyAuthenticated=此请求已通过身份验证
coyoteRequest.attributeEvent=属性事件侦听器引发的异常
diff --git a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
index 9982795..388d8f8 100644
--- a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
@@ -62,7 +62,10 @@ remoteIpFilter.invalidRemoteAddress=无法确定远程主机，因为上报的
requestFilter.deny=基于属性:[{1}]，[{0}]的请求被拒绝。
+restCsrfPreventionFilter.fetch.debug=CSRF Fetch 请求被成功处理 -
随机数被添加到响应中。请求方法：[{0}] 和 URI [{1}]。
restCsrfPreventionFilter.invalidNonce=CSRF nonce验证失败
+restCsrfPreventionFilter.invalidNonce.debug=REST 的 CSRF 验证失败！使用方法 [{0}] 和 URI
[{1}] 的请求将被拒绝。详细信息：请求具有会话 ID [{2}]；请求的会话存在 [{3}]；请求中的 csrf 随机数存在 [{4}]；会话中的
csrf 随机数存在 [{5}]。
+restCsrfPreventionFilter.multipleNonce.debug=不同的 CSRF
随机数作为请求参数发送，它们都不会被使用。请求方法：[{0}] 和 URI [{1}]。
webDavFilter.xpProblem=WebdavFixFilter:已知XP-x64-SP2客户端不使用WebDAV Servlet
webDavFilter.xpRootContext=WebdavFixFilter:XP-x64-SP2客户端将仅与根上下文一起工作
diff --git a/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
index 363b31a..024915d 100644
--- a/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
@@ -23,6 +23,8 @@ globalResources.createError.userDatabase.user=无法为用户[{0}]创建用户MB
globalResources.noNamingContext=没有为服务器定义全局命名上下文
globalResources.userDatabaseCreateError=为[{0}]创建用户数据库MBean时发生异常
+listener.notServer=此侦听器只能嵌套在 Server 元素中，但位于 [{0}] 中。
+
mBean.attributeNotFound=找不到属性[{0}]
mBean.nullAttribute=属性为空
mBean.nullName=属性名为空
diff --git a/java/org/apache/catalina/security/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/security/LocalStrings_zh_CN.properties
index efc7e2d..8a44aea 100644
--- a/java/org/apache/catalina/security/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/security/LocalStrings_zh_CN.properties
@@ -20,3 +20,5 @@ SecurityListener.checkUmaskSkip=无法确定权限。这表示 Tomcat 正在 Win
SecurityListener.checkUserWarning=以用户[{0}]身份运行时尝试启动。作为此用户运行Tomcat已被生命周期侦听器org.apache.catalina.security.security
listener（通常在catalina_BASE/conf/server.xml中配置）阻止
SecurityUtil.doAsPrivilege=运行privilegedexception块时发生异常。
+
+listener.notServer=此侦听器只能嵌套在 Server 元素中，但位于 [{0}] 中。\n
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 9e35c2d..671b9c5 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++
[Bug 65975] CLIENT-CERT authentication does not request cert from client and always denies access (401)
https://bz.apache.org/bugzilla/show_bug.cgi?id=65975 Mark Thomas changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #21 from Mark Thomas --- Testing this locally with 9.0.x, Tomcat Native 1.2.x and the APR connector this works as expected for me. I modified the examples web application to use CLIENT-CERT, configured the APR connector for TLSv1.2 and no HTTP/2 and used the standard test keys and certs we use for the Tomcat unit tests. To investigate further we are going to need exact steps to recreate this from a clean install of the latest 9.0.x release including any test keys and certs you are using. -- 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 8.5.x updated: replace deprecated getSubjectDN()
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 1beddae replace deprecated getSubjectDN()
1beddae is described below
commit 1beddae0d80a643d50034aaa9b423a233406b772
Author: sim-lus <67785631+sim-...@users.noreply.github.com>
AuthorDate: Wed Mar 16 12:45:36 2022 +0100
replace deprecated getSubjectDN()
According to java spec, getSubjectDN() should not be used:
"denigrated, replaced by getSubjectX500Principal(). This method returns the
subject as an implementation specific Principal object, which should not be
relied upon by portable code."
Not sure if my proposed change is correct, at least it is probably not
compatible for all use cases.
---
java/org/apache/catalina/realm/X509SubjectDnRetriever.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
b/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
index 7aa5a3a..1602c91 100644
--- a/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
+++ b/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
@@ -26,6 +26,6 @@ public class X509SubjectDnRetriever implements
X509UsernameRetriever {
@Override
public String getUsername(X509Certificate clientCert) {
-return clientCert.getSubjectDN().getName();
+return clientCert.getSubjectX500Principal().getName();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: replace deprecated getSubjectDN()
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new d4f7a9d replace deprecated getSubjectDN()
d4f7a9d is described below
commit d4f7a9de8d87ad9280c4f5b59f287fceacba4b5d
Author: sim-lus <67785631+sim-...@users.noreply.github.com>
AuthorDate: Wed Mar 16 12:45:36 2022 +0100
replace deprecated getSubjectDN()
According to java spec, getSubjectDN() should not be used:
"denigrated, replaced by getSubjectX500Principal(). This method returns the
subject as an implementation specific Principal object, which should not be
relied upon by portable code."
Not sure if my proposed change is correct, at least it is probably not
compatible for all use cases.
---
java/org/apache/catalina/realm/X509SubjectDnRetriever.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
b/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
index 7aa5a3a..1602c91 100644
--- a/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
+++ b/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
@@ -26,6 +26,6 @@ public class X509SubjectDnRetriever implements
X509UsernameRetriever {
@Override
public String getUsername(X509Certificate clientCert) {
-return clientCert.getSubjectDN().getName();
+return clientCert.getSubjectX500Principal().getName();
}
}
-
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: replace deprecated getSubjectDN()
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 38d2c13 replace deprecated getSubjectDN()
38d2c13 is described below
commit 38d2c138a102a793bce630056fbca7088b7e05a3
Author: sim-lus <67785631+sim-...@users.noreply.github.com>
AuthorDate: Wed Mar 16 12:45:36 2022 +0100
replace deprecated getSubjectDN()
According to java spec, getSubjectDN() should not be used:
"denigrated, replaced by getSubjectX500Principal(). This method returns the
subject as an implementation specific Principal object, which should not be
relied upon by portable code."
Not sure if my proposed change is correct, at least it is probably not
compatible for all use cases.
---
java/org/apache/catalina/realm/X509SubjectDnRetriever.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
b/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
index 7aa5a3a..1602c91 100644
--- a/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
+++ b/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
@@ -26,6 +26,6 @@ public class X509SubjectDnRetriever implements
X509UsernameRetriever {
@Override
public String getUsername(X509Certificate clientCert) {
-return clientCert.getSubjectDN().getName();
+return clientCert.getSubjectX500Principal().getName();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: replace deprecated getSubjectDN()
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 26f57f4 replace deprecated getSubjectDN()
26f57f4 is described below
commit 26f57f422badfe01c094a47bfe610e7e491f83eb
Author: sim-lus <67785631+sim-...@users.noreply.github.com>
AuthorDate: Wed Mar 16 12:45:36 2022 +0100
replace deprecated getSubjectDN()
According to java spec, getSubjectDN() should not be used:
"denigrated, replaced by getSubjectX500Principal(). This method returns the
subject as an implementation specific Principal object, which should not be
relied upon by portable code."
Not sure if my proposed change is correct, at least it is probably not
compatible for all use cases.
---
java/org/apache/catalina/realm/X509SubjectDnRetriever.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
b/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
index 7aa5a3a..1602c91 100644
--- a/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
+++ b/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
@@ -26,6 +26,6 @@ public class X509SubjectDnRetriever implements
X509UsernameRetriever {
@Override
public String getUsername(X509Certificate clientCert) {
-return clientCert.getSubjectDN().getName();
+return clientCert.getSubjectX500Principal().getName();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf merged pull request #482: replace deprecated getSubjectDN()
markt-asf merged pull request #482: URL: https://github.com/apache/tomcat/pull/482 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #489: Suppress null socket channel warning for closed sockets
markt-asf commented on pull request #489: URL: https://github.com/apache/tomcat/pull/489#issuecomment-1082232318 This is not correct. Null socket channels are usually an indication that something has gone wrong. The warning is deliberate. If you have a use case where a correctly handled request triggers this warning then please raise this on the Tomcat users mailing list in the first instance. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #489: Suppress null socket channel warning for closed sockets
markt-asf closed pull request #489: URL: https://github.com/apache/tomcat/pull/489 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #481: changing HashMap to LinkedHashMap to maintain execution order of deployment
markt-asf closed pull request #481: URL: https://github.com/apache/tomcat/pull/481 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #481: changing HashMap to LinkedHashMap to maintain execution order of deployment
markt-asf commented on pull request #481: URL: https://github.com/apache/tomcat/pull/481#issuecomment-1082229465 No response to Chris's questions so closing this as WONTFIX. Maintaining deployment order of applications is something probably best discussed on the users list in the first instance. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] rhernandez35 opened a new pull request #489: Suppress null socket channel warning for closed sockets
rhernandez35 opened a new pull request #489: URL: https://github.com/apache/tomcat/pull/489 Null socket channels are only a problem if the socket isn't closed. Otherwise, they're just indicative of a stale event being processed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65571] ClientAbortException in Tomcat 9.0.50 and 9.0.52
https://bz.apache.org/bugzilla/show_bug.cgi?id=65571 Mark Thomas changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |WONTFIX --- Comment #7 from Mark Thomas --- Resolving as WONTFIX as per my previous comment. Please feel free to re-open this issue once you have the steps to reproduce it from a clean install of the latest version of a supported Tomcat branch. -- 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 8.5.x updated: Improve the recycling of Processor objects to make it more robust.
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 4a00b0c Improve the recycling of Processor objects to make it more
robust.
4a00b0c is described below
commit 4a00b0c0890538b9d3107eef8f2e0afadd119beb
Author: Mark Thomas
AuthorDate: Tue Mar 29 19:15:37 2022 +0100
Improve the recycling of Processor objects to make it more robust.
---
java/org/apache/coyote/AbstractProtocol.java | 32 --
.../apache/tomcat/util/net/SocketWrapperBase.java | 17
webapps/docs/changelog.xml | 4 +++
3 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index aa67737..461d04d 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -790,7 +790,11 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
S socket = wrapper.getSocket();
-Processor processor = (Processor) wrapper.getCurrentProcessor();
+// We take complete ownership of the Processor inside of this
method to ensure
+// no other thread can release it while we're using it. Whatever
processor is
+// held by this variable will be associated with the SocketWrapper
before this
+// method returns.
+Processor processor = (Processor) wrapper.takeCurrentProcessor();
if (getLog().isDebugEnabled()) {
getLog().debug(sm.getString("abstractConnectionHandler.connectionsGet",
processor, socket));
@@ -873,9 +877,6 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
processor.setSslSupport(
wrapper.getSslSupport(getProtocol().getClientCertProvider()));
-// Associate the processor with the connection
-wrapper.setCurrentProcessor(processor);
-
SocketState state = SocketState.CLOSED;
do {
state = processor.process(wrapper, status);
@@ -895,8 +896,6 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
release(processor);
// Create the upgrade processor
processor =
upgradeProtocol.getProcessor(wrapper, getProtocol().getAdapter());
-// Associate with the processor with the
connection
-wrapper.setCurrentProcessor(processor);
} else {
if (getLog().isDebugEnabled()) {
getLog().debug(sm.getString(
@@ -916,8 +915,6 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
getLog().debug(sm.getString("abstractConnectionHandler.upgradeCreate",
processor, wrapper));
}
-// Associate with the processor with the connection
-wrapper.setCurrentProcessor(processor);
// Initialise the upgrade handler (which may
trigger
// some IO using the new protocol which is why the
lines
// above are necessary)
@@ -949,8 +946,8 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
} else if (state == SocketState.OPEN) {
// In keep-alive but between requests. OK to recycle
// processor. Continue to poll for the next request.
-wrapper.setCurrentProcessor(null);
release(processor);
+processor = null;
wrapper.registerReadInterest();
} else if (state == SocketState.SENDFILE) {
// Sendfile in progress. If it fails, the socket will be
@@ -975,8 +972,7 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
// Connection closed. OK to recycle the processor.
// Processors handling upgrades require additional clean-up
// before release.
-wrapper.setCurrentProcessor(null);
-if (processor.isUpgrade()) {
+if (processor != null && processor.isUpgrade()) {
UpgradeToken upgradeToken =
processor.getUpgradeToken();
HttpUpgradeHandler httpUpgradeHandler =
upgradeToken.getHttpUpgradeHandler();
InstanceManager instanceManager =
upgradeToken.getInstanceManager();
@@ -997,7
[tomcat] branch main updated: Improve the recycling of Processor objects to make it more robust.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 17f177e Improve the recycling of Processor objects to make it more
robust.
17f177e is described below
commit 17f177eeb7df5938f67ef9ea580411b120195f13
Author: Mark Thomas
AuthorDate: Tue Mar 29 19:15:37 2022 +0100
Improve the recycling of Processor objects to make it more robust.
---
java/org/apache/coyote/AbstractProtocol.java | 32 --
.../apache/tomcat/util/net/SocketWrapperBase.java | 17
webapps/docs/changelog.xml | 4 +++
3 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index 896e94d..8134955 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -767,7 +767,11 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
S socket = wrapper.getSocket();
-Processor processor = (Processor) wrapper.getCurrentProcessor();
+// We take complete ownership of the Processor inside of this
method to ensure
+// no other thread can release it while we're using it. Whatever
processor is
+// held by this variable will be associated with the SocketWrapper
before this
+// method returns.
+Processor processor = (Processor) wrapper.takeCurrentProcessor();
if (getLog().isDebugEnabled()) {
getLog().debug(sm.getString("abstractConnectionHandler.connectionsGet",
processor, socket));
@@ -849,9 +853,6 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
processor.setSslSupport(wrapper.getSslSupport());
-// Associate the processor with the connection
-wrapper.setCurrentProcessor(processor);
-
SocketState state = SocketState.CLOSED;
do {
state = processor.process(wrapper, status);
@@ -871,8 +872,6 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
release(processor);
// Create the upgrade processor
processor =
upgradeProtocol.getProcessor(wrapper, getProtocol().getAdapter());
-// Associate with the processor with the
connection
-wrapper.setCurrentProcessor(processor);
} else {
if (getLog().isDebugEnabled()) {
getLog().debug(sm.getString(
@@ -892,8 +891,6 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
getLog().debug(sm.getString("abstractConnectionHandler.upgradeCreate",
processor, wrapper));
}
-// Associate with the processor with the connection
-wrapper.setCurrentProcessor(processor);
// Initialise the upgrade handler (which may
trigger
// some IO using the new protocol which is why the
lines
// above are necessary)
@@ -931,8 +928,8 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
} else if (state == SocketState.OPEN) {
// In keep-alive but between requests. OK to recycle
// processor. Continue to poll for the next request.
-wrapper.setCurrentProcessor(null);
release(processor);
+processor = null;
wrapper.registerReadInterest();
} else if (state == SocketState.SENDFILE) {
// Sendfile in progress. If it fails, the socket will be
@@ -957,8 +954,7 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
// Connection closed. OK to recycle the processor.
// Processors handling upgrades require additional clean-up
// before release.
-wrapper.setCurrentProcessor(null);
-if (processor.isUpgrade()) {
+if (processor != null && processor.isUpgrade()) {
UpgradeToken upgradeToken =
processor.getUpgradeToken();
HttpUpgradeHandler httpUpgradeHandler =
upgradeToken.getHttpUpgradeHandler();
InstanceManager instanceManager =
upgradeToken.getInstanceManager();
@@ -979,7 +975,13 @@ public abstract class AbstractProtocol implements
[tomcat] branch 10.0.x updated: Improve the recycling of Processor objects to make it more robust.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 9651b83 Improve the recycling of Processor objects to make it more
robust.
9651b83 is described below
commit 9651b83a1d04583791525e5f0c4c9089f678d9fc
Author: Mark Thomas
AuthorDate: Tue Mar 29 19:15:37 2022 +0100
Improve the recycling of Processor objects to make it more robust.
---
java/org/apache/coyote/AbstractProtocol.java | 32 --
.../apache/tomcat/util/net/SocketWrapperBase.java | 17
webapps/docs/changelog.xml | 4 +++
3 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index b1d9659..a3331c1 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -774,7 +774,11 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
S socket = wrapper.getSocket();
-Processor processor = (Processor) wrapper.getCurrentProcessor();
+// We take complete ownership of the Processor inside of this
method to ensure
+// no other thread can release it while we're using it. Whatever
processor is
+// held by this variable will be associated with the SocketWrapper
before this
+// method returns.
+Processor processor = (Processor) wrapper.takeCurrentProcessor();
if (getLog().isDebugEnabled()) {
getLog().debug(sm.getString("abstractConnectionHandler.connectionsGet",
processor, socket));
@@ -858,9 +862,6 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
processor.setSslSupport(
wrapper.getSslSupport(getProtocol().getClientCertProvider()));
-// Associate the processor with the connection
-wrapper.setCurrentProcessor(processor);
-
SocketState state = SocketState.CLOSED;
do {
state = processor.process(wrapper, status);
@@ -880,8 +881,6 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
release(processor);
// Create the upgrade processor
processor =
upgradeProtocol.getProcessor(wrapper, getProtocol().getAdapter());
-// Associate with the processor with the
connection
-wrapper.setCurrentProcessor(processor);
} else {
if (getLog().isDebugEnabled()) {
getLog().debug(sm.getString(
@@ -901,8 +900,6 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
getLog().debug(sm.getString("abstractConnectionHandler.upgradeCreate",
processor, wrapper));
}
-// Associate with the processor with the connection
-wrapper.setCurrentProcessor(processor);
// Initialise the upgrade handler (which may
trigger
// some IO using the new protocol which is why the
lines
// above are necessary)
@@ -940,8 +937,8 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
} else if (state == SocketState.OPEN) {
// In keep-alive but between requests. OK to recycle
// processor. Continue to poll for the next request.
-wrapper.setCurrentProcessor(null);
release(processor);
+processor = null;
wrapper.registerReadInterest();
} else if (state == SocketState.SENDFILE) {
// Sendfile in progress. If it fails, the socket will be
@@ -966,8 +963,7 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
// Connection closed. OK to recycle the processor.
// Processors handling upgrades require additional clean-up
// before release.
-wrapper.setCurrentProcessor(null);
-if (processor.isUpgrade()) {
+if (processor != null && processor.isUpgrade()) {
UpgradeToken upgradeToken =
processor.getUpgradeToken();
HttpUpgradeHandler httpUpgradeHandler =
upgradeToken.getHttpUpgradeHandler();
InstanceManager instanceManager =
upgradeToken.getInstanceManager();
@@ -988,7
[tomcat] branch 9.0.x updated: Improve the recycling of Processor objects to make it more robust.
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 170e0f7 Improve the recycling of Processor objects to make it more
robust.
170e0f7 is described below
commit 170e0f792bd18ff031677890ba2fe50eb7a376c1
Author: Mark Thomas
AuthorDate: Tue Mar 29 19:15:37 2022 +0100
Improve the recycling of Processor objects to make it more robust.
---
java/org/apache/coyote/AbstractProtocol.java | 32 --
.../apache/tomcat/util/net/SocketWrapperBase.java | 17
webapps/docs/changelog.xml | 4 +++
3 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index 4f854b9..562daec 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -797,7 +797,11 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
S socket = wrapper.getSocket();
-Processor processor = (Processor) wrapper.getCurrentProcessor();
+// We take complete ownership of the Processor inside of this
method to ensure
+// no other thread can release it while we're using it. Whatever
processor is
+// held by this variable will be associated with the SocketWrapper
before this
+// method returns.
+Processor processor = (Processor) wrapper.takeCurrentProcessor();
if (getLog().isDebugEnabled()) {
getLog().debug(sm.getString("abstractConnectionHandler.connectionsGet",
processor, socket));
@@ -881,9 +885,6 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
processor.setSslSupport(
wrapper.getSslSupport(getProtocol().getClientCertProvider()));
-// Associate the processor with the connection
-wrapper.setCurrentProcessor(processor);
-
SocketState state = SocketState.CLOSED;
do {
state = processor.process(wrapper, status);
@@ -903,8 +904,6 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
release(processor);
// Create the upgrade processor
processor =
upgradeProtocol.getProcessor(wrapper, getProtocol().getAdapter());
-// Associate with the processor with the
connection
-wrapper.setCurrentProcessor(processor);
} else {
if (getLog().isDebugEnabled()) {
getLog().debug(sm.getString(
@@ -924,8 +923,6 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
getLog().debug(sm.getString("abstractConnectionHandler.upgradeCreate",
processor, wrapper));
}
-// Associate with the processor with the connection
-wrapper.setCurrentProcessor(processor);
// Initialise the upgrade handler (which may
trigger
// some IO using the new protocol which is why the
lines
// above are necessary)
@@ -963,8 +960,8 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
} else if (state == SocketState.OPEN) {
// In keep-alive but between requests. OK to recycle
// processor. Continue to poll for the next request.
-wrapper.setCurrentProcessor(null);
release(processor);
+processor = null;
wrapper.registerReadInterest();
} else if (state == SocketState.SENDFILE) {
// Sendfile in progress. If it fails, the socket will be
@@ -989,8 +986,7 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
// Connection closed. OK to recycle the processor.
// Processors handling upgrades require additional clean-up
// before release.
-wrapper.setCurrentProcessor(null);
-if (processor.isUpgrade()) {
+if (processor != null && processor.isUpgrade()) {
UpgradeToken upgradeToken =
processor.getUpgradeToken();
HttpUpgradeHandler httpUpgradeHandler =
upgradeToken.getHttpUpgradeHandler();
InstanceManager instanceManager =
upgradeToken.getInstanceManager();
@@ -1011,7
[Bug 65979] Connection is closed when keep-alive is specified
https://bz.apache.org/bugzilla/show_bug.cgi?id=65979 --- Comment #4 from Patrick --- The documentation could be paired with the introduction of the new attribute that allows people to send back a 400 in this scenario. The reasoning behind why the attribute was added would make people aware of what assumptions were originally made and why this 'flag' might be more desirable to people. -- 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 8.5.x updated: Remove trailing space
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 f862cbc Remove trailing space f862cbc is described below commit f862cbca3a6959347923bb52b9ccbc0725dcd1cb Author: Mark Thomas AuthorDate: Tue Mar 29 09:13:09 2022 +0100 Remove trailing space --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 1b3774a..483ab34 100644 --- a/build.xml +++ b/build.xml @@ -2501,7 +2501,7 @@ skip.installer property in build.properties" /> - +
[tomcat] branch 10.0.x updated: Remove trailing space
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new 688dba2 Remove trailing space 688dba2 is described below commit 688dba258818d28a0f425e38d53d9f6303648ab2 Author: Mark Thomas AuthorDate: Tue Mar 29 09:13:09 2022 +0100 Remove trailing space --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 855e05d..72e49ad 100644 --- a/build.xml +++ b/build.xml @@ -2829,7 +2829,7 @@ skip.installer property in build.properties" /> - +
[tomcat] branch 9.0.x updated: Remove trailing space
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 992de93 Remove trailing space 992de93 is described below commit 992de935513e12c33f7828ed19a835106c6752bc Author: Mark Thomas AuthorDate: Tue Mar 29 09:13:09 2022 +0100 Remove trailing space --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index f922ee1..5a0be1b 100644 --- a/build.xml +++ b/build.xml @@ -2811,7 +2811,7 @@ skip.installer property in build.properties" /> - +
