Re: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.2
> 2022年9月3日 05:19，Mark Thomas 写道： > > The proposed Apache Tomcat migration tool for Jakarta EE 1.0.2 is now > available for voting. > > The significant changes since 1.0.1 are: > > - Issue #26 - bad CRC checksums > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.2/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1386/ > > The tag is: > https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.2 > 37a9d5a438206b429997d4c1a9bb19f21b133145 > > The proposed 1.0.2 release is: > > [ ] -1: Broken. Do not release because… > [X ] +1: Acceptable. Go ahead and release. All unit tests have passed. Han > > Thanks, > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] malaysf opened a new pull request, #550: Http11Processor's keep alive state and input buffer's swallow state must be synchronized
malaysf opened a new pull request, #550: URL: https://github.com/apache/tomcat/pull/550 Fixing a bug where a connection would be kept alive without swallowing the input from the request stream. When a request comes in with a 100 Continue expectation, and the server immediately responds with a 200 status without reading the request body at all, the next request on the connection will fail because Tomcat cannot parse the HTTP verb. The first request left Http11Processor in a state where it kept the connection alive but did not discard the request body, thus reading the next request began at the wrong place in the stream. The new unit test replicates the issue and is addressed by the code changes to keep the keepAlive and input buffer swallow state in sync with each other. -- 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
[VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.2
The proposed Apache Tomcat migration tool for Jakarta EE 1.0.2 is now available for voting. The significant changes since 1.0.1 are: - Issue #26 - bad CRC checksums It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.2/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1386/ The tag is: https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.2 37a9d5a438206b429997d4c1a9bb19f21b133145 The proposed 1.0.2 release is: [ ] -1: Broken. Do not release because... [ ] +1: Acceptable. Go ahead and release. Thanks, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated: Prepare changelog for next dev 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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new 8df3c8d Prepare changelog for next dev cycle 8df3c8d is described below commit 8df3c8db8c00f0cf066f9e4de6d437bc482095c8 Author: Mark Thomas AuthorDate: Fri Sep 2 22:16:30 2022 +0100 Prepare changelog for next dev cycle --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index daead72..7d0c433 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,7 @@ # Tomcat Migration Tool for Jakarta EE - Changelog +## 1.0.3 (in progress) + ## 1.0.2 - Fix [#29](https://github.com/apache/tomcat-jakartaee-migration/issues/29) by recalculating the CRC value of the entry type is SORTED after converting (lihan) - Update Apache Parent to 27. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r56641 - in /dev/tomcat/jakartaee-migration/v1.0.2: ./ binaries/ source/
Author: markt Date: Fri Sep 2 21:14:58 2022 New Revision: 56641 Log: Upload Tomcat migtation tool for Jakarta EE 1.0.2 for voting Added: dev/tomcat/jakartaee-migration/v1.0.2/ dev/tomcat/jakartaee-migration/v1.0.2/binaries/ dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.tar.gz (with props) dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.tar.gz.asc dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.tar.gz.sha512 dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.zip (with props) dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.zip.asc dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.zip.sha512 dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-shaded.jar (with props) dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-shaded.jar.asc dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-shaded.jar.sha512 dev/tomcat/jakartaee-migration/v1.0.2/source/ dev/tomcat/jakartaee-migration/v1.0.2/source/jakartaee-migration-1.0.2-src.tar.gz (with props) dev/tomcat/jakartaee-migration/v1.0.2/source/jakartaee-migration-1.0.2-src.tar.gz.asc dev/tomcat/jakartaee-migration/v1.0.2/source/jakartaee-migration-1.0.2-src.tar.gz.sha512 dev/tomcat/jakartaee-migration/v1.0.2/source/jakartaee-migration-1.0.2-src.zip (with props) dev/tomcat/jakartaee-migration/v1.0.2/source/jakartaee-migration-1.0.2-src.zip.asc dev/tomcat/jakartaee-migration/v1.0.2/source/jakartaee-migration-1.0.2-src.zip.sha512 Added: dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.tar.gz == Binary file - no diff available. Propchange: dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.tar.gz.asc == --- dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.tar.gz.asc (added) +++ dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.tar.gz.asc Fri Sep 2 21:14:58 2022 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmMSch0ACgkQEMAcWi9g +Wee/FhAA1LRtYDMT48ot+QWVvLnFHQ76db7raWugaZsAr/sp+FqxX8QWf0MmQIA8 +f+wdmVrti2kCE+n0Aj/DOzZizw2GM4eScWUn9q5O8/LSDF3/ScVy93x4Tgs6kCgm +TQy+XP560TiOc2xvAWWazkNRJrwG8PSdUbq/uySJy54cSt7Ppk5rNl9DNs75LcC5 +KfoZI3ixwAv/maE5BDPsNXmQjhY4t+7I/crj81oqtHQYlOdYf6Yky4qdadfhtVbP +tX5dvuIw4FvCFFE20I1WzzoHgigvdTg2TxUPAUvJFjrKuh7sYk0Tx4kJNBboRyD3 +Nd7bQJl8MkIdvo5VjBhSORyQUciVTINCoDhFpOCmkP0K6O56sb5w8A0BOuZnqq3a +haKpcjnbhpjR6xgdFzm2+4ad+yzAe/qZx4L9eb3M6UZlpZtpKUcchBvl3GG6r5lS +Qg96dtpVzwvLPlf+qNI9QvFnfx29OMHuaeSaxy7r+Cy34OZUKPTC8UBeylnKcBfL +ZQYFM0nZvyfrcEAczNQikE8NC17jN7b/JOCpvT1QSF4+o6mFTI+axbv2VvNoRa20 +fyg4IVpbezTowhPNcH2ge+jqdPfgJpWtrPL20wthg0uztAaI5Tw0Jf3c2MmWLKVD +fz0hDxivuYXovu99+CKk+NDeI6jL7aMcwYFQQpatH3XSah2tDks= +=h4x7 +-END PGP SIGNATURE- Added: dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.tar.gz.sha512 == --- dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.tar.gz.sha512 (added) +++ dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.tar.gz.sha512 Fri Sep 2 21:14:58 2022 @@ -0,0 +1 @@ +2d47caba5a57deb8cffbf3728704b928504499f487041b015560dbaed48ae0363641f5dc44465132611824475b16f5b39d2336865352d94ad4cff784080046f8 *jakartaee-migration-1.0.2-bin.tar.gz \ No newline at end of file Added: dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.zip.asc == --- dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.zip.asc (added) +++ dev/tomcat/jakartaee-migration/v1.0.2/binaries/jakartaee-migration-1.0.2-bin.zip.asc Fri Sep 2 21:14:58 2022 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org +
[tomcat-jakartaee-migration] branch main updated: [maven-release-plugin] prepare for next development iteration
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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new 12882c9 [maven-release-plugin] prepare for next development iteration 12882c9 is described below commit 12882c9ae5ea21f2b85a625c4a71717e8a55fd05 Author: Mark Thomas AuthorDate: Fri Sep 2 21:40:13 2022 +0100 [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e8a97e3..e1b44bf 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.tomcat jakartaee-migration - 1.0.2 + 1.0.3-SNAPSHOT Apache Tomcat Migration Tool for Jakarta EE The aim of the tool is to take a web application written for Java EE 8 that - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] annotated tag 1.0.2 created (now 2d453d4)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to annotated tag 1.0.2 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git at 2d453d4 (tag) tagging 37a9d5a438206b429997d4c1a9bb19f21b133145 (commit) replaces 1.0.1 by Mark Thomas on Fri Sep 2 21:40:01 2022 +0100 - Log - [maven-release-plugin] copy for tag 1.0.2 --- No new revisions were added by this update. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated: [maven-release-plugin] prepare release 1.0.2
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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new 37a9d5a [maven-release-plugin] prepare release 1.0.2 37a9d5a is described below commit 37a9d5a438206b429997d4c1a9bb19f21b133145 Author: Mark Thomas AuthorDate: Fri Sep 2 21:32:06 2022 +0100 [maven-release-plugin] prepare release 1.0.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index df46959..e8a97e3 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.tomcat jakartaee-migration - 1.0.2-SNAPSHOT + 1.0.2 Apache Tomcat Migration Tool for Jakarta EE The aim of the tool is to take a web application written for Java EE 8 that @@ -62,7 +62,7 @@ scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git -main +1.0.2 https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated: Update Maven source plugin
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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new b6afbd9 Update Maven source plugin b6afbd9 is described below commit b6afbd96fc74666cf40ce3d8de458f4039ea9fbf Author: Mark Thomas AuthorDate: Fri Sep 2 21:26:59 2022 +0100 Update Maven source plugin --- CHANGES.md | 1 + pom.xml| 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index cac8d2c..daead72 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,7 @@ - Fix [#29](https://github.com/apache/tomcat-jakartaee-migration/issues/29) by recalculating the CRC value of the entry type is SORTED after converting (lihan) - Update Apache Parent to 27. (markt) - Update Maven Assembly plugin to 3.4.2. (markt) +- Update Maven Source plugin to 3.2.1. (markt) ## 1.0.1 - Fix [#19](https://github.com/apache/tomcat-jakartaee-migration/issues/19). Add support for converting `.groovy` files. diff --git a/pom.xml b/pom.xml index f456ccc..df46959 100644 --- a/pom.xml +++ b/pom.xml @@ -179,7 +179,7 @@ org.apache.maven.plugins maven-source-plugin -3.2.0 +3.2.1 attach-sources - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated: Remove cobertura
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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new 6210eb8 Remove cobertura 6210eb8 is described below commit 6210eb843c90c5298f26a47f6a6ccbcb5953dfc4 Author: Mark Thomas AuthorDate: Fri Sep 2 21:26:11 2022 +0100 Remove cobertura --- pom.xml | 17 - 1 file changed, 17 deletions(-) diff --git a/pom.xml b/pom.xml index 0da84f2..f456ccc 100644 --- a/pom.xml +++ b/pom.xml @@ -113,23 +113,6 @@ - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.7 - - - - html - xml - - - - - - maven-antrun-plugin - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated: Update Maven assembly plugin to 3.4.2
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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new 170957a Update Maven assembly plugin to 3.4.2 170957a is described below commit 170957a0a1a29e225930690d001b4960ecf8b2e8 Author: Mark Thomas AuthorDate: Fri Sep 2 21:24:44 2022 +0100 Update Maven assembly plugin to 3.4.2 --- CHANGES.md | 1 + pom.xml| 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index e45954c..cac8d2c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,6 +3,7 @@ ## 1.0.2 - Fix [#29](https://github.com/apache/tomcat-jakartaee-migration/issues/29) by recalculating the CRC value of the entry type is SORTED after converting (lihan) - Update Apache Parent to 27. (markt) +- Update Maven Assembly plugin to 3.4.2. (markt) ## 1.0.1 - Fix [#19](https://github.com/apache/tomcat-jakartaee-migration/issues/19). Add support for converting `.groovy` files. diff --git a/pom.xml b/pom.xml index f297178..0da84f2 100644 --- a/pom.xml +++ b/pom.xml @@ -224,7 +224,7 @@ org.apache.maven.plugins ...which is assumed by default. --> maven-assembly-plugin -3.4.0 +3.4.2 make-assembly - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated: Update Apache parent to 27
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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new 7f93f71 Update Apache parent to 27 7f93f71 is described below commit 7f93f71cf7ae971be2208da179629bd6b9a60dfa Author: Mark Thomas AuthorDate: Fri Sep 2 21:23:12 2022 +0100 Update Apache parent to 27 --- CHANGES.md | 1 + pom.xml| 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 86f5724..e45954c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,7 @@ ## 1.0.2 - Fix [#29](https://github.com/apache/tomcat-jakartaee-migration/issues/29) by recalculating the CRC value of the entry type is SORTED after converting (lihan) +- Update Apache Parent to 27. (markt) ## 1.0.1 - Fix [#19](https://github.com/apache/tomcat-jakartaee-migration/issues/19). Add support for converting `.groovy` files. diff --git a/pom.xml b/pom.xml index c9c4f03..f297178 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache apache -26 +27 org.apache.tomcat - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated: Prep for a 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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new 52752a9 Prep for a release 52752a9 is described below commit 52752a9740a900d4b6c8ed591151da3756d8e9c1 Author: Mark Thomas AuthorDate: Fri Sep 2 21:19:04 2022 +0100 Prep for a release --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 51640b7..86f5724 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ # Tomcat Migration Tool for Jakarta EE - Changelog -## 1.0.2 (in progress) +## 1.0.2 - Fix [#29](https://github.com/apache/tomcat-jakartaee-migration/issues/29) by recalculating the CRC value of the entry type is SORTED after converting (lihan) ## 1.0.1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated: Add codecov badge
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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new a8dcdf2 Add codecov badge a8dcdf2 is described below commit a8dcdf2d16d94166ebfecacbd06db089ef8b2a8b Author: Mark Thomas AuthorDate: Fri Sep 2 21:10:22 2022 +0100 Add codecov badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8823575..5c5b794 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Apache Tomcat migration tool for Jakarta EE +[](https://app.codecov.io/gh/apache/tomcat-jakartaee-migration/branch/main) [](http://www.apache.org/licenses/LICENSE-2.0) ## Overview - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated: Remove coveralls status
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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new a08dd7d Remove coveralls status a08dd7d is described below commit a08dd7d2d69dac7a5e60f8a254cbf231a76f40a7 Author: Mark Thomas AuthorDate: Fri Sep 2 21:06:26 2022 +0100 Remove coveralls status --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index aa83ab1..8823575 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # Apache Tomcat migration tool for Jakarta EE -[](https://coveralls.io/github/apache/tomcat-jakartaee-migration?branch=main) [](http://www.apache.org/licenses/LICENSE-2.0) ## Overview - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated: Add distribution: 'temurin'
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-jakartaee-migration.git
The following commit(s) were added to refs/heads/main by this push:
new ed8c716 Add distribution: 'temurin'
ed8c716 is described below
commit ed8c7163c5e78b226a25878d4727061e8fdebba8
Author: Mark Thomas
AuthorDate: Fri Sep 2 19:08:11 2022 +0100
Add distribution: 'temurin'
---
.github/workflows/ci.yml | 1 +
.github/workflows/coverage.yml | 1 +
2 files changed, 2 insertions(+)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9ff549d..d56883c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,6 +49,7 @@ jobs:
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v3
with:
+distribution: 'temurin'
java-version: ${{ matrix.java }}
- name: Build
run: mvn -V test --file pom.xml --no-transfer-progress
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index b78d383..8c4e6e7 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -43,6 +43,7 @@ jobs:
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v3
with:
+distribution: 'temurin'
java-version: ${{ matrix.java }}
- name: Build
run: mvn -V test jacoco:report --file pom.xml --no-transfer-progress
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] 03/03: Update coverage configuration based on Commons DBCP
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-jakartaee-migration.git
commit d956d6c5bcc842c8eaf08b04ffec01c3d3e32113
Author: Mark Thomas
AuthorDate: Fri Sep 2 18:58:37 2022 +0100
Update coverage configuration based on Commons DBCP
Align CI and coverage configuration
---
.github/workflows/ci.yml | 11 -
.github/workflows/{ci.yml => coverage.yml} | 37 +++---
README.md | 1 -
3 files changed, 18 insertions(+), 31 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 765cac8..9ff549d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,6 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+
name: CI
on:
@@ -38,21 +39,19 @@ jobs:
name: JDK${{ matrix.java }} ${{ matrix.os }}
runs-on: ${{ matrix.os }}
steps:
+- uses: actions/checkout@v3
- uses: actions/cache@v3.0.8
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
-- name: Git Checkout
- uses: actions/checkout@v2
-- name: Set up Java
- uses: actions/setup-java@v1
+- name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
- name: Build
- run: |
-mvn test --no-transfer-progress
+ run: mvn -V test --file pom.xml --no-transfer-progress
continue-on-error:
true
- name: Upload logs
diff --git a/.github/workflows/ci.yml b/.github/workflows/coverage.yml
similarity index 62%
copy from .github/workflows/ci.yml
copy to .github/workflows/coverage.yml
index 765cac8..b78d383 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/coverage.yml
@@ -5,14 +5,15 @@
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-name: CI
+
+name: Coverage
on:
push:
@@ -26,38 +27,26 @@ env:
LC_ALL: en_US.UTF-8
jobs:
- JDKxx_Matrix:
+ build:
strategy:
- fail-fast: false
matrix:
-java: [ 11, 17, 18, 19-ea ]
-os: [ ubuntu-latest ]
-include:
-- os: windows-latest
- java: 11
-name: JDK${{ matrix.java }} ${{ matrix.os }}
-runs-on: ${{ matrix.os }}
+java: [ 8 ]
+runs-on: ubuntu-latest
steps:
+- uses: actions/checkout@v3
- uses: actions/cache@v3.0.8
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
-- name: Git Checkout
- uses: actions/checkout@v2
-- name: Set up Java
- uses: actions/setup-java@v1
+- name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
- name: Build
- run: |
-mvn test --no-transfer-progress
- continue-on-error:
-true
-- name: Upload logs
- uses: actions/upload-artifact@v2
+ run: mvn -V test jacoco:report --file pom.xml --no-transfer-progress
+- name: Upload coverage to Codecov
+ uses: codecov/codecov-action@v3
with:
-name: JDK${{ matrix.java }}-${{ matrix.os }}-logs
-path: output/build/logs/TEST*.txt
-retention-days: 7
+files: ./target/site/jacoco/jacoco.xml
diff --git a/README.md b/README.md
index 419df3b..aa83ab1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
# Apache Tomcat migration tool for Jakarta EE
-[](http://travis-ci.org/apache/tomcat-jakartaee-migration)
[](https://coveralls.io/github/apache/tomcat-jakartaee-migration?branch=main)
[](http://www.apache.org/licenses/LICENSE-2.0)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated (54f958e -> d956d6c)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
from 54f958e Fix license header
new 8a2c800 Switch to Jacoco for code coverage
new 0b552fd Drop Travis
new d956d6c Update coverage configuration based on Commons DBCP
The 3 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:
.github/workflows/ci.yml | 11 -
.github/workflows/{ci.yml => coverage.yml} | 37 +++---
.travis.yml| 24 ---
README.md | 1 -
pom.xml| 20 +---
5 files changed, 35 insertions(+), 58 deletions(-)
copy .github/workflows/{ci.yml => coverage.yml} (62%)
delete mode 100644 .travis.yml
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] 01/03: Switch to Jacoco for code coverage
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-jakartaee-migration.git commit 8a2c800013752a9e05534dfba6ea668df5b81aa4 Author: Mark Thomas AuthorDate: Fri Sep 2 18:50:27 2022 +0100 Switch to Jacoco for code coverage --- pom.xml | 20 +--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6d06ed6..c9c4f03 100644 --- a/pom.xml +++ b/pom.xml @@ -294,9 +294,23 @@ -org.eluder.coveralls -coveralls-maven-plugin -4.3.0 +org.jacoco +jacoco-maven-plugin +0.8.8 + + + + prepare-agent + + + +report +test + + report + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] 02/03: Drop Travis
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-jakartaee-migration.git commit 0b552fda32aeb38760d2697269d1a7f31265753d Author: Mark Thomas AuthorDate: Fri Sep 2 18:50:49 2022 +0100 Drop Travis --- .travis.yml | 24 1 file changed, 24 deletions(-) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5364fff..000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -language: java - -jdk: - - openjdk8 - - openjdk11 - - openjdk-ea - -after_success: - - mvn clean cobertura:cobertura coveralls:report - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated: Fix license header
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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new 54f958e Fix license header 54f958e is described below commit 54f958ee2c9faf4ccaeab33b3eb23ea7764cd722 Author: Mark Thomas AuthorDate: Fri Sep 2 18:21:08 2022 +0100 Fix license header --- .github/workflows/ci.yml | 22 -- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 965f1f7..765cac8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,15 +1,17 @@ -#Licensed under the Apache License, Version 2.0 (the "License"); -#you may not use this file except in compliance with the License. -#You may obtain a copy of the License at +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at # -#http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # -#Unless required by applicable law or agreed to in writing, software -#distributed under the License is distributed on an "AS IS" BASIS, -#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -#See the License for the specific language governing permissions and -#limitations under the License. - +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. name: CI on: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated: Clenaer logs
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-jakartaee-migration.git
The following commit(s) were added to refs/heads/main by this push:
new 9b8c04b Clenaer logs
9b8c04b is described below
commit 9b8c04bc32756e85105bd731d3e118545857a8e5
Author: Mark Thomas
AuthorDate: Fri Sep 2 18:05:41 2022 +0100
Clenaer logs
---
.github/workflows/ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 119a922..965f1f7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,7 +50,7 @@ jobs:
java-version: ${{ matrix.java }}
- name: Build
run: |
-mvn test
+mvn test --no-transfer-progress
continue-on-error:
true
- name: Upload logs
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated: Add Maven deps cache based on commons-dbcp
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-jakartaee-migration.git
The following commit(s) were added to refs/heads/main by this push:
new dafe3fe Add Maven deps cache based on commons-dbcp
dafe3fe is described below
commit dafe3feb6d4d5523d60fb28e6f91f683c50292e8
Author: Mark Thomas
AuthorDate: Fri Sep 2 18:04:31 2022 +0100
Add Maven deps cache based on commons-dbcp
---
.github/workflows/ci.yml | 6 ++
1 file changed, 6 insertions(+)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 963e963..119a922 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,6 +36,12 @@ jobs:
name: JDK${{ matrix.java }} ${{ matrix.os }}
runs-on: ${{ matrix.os }}
steps:
+- uses: actions/cache@v3.0.8
+ with:
+path: ~/.m2/repository
+key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+restore-keys: |
+ ${{ runner.os }}-maven-
- name: Git Checkout
uses: actions/checkout@v2
- name: Set up Java
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated: First attempt to configure CI at GitHub
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-jakartaee-migration.git
The following commit(s) were added to refs/heads/main by this push:
new 2f936cd First attempt to configure CI at GitHub
2f936cd is described below
commit 2f936cdc3708a57cd213e0b8946d6dae9d491ac2
Author: Mark Thomas
AuthorDate: Fri Sep 2 18:00:05 2022 +0100
First attempt to configure CI at GitHub
---
.github/workflows/ci.yml | 55
1 file changed, 55 insertions(+)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000..963e963
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,55 @@
+#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License.
+#You may obtain a copy of the License at
+#
+#http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS,
+#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#See the License for the specific language governing permissions and
+#limitations under the License.
+
+name: CI
+
+on:
+ push:
+branches:
+ - main
+ pull_request:
+branches:
+ - main
+
+env:
+ LC_ALL: en_US.UTF-8
+
+jobs:
+ JDKxx_Matrix:
+strategy:
+ fail-fast: false
+ matrix:
+java: [ 11, 17, 18, 19-ea ]
+os: [ ubuntu-latest ]
+include:
+- os: windows-latest
+ java: 11
+name: JDK${{ matrix.java }} ${{ matrix.os }}
+runs-on: ${{ matrix.os }}
+steps:
+- name: Git Checkout
+ uses: actions/checkout@v2
+- name: Set up Java
+ uses: actions/setup-java@v1
+ with:
+java-version: ${{ matrix.java }}
+- name: Build
+ run: |
+mvn test
+ continue-on-error:
+true
+- name: Upload logs
+ uses: actions/upload-artifact@v2
+ with:
+name: JDK${{ matrix.java }}-${{ matrix.os }}-logs
+path: output/build/logs/TEST*.txt
+retention-days: 7
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated: Alphabetical order
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-jakartaee-migration.git
The following commit(s) were added to refs/heads/main by this push:
new 6d43f80 Alphabetical order
6d43f80 is described below
commit 6d43f807a04b61ec0bf8439a4c55d621f8302122
Author: Mark Thomas
AuthorDate: Fri Sep 2 17:27:07 2022 +0100
Alphabetical order
---
src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
index f6d13dd..a4786c3 100644
--- a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
+++ b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
@@ -19,7 +19,6 @@ classConverter.skipName=Skip conversion of class usage from
the javax namespace
migration.archive.complete=Migration finished for archive [{0}]
migration.archive.memory=Migration starting for archive [{0}] using in memory
copy
-migration.skip=Migration skipped for archive [{0}] because it is excluded (the
archive was copied unchanged)
migration.archive.stream=Migration starting for archive [{0}] using streaming
migration.cannotReadSource=Cannot read source location [{0}]
migration.done=Migration completed successfully in [{0}] milliseconds
@@ -27,6 +26,7 @@ migration.error=Error performing migration
migration.execute=Performing migration from source [{0}] to destination [{1}]
with Jakarta EE specification profile [{2}]
migration.mkdirError=Error creating destination directory [{0}]
migration.removeSignature=Remove cryptographic signature for [{0}]
+migration.skip=Migration skipped for archive [{0}] because it is excluded (the
archive was copied unchanged)
migration.skipSignatureFile=Drop cryptographic signature file [{0}]
migration.usage=Usage: Migration [options] \n\
where options includes:\n\
-
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: Fix incorrect debug messages
This is an automated email from the ASF dual-hosted git repository.
lihan 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 583d658e65 Fix incorrect debug messages
583d658e65 is described below
commit 583d658e65905ec6d3191ed3103036cdad4c4c08
Author: lihan
AuthorDate: Fri Sep 2 21:42:24 2022 +0800
Fix incorrect debug messages
---
java/org/apache/catalina/valves/ErrorReportValve.java | 2 +-
java/org/apache/catalina/valves/JsonErrorReportValve.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java
b/java/org/apache/catalina/valves/ErrorReportValve.java
index d59799b066..cc204695f8 100644
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -317,7 +317,7 @@ public class ErrorReportValve extends ValveBase {
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
if (container.getLogger().isDebugEnabled()) {
-container.getLogger().debug("status.setContentType", t);
+container.getLogger().debug("Failure to set the
content-type of response", t);
}
}
Writer writer = response.getReporter();
diff --git a/java/org/apache/catalina/valves/JsonErrorReportValve.java
b/java/org/apache/catalina/valves/JsonErrorReportValve.java
index 19afec6d84..8af7968d30 100644
--- a/java/org/apache/catalina/valves/JsonErrorReportValve.java
+++ b/java/org/apache/catalina/valves/JsonErrorReportValve.java
@@ -73,7 +73,7 @@ public class JsonErrorReportValve extends ErrorReportValve {
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
if (container.getLogger().isDebugEnabled()) {
-container.getLogger().debug("status.setContentType", t);
+container.getLogger().debug("Failure to set the
content-type of response", t);
}
}
Writer writer = response.getReporter();
-
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: Fix incorrect debug messages
This is an automated email from the ASF dual-hosted git repository.
lihan 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 9802fbbf67 Fix incorrect debug messages
9802fbbf67 is described below
commit 9802fbbf672e5871d4f7c488f39a7cc989c95dcd
Author: lihan
AuthorDate: Fri Sep 2 21:42:24 2022 +0800
Fix incorrect debug messages
---
java/org/apache/catalina/valves/ErrorReportValve.java | 2 +-
java/org/apache/catalina/valves/JsonErrorReportValve.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java
b/java/org/apache/catalina/valves/ErrorReportValve.java
index f98a0d6a07..00553535f9 100644
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -317,7 +317,7 @@ public class ErrorReportValve extends ValveBase {
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
if (container.getLogger().isDebugEnabled()) {
-container.getLogger().debug("status.setContentType", t);
+container.getLogger().debug("Failure to set the
content-type of response", t);
}
}
Writer writer = response.getReporter();
diff --git a/java/org/apache/catalina/valves/JsonErrorReportValve.java
b/java/org/apache/catalina/valves/JsonErrorReportValve.java
index 19afec6d84..8af7968d30 100644
--- a/java/org/apache/catalina/valves/JsonErrorReportValve.java
+++ b/java/org/apache/catalina/valves/JsonErrorReportValve.java
@@ -73,7 +73,7 @@ public class JsonErrorReportValve extends ErrorReportValve {
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
if (container.getLogger().isDebugEnabled()) {
-container.getLogger().debug("status.setContentType", t);
+container.getLogger().debug("Failure to set the
content-type of response", t);
}
}
Writer writer = response.getReporter();
-
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: Fix incorrect debug messages
This is an automated email from the ASF dual-hosted git repository.
lihan 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 02fe1209d5 Fix incorrect debug messages
02fe1209d5 is described below
commit 02fe1209d547a373c429787f5af73cee834311f1
Author: lihan
AuthorDate: Fri Sep 2 21:42:24 2022 +0800
Fix incorrect debug messages
---
java/org/apache/catalina/valves/ErrorReportValve.java | 2 +-
java/org/apache/catalina/valves/JsonErrorReportValve.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java
b/java/org/apache/catalina/valves/ErrorReportValve.java
index e7fbc696e4..1048985d32 100644
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -317,7 +317,7 @@ public class ErrorReportValve extends ValveBase {
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
if (container.getLogger().isDebugEnabled()) {
-container.getLogger().debug("status.setContentType", t);
+container.getLogger().debug("Failure to set the
content-type of response", t);
}
}
Writer writer = response.getReporter();
diff --git a/java/org/apache/catalina/valves/JsonErrorReportValve.java
b/java/org/apache/catalina/valves/JsonErrorReportValve.java
index 19afec6d84..8af7968d30 100644
--- a/java/org/apache/catalina/valves/JsonErrorReportValve.java
+++ b/java/org/apache/catalina/valves/JsonErrorReportValve.java
@@ -73,7 +73,7 @@ public class JsonErrorReportValve extends ErrorReportValve {
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
if (container.getLogger().isDebugEnabled()) {
-container.getLogger().debug("status.setContentType", t);
+container.getLogger().debug("Failure to set the
content-type of response", t);
}
}
Writer writer = response.getReporter();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix incorrect debug messages
This is an automated email from the ASF dual-hosted git repository.
lihan 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 5190f92b5e Fix incorrect debug messages
5190f92b5e is described below
commit 5190f92b5e8288cde5c0f4a9814b46166e6447bb
Author: lihan
AuthorDate: Fri Sep 2 21:42:24 2022 +0800
Fix incorrect debug messages
---
java/org/apache/catalina/valves/ErrorReportValve.java | 2 +-
java/org/apache/catalina/valves/JsonErrorReportValve.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java
b/java/org/apache/catalina/valves/ErrorReportValve.java
index e7fbc696e4..1048985d32 100644
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -317,7 +317,7 @@ public class ErrorReportValve extends ValveBase {
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
if (container.getLogger().isDebugEnabled()) {
-container.getLogger().debug("status.setContentType", t);
+container.getLogger().debug("Failure to set the
content-type of response", t);
}
}
Writer writer = response.getReporter();
diff --git a/java/org/apache/catalina/valves/JsonErrorReportValve.java
b/java/org/apache/catalina/valves/JsonErrorReportValve.java
index 19afec6d84..8af7968d30 100644
--- a/java/org/apache/catalina/valves/JsonErrorReportValve.java
+++ b/java/org/apache/catalina/valves/JsonErrorReportValve.java
@@ -73,7 +73,7 @@ public class JsonErrorReportValve extends ErrorReportValve {
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
if (container.getLogger().isDebugEnabled()) {
-container.getLogger().debug("status.setContentType", t);
+container.getLogger().debug("Failure to set the
content-type of response", t);
}
}
Writer writer = response.getReporter();
-
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: Back-port translation updates
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 db0b45d287 Back-port translation updates
db0b45d287 is described below
commit db0b45d28717232a48b368498124fc5d45dbe0e4
Author: Mark Thomas
AuthorDate: Fri Sep 2 14:07:47 2022 +0100
Back-port translation updates
---
.../authenticator/LocalStrings_ja.properties | 2 ++
.../authenticator/LocalStrings_zh_CN.properties| 9 +---
.../jaspic/LocalStrings_zh_CN.properties | 2 +-
.../catalina/core/LocalStrings_fr.properties | 2 ++
.../catalina/core/LocalStrings_ja.properties | 2 ++
.../catalina/core/LocalStrings_ko.properties | 1 +
.../catalina/core/LocalStrings_zh_CN.properties| 12 +++
.../catalina/filters/LocalStrings_ja.properties| 2 +-
.../catalina/filters/LocalStrings_zh_CN.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 6 +++---
.../catalina/loader/LocalStrings_ja.properties | 2 +-
.../catalina/realm/LocalStrings_zh_CN.properties | 6 +++---
.../catalina/ssi/LocalStrings_zh_CN.properties | 2 +-
.../catalina/startup/LocalStrings_zh_CN.properties | 2 +-
.../storeconfig/LocalStrings_zh_CN.properties | 2 +-
.../group/interceptors/LocalStrings_ja.properties | 2 +-
.../membership/LocalStrings_zh_CN.properties | 4 ++--
.../tribes/tipis/LocalStrings_ja.properties| 2 +-
.../tribes/transport/LocalStrings_ja.properties| 2 +-
.../catalina/valves/LocalStrings_ja.properties | 2 +-
.../webresources/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/coyote/LocalStrings_ja.properties | 2 +-
.../coyote/http11/LocalStrings_zh_CN.properties| 6 +++---
.../apache/coyote/http2/LocalStrings_ja.properties | 3 +++
.../coyote/http2/LocalStrings_zh_CN.properties | 12 +--
.../jasper/resources/LocalStrings_ja.properties| 4 ++--
.../jasper/resources/LocalStrings_zh_CN.properties | 2 +-
.../naming/factory/LocalStrings_ko.properties | 3 +++
.../naming/factory/LocalStrings_zh_CN.properties | 6 ++
.../util/compat/LocalStrings_zh_CN.properties | 2 ++
.../util/digester/LocalStrings_zh_CN.properties| 4 ++--
.../util/http/parser/LocalStrings_zh_CN.properties | 2 +-
.../tomcat/util/net/LocalStrings_fr.properties | 2 +-
.../tomcat/util/net/LocalStrings_ja.properties | 2 +-
.../tomcat/util/net/LocalStrings_ko.properties | 2 +-
.../tomcat/util/net/LocalStrings_zh_CN.properties | 8 ---
.../util/net/openssl/LocalStrings_zh_CN.properties | 4 ++--
.../tomcat/websocket/LocalStrings_cs.properties| 2 +-
.../tomcat/websocket/LocalStrings_de.properties| 2 +-
.../tomcat/websocket/LocalStrings_es.properties| 2 +-
.../tomcat/websocket/LocalStrings_fr.properties| 2 +-
.../tomcat/websocket/LocalStrings_ja.properties| 2 +-
.../tomcat/websocket/LocalStrings_ru.properties| 2 +-
.../tomcat/websocket/LocalStrings_zh_CN.properties | 6 +++---
webapps/docs/changelog.xml | 25 ++
45 files changed, 116 insertions(+), 61 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index de814db2b0..b2e510981e 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -36,11 +36,13 @@ basicAuthenticator.invalidCharset=指定できる値は、null、空の文字列
digestAuthenticator.cacheRemove=有効なエントリがクライアントのnonceキャッシュから削除され、新しいエントリのためのスペースが確保されました。
リプレイ攻撃が可能になりました。 リプレイ攻撃の可能性を防ぐには、nonceValidityを減らすか、nonceCacheSizeを増やしてください。
このタイプの警告は5分間表示されなくなります。
+formAuthenticator.changeSessionIdLogin=FORM 認証でログイン ページに転送する前に、セッション ID が
[{0}] から [{1}] に変更されました
formAuthenticator.forwardErrorFail=エラーページへ転送中の予期せぬエラー
formAuthenticator.forwardLogin=リクエストメソッドGETを使用してコンテキスト [{3}] のページ [{2}] にメソッド
[{1}] で行われた [{0}] の要求をフォワードします
formAuthenticator.forwardLoginFail=ログインページへの転送での予期しないエラー
formAuthenticator.noErrorPage=コンテキスト [{0}] のFORM認証にエラーページが定義されていません
formAuthenticator.noLoginPage=コンテキスト [{0}] のFORM認証にログインページが定義されていません
+formAuthenticator.sessionIdMismatch=現在のセッションIDは [{0}] ですが、FORM認証 は [{1}]
を期待していました
singleSignOn.debug.associate=SSOはアプリケーションセッション[{1}]をSSOセッション[{0}]に関連付けます
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
diff --git
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index f74c009e8b..17a8983c1e 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -14,7 +14,7 @@
# limitations
[tomcat] branch 8.5.x updated: Back-porting JsonErrorReportValve
This is an automated email from the ASF dual-hosted git repository.
lihan 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 be7af10c4d Back-porting JsonErrorReportValve
be7af10c4d is described below
commit be7af10c4d5f2aad54a5d59add49a8d2ad09db2c
Author: lihan
AuthorDate: Fri Sep 2 16:41:28 2022 +0800
Back-porting JsonErrorReportValve
---
.../apache/catalina/valves/ErrorReportValve.java | 35 +
.../catalina/valves/JsonErrorReportValve.java | 89 ++
webapps/docs/changelog.xml | 5 ++
webapps/docs/config/valve.xml | 33
4 files changed, 144 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java
b/java/org/apache/catalina/valves/ErrorReportValve.java
index ae02d62499..d59799b066 100644
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -141,6 +141,23 @@ public class ErrorReportValve extends ValveBase {
response.setSuspended(false);
try {
+int statusCode = response.getStatus();
+
+// Do nothing on a 1xx, 2xx and 3xx status
+// Do nothing if anything has been written already
+// Do nothing if the response hasn't been explicitly marked as in
error
+//and that error has not been reported.
+if (statusCode < 400 || response.getContentWritten() > 0 ||
!response.setErrorReported()) {
+return;
+}
+
+// If an error has occurred that prevents further I/O, don't waste
time
+// producing an error report that will never be read
+AtomicBoolean result = new AtomicBoolean(false);
+response.getCoyoteResponse().action(ActionCode.IS_IO_ALLOWED,
result);
+if (!result.get()) {
+return;
+}
report(request, response, throwable);
} catch (Throwable tt) {
ExceptionUtils.handleThrowable(tt);
@@ -160,25 +177,7 @@ public class ErrorReportValve extends ValveBase {
* a root cause exception
*/
protected void report(Request request, Response response, Throwable
throwable) {
-
int statusCode = response.getStatus();
-
-// Do nothing on a 1xx, 2xx and 3xx status
-// Do nothing if anything has been written already
-// Do nothing if the response hasn't been explicitly marked as in error
-//and that error has not been reported.
-if (statusCode < 400 || response.getContentWritten() > 0 ||
!response.setErrorReported()) {
-return;
-}
-
-// If an error has occurred that prevents further I/O, don't waste time
-// producing an error report that will never be read
-AtomicBoolean result = new AtomicBoolean(false);
-response.getCoyoteResponse().action(ActionCode.IS_IO_ALLOWED, result);
-if (!result.get()) {
-return;
-}
-
ErrorPage errorPage = null;
if (throwable != null) {
errorPage = errorPageSupport.find(throwable);
diff --git a/java/org/apache/catalina/valves/JsonErrorReportValve.java
b/java/org/apache/catalina/valves/JsonErrorReportValve.java
new file mode 100644
index 00..19afec6d84
--- /dev/null
+++ b/java/org/apache/catalina/valves/JsonErrorReportValve.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.valves;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.res.StringManager;
+
+/**
+ * Implementation of a Valve that outputs error jsons.
+ *
+ * This Valve should be attached at the Host level, although it will work
+ * if attached to a Context.
+ *
+ */
+public class JsonErrorReportValve extends ErrorReportValve {
+
+public JsonErrorReportValve() {
+super();
+}
+
+@Override
+
[tomcat] branch main updated: Improvements to Spanish translations.
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 a6fca742a9 Improvements to Spanish translations.
a6fca742a9 is described below
commit a6fca742a9b5681a232c32b5b59152b8a34f0537
Author: Mark Thomas
AuthorDate: Fri Sep 2 13:42:06 2022 +0100
Improvements to Spanish translations.
---
java/org/apache/tomcat/util/buf/LocalStrings_es.properties | 2 ++
java/org/apache/tomcat/websocket/LocalStrings_es.properties | 2 +-
webapps/docs/changelog.xml | 3 +++
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
index 30376482cd..8946d507c2 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
@@ -14,3 +14,5 @@
# limitations under the License.
b2cConverter.unknownEncoding=La codificación de carácter [{0}] no está
soportada
+
+messageBytes.illegalCharacter=El carácter Unicode [{0}] en el punto del código
[{1}] no puede ser codificado al estar fuera del rango permitido de 0 a 255.
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_es.properties
b/java/org/apache/tomcat/websocket/LocalStrings_es.properties
index 3103366a0f..ce320ac974 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_es.properties
@@ -36,7 +36,7 @@ wsRemoteEndpoint.wrongState=El endpoint remoto estaba en
estado [{0}] el cual es
wsSession.closed=La sesión WebSocket [{0}] ha sido cerrada y ningún otro
método (aparte de close()) puede ser llamado en una sesión cerrada\n
wsSession.created=La sesion WebSocket [{0}] fue creada\n
-wsSession.doClose=Cerrando WebSocket sesión [{1}]
+wsSession.doClose=Cerrando WebSocket sesión [{0}]
wsSession.duplicateHandlerText=Un manejador de mensaje de texto ya ha sido
configurado
wsSession.instanceNew=Falló la registración de la instancia del dispoitivo
final
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9a719fed66..4860a2b309 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -308,6 +308,9 @@
Improvements to Russian translations. (markt)
+
+Improvements to Spanish translations. (markt)
+
-
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 Russian translations.
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 42af4f51e6 Improvements to Russian translations.
42af4f51e6 is described below
commit 42af4f51e6ddc427232cc60b31f312f6cb7d16d9
Author: Mark Thomas
AuthorDate: Fri Sep 2 13:41:16 2022 +0100
Improvements to Russian translations.
---
java/org/apache/tomcat/websocket/LocalStrings_ru.properties | 2 +-
webapps/docs/changelog.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ru.properties
b/java/org/apache/tomcat/websocket/LocalStrings_ru.properties
index 5f90282dcc..6a1e5c79b2 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ru.properties
@@ -17,4 +17,4 @@ caseInsensitiveKeyMap.nullKey=Пустое значение ключей зап
wsHandshakeRequest.invalidUri=Строка [{0}] не может быть использована для
создания корректного URI
-wsSession.doClose=Закрытие WebSocket сессии [{1}]
+wsSession.doClose=Закрытие WebSocket сессии [{0}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 32383c9ef9..9a719fed66 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -305,6 +305,9 @@
Improvements to Brazilian Portuguese translations. (markt)
+
+Improvements to Russian translations. (markt)
+
-
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 Brazilian Portuguese translations
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 32b3bbfdb2 Improvements to Brazilian Portuguese translations
32b3bbfdb2 is described below
commit 32b3bbfdb2596cb26cbde09987a98235fc0b4f38
Author: Mark Thomas
AuthorDate: Fri Sep 2 13:40:24 2022 +0100
Improvements to Brazilian Portuguese translations
---
.../apache/tomcat/util/buf/LocalStrings_pt_BR.properties | 16
webapps/docs/changelog.xml | 3 +++
2 files changed, 19 insertions(+)
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_pt_BR.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_pt_BR.properties
new file mode 100644
index 00..0ff8d884f3
--- /dev/null
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_pt_BR.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+messageBytes.illegalCharacter=Caracter Unicode [{0}] no code point [{1}] não
pode ser codificado porque está fora do limite (de 0 a 255)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 96de8e4ae3..32383c9ef9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -302,6 +302,9 @@
Improvements to Korean translations. Contributed by 수현. (markt)
+
+Improvements to Brazilian Portuguese translations. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Why JsonErrorReportValve doesn't exist in 8.5.x
> 2022年9月2日 18:32，Mark Thomas 写道： > > On 02/09/2022 10:23, Han Li wrote: >> Hi all, >> I found that JsonErrorReportValve doesn't exist in 8.5.x，but exists in all >> other branch. >> I have looked at the implementation of this class and found nothing at the >> code level that 8.5.x couldn’t support, >> And I also didn’t find any useful information on the mailing list. >> So why does 8.5.x not support this feature? > > I don't recall any discussion about this and I can't find anything in the > archives. > > I'd have no objection to it being back-ported. > OK, I will back-port it to 8.5.x Han > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.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: Improvements to Korean translations. Contributed by 수현.
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 6b07d55caf Improvements to Korean translations. Contributed by 수현.
6b07d55caf is described below
commit 6b07d55cafeff597aa52c48804579ecff7c0ce08
Author: Mark Thomas
AuthorDate: Fri Sep 2 13:38:47 2022 +0100
Improvements to Korean translations. Contributed by 수현.
---
java/org/apache/catalina/core/LocalStrings_ko.properties | 1 +
java/org/apache/naming/factory/LocalStrings_ko.properties | 3 +++
java/org/apache/tomcat/util/buf/LocalStrings_ko.properties | 2 ++
java/org/apache/tomcat/util/net/LocalStrings_ko.properties | 1 +
webapps/docs/changelog.xml | 3 +++
5 files changed, 10 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index befd287f63..945b68861c 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -121,6 +121,7 @@ containerBase.realm.stop=이전 realm을 중지시키는 중 오류 발생
containerBase.threadedStartFailed=자식 컨테이너를 시작 중 실패했습니다.
containerBase.threadedStopFailed=자식 컨테이너가 중지되는 중 실패했습니다.
+defaultInstanceManager.invalidAnnotation=유효하지 않은 [{0}] annotation입니다.
defaultInstanceManager.invalidInjection=유효하지 않은 메소드 리소스 injection annotation
defaultInstanceManager.postConstructNotFound=클래스 [{1}]을(를) 위한 PostConstruct
메소드 [{0}]이(가), 배치 descriptor에 선언되어 있지만, 해당 메소드를 찾을 수 없습니다.
defaultInstanceManager.preDestroyNotFound=클래스 [{1}]을(를) 위한 PreDestroy 메소드
[{0}]이(가) 배치 descriptor에 선언되어 있으나, 해당 메소드를 찾을 수 없습니다.
diff --git a/java/org/apache/naming/factory/LocalStrings_ko.properties
b/java/org/apache/naming/factory/LocalStrings_ko.properties
index 60c0f47b25..c72fa2942c 100644
--- a/java/org/apache/naming/factory/LocalStrings_ko.properties
+++ b/java/org/apache/naming/factory/LocalStrings_ko.properties
@@ -13,6 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+beanFactory.classNotFound=클래스를 찾을 수 없습니다. : [{0}]
+beanFactory.readOnlyProperty=[{0}] 프로퍼티에 대한 쓰기가 허용되지 않습니다.
+
dataSourceLinkFactory.badWrapper=타입 [{0}]을(를) 위한 wrapper가 아닙니다.
factoryBase.factoryClassError=리소스 팩토리 클래스를 로드하지 못했습니다.
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
index cc6a3a8d9d..1341cfda04 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
@@ -27,6 +27,8 @@ encodedSolidusHandling.invalid=해당 값 [{0}]은(는) 인식되지 않습니
hexUtils.fromHex.nonHex=입력은 오직 16진수 숫자로만 이루어져야 합니다.
hexUtils.fromHex.oddDigits=입력은 반드시 짝수 개의 16진수 숫자들로 이루어져야 합니다.
+messageBytes.illegalCharacter=code point [{1}]에 위치한 유니코드 문자 [{0}]은(는), 0에서
255까지의 허용 범위 바깥에 있으므로 인코딩될 수 없습니다.
+
uDecoder.eof=파일의 끝 (EOF)
uDecoder.noSlash=인코딩된 슬래시 문자는 허용되지 않습니다.
uDecoder.urlDecode.conversionError=문자셋 [{1}]을(를) 사용하여 [{0}]을(를) 디코드하지 못했습니다.
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
index 4497247d79..e60e0b4c15 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
@@ -155,6 +155,7 @@ sslUtilBase.aliasIgnored=FIPS이 활성화되어 있어, 별칭 [{0}]은(는)
sslUtilBase.alias_no_key_entry=별칭 이름 [{0}]을(를) 사용하여 키 엔트리를 식별해낼 수 없습니다.
sslUtilBase.invalidTrustManagerClassName=trustManagerClassName에 의해 제공된 클래스
[{0}]은(는) javax.net.ssl.TrustManager를 구현하지 않았습니다.
sslUtilBase.keystore_load_failed=[{2}](으)로 인하여, 경로 [{1}]에 있고 타입이 [{0}]인 키 저장소를
로드하지 못했습니다.
+sslUtilBase.noCertFile=SSL connector를 사용 시 SSLHostConfig certificateFile
어트리뷰트가 정의되어야 합니다.
sslUtilBase.noCrlSupport=truststoreProvider [{0}]은(는)
certificateRevocationFile 설정 옵션을 지원하지 않습니다.
sslUtilBase.noKeys=개인 키들에 대한 별칭들이 키 저장소에 없습니다.
sslUtilBase.noVerificationDepth=truststoreProvider [{0}]은(는)
certificateVerificationDepth 설정 옵션을 지원하지 않습니다.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a59e7b832a..96de8e4ae3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -299,6 +299,9 @@
Improvements to Japanese translations. Contributed by tak7iji and
Shirayuking. (markt)
+
+Improvements to Korean translations. Contributed by 수현. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update changelog
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 76ed843fe6 Update changelog 76ed843fe6 is described below commit 76ed843fe6e04fea4a4c86de9a2235e9f91b3b6c Author: Mark Thomas AuthorDate: Fri Sep 2 13:36:26 2022 +0100 Update changelog --- webapps/docs/changelog.xml | 4 1 file changed, 4 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 1eb535f78a..a59e7b832a 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -295,6 +295,10 @@ Improvements to German translations. (markt) + +Improvements to Japanese translations. Contributed by tak7iji and +Shirayuking. (markt) + - 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 Japanese translations. By tak7iji and Shirayuking.
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 f5660d7c20 Improvements to Japanese translations. By tak7iji and
Shirayuking.
f5660d7c20 is described below
commit f5660d7c20570a3b201f91728511bf041b86b755
Author: Mark Thomas
AuthorDate: Fri Sep 2 13:36:08 2022 +0100
Improvements to Japanese translations. By tak7iji and Shirayuking.
---
java/org/apache/catalina/authenticator/LocalStrings_ja.properties | 2 ++
java/org/apache/catalina/core/LocalStrings_ja.properties | 2 ++
java/org/apache/catalina/filters/LocalStrings_ja.properties | 2 +-
java/org/apache/catalina/loader/LocalStrings_ja.properties| 2 +-
.../catalina/tribes/group/interceptors/LocalStrings_ja.properties | 2 +-
java/org/apache/catalina/tribes/tipis/LocalStrings_ja.properties | 2 +-
java/org/apache/catalina/tribes/transport/LocalStrings_ja.properties | 2 +-
java/org/apache/catalina/valves/LocalStrings_ja.properties| 2 +-
java/org/apache/coyote/LocalStrings_ja.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_ja.properties | 3 +++
java/org/apache/jasper/resources/LocalStrings_ja.properties | 4 ++--
java/org/apache/tomcat/util/buf/LocalStrings_ja.properties| 2 ++
java/org/apache/tomcat/util/net/LocalStrings_ja.properties| 1 +
java/org/apache/tomcat/websocket/LocalStrings_ja.properties | 2 +-
14 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index de814db2b0..b2e510981e 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -36,11 +36,13 @@ basicAuthenticator.invalidCharset=指定できる値は、null、空の文字列
digestAuthenticator.cacheRemove=有効なエントリがクライアントのnonceキャッシュから削除され、新しいエントリのためのスペースが確保されました。
リプレイ攻撃が可能になりました。 リプレイ攻撃の可能性を防ぐには、nonceValidityを減らすか、nonceCacheSizeを増やしてください。
このタイプの警告は5分間表示されなくなります。
+formAuthenticator.changeSessionIdLogin=FORM 認証でログイン ページに転送する前に、セッション ID が
[{0}] から [{1}] に変更されました
formAuthenticator.forwardErrorFail=エラーページへ転送中の予期せぬエラー
formAuthenticator.forwardLogin=リクエストメソッドGETを使用してコンテキスト [{3}] のページ [{2}] にメソッド
[{1}] で行われた [{0}] の要求をフォワードします
formAuthenticator.forwardLoginFail=ログインページへの転送での予期しないエラー
formAuthenticator.noErrorPage=コンテキスト [{0}] のFORM認証にエラーページが定義されていません
formAuthenticator.noLoginPage=コンテキスト [{0}] のFORM認証にログインページが定義されていません
+formAuthenticator.sessionIdMismatch=現在のセッションIDは [{0}] ですが、FORM認証 は [{1}]
を期待していました
singleSignOn.debug.associate=SSOはアプリケーションセッション[{1}]をSSOセッション[{0}]に関連付けます
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 7276a5373e..f40175740a 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -68,6 +68,7 @@ applicationServletRegistration.setServletSecurity.ise=コンテキストが既
applicationSessionCookieConfig.ise=コンテキスト [{1}] が初期化済みなので、プロパティ [{0}]
をSessionCookieConfigに追加することはできません。
+aprListener.FIPSProviderNotDefault=AprLifecycleListenerがFIPSモード [{0}]
で構成されている場合は、FIPSプロバイダをデフォルトプロバイダとして構成する必要があります
aprListener.aprDestroy=APRベースのApache Tomcatネイティブライブラリのシャットダウンに失敗しました。
aprListener.aprInit=商用環境に最適な性能を発揮する APR ベースの Tomcat ネイティブライブラリが
java.library.path [{0}] に存在しません。
aprListener.aprInitDebug=APRベースのApache Tomcatネイティブライブラリは、java.library.path
[{1}] 上の名前 [{0}] を使用して見つかりませんでした。 報告されたエラーは [{2}]
@@ -88,6 +89,7 @@ aprListener.tcnVersion=インストールされた Apache Tomcat ネイティブ
aprListener.tooLateForFIPSMode=FIPSModeを設定できません：SSLは既に初期化されています。
aprListener.tooLateForSSLEngine=setSSLEngineできません: SSLはすでに初期化されています
aprListener.tooLateForSSLRandomSeed=setSSLRandomSeedできません：SSLは既に初期化されています。
+aprListener.usingFIPSProvider=FIPSプロバイダをデフォルトプロバイダとしてOpenSSLを使用します
aprListener.wrongFIPSMode=AprLifecycleListener の設定 FIPSMode に予期せぬ値 [{0}]
が指定されました。
asyncContextImpl.asyncDispatchError=非同期ディスパッチの処理中にエラーが発生しました。
diff --git a/java/org/apache/catalina/filters/LocalStrings_ja.properties
b/java/org/apache/catalina/filters/LocalStrings_ja.properties
index 7048747f25..1cf37372a6 100644
--- a/java/org/apache/catalina/filters/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_ja.properties
@@ -47,7 +47,7 @@ expiresFilter.useMatchingConfiguration=content-type [{2}] が
[{3}] を返すた
filterbase.noSuchProperty=[{1}] タイプのフィルタにはプロパティ [{0}] が定義されていません。
-http.403=指定されたリソース [{0}] へのアクセスは拒否されました
+http.403=指定されたリソース [{0}] へのアクセスは拒否されました。
[tomcat] branch main updated: Improvements to German translations
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 fbd1f9b6f4 Improvements to German translations
fbd1f9b6f4 is described below
commit fbd1f9b6f4434fc445581627c6e3c53965a5cf30
Author: Mark Thomas
AuthorDate: Fri Sep 2 13:32:16 2022 +0100
Improvements to German translations
---
.../apache/tomcat/util/buf/LocalStrings_de.properties| 16
.../apache/tomcat/websocket/LocalStrings_de.properties | 2 +-
webapps/docs/changelog.xml | 3 +++
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_de.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_de.properties
new file mode 100644
index 00..2220bbfc34
--- /dev/null
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_de.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+messageBytes.illegalCharacter=Das Unicode Zeichen [{0}] an Code Punkt [{1}]
kann nicht kodiert werden, da es außerhalb des erlaubten Bereiches von 0 bis
255 ist.
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_de.properties
b/java/org/apache/tomcat/websocket/LocalStrings_de.properties
index a12781bd0f..ebcc1f30af 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_de.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_de.properties
@@ -26,7 +26,7 @@ wsRemoteEndpoint.tooMuchData=Ping oder Pong darf nicht mehr
als 125 Bytes senden
wsRemoteEndpoint.wrongState=Der entfernte Endpunkt war im Zustand [{0}]
welcher für die aufgerufene Methode ungültig ist
wsSession.created=Websocket Sitzung [{0}] erzeugt
-wsSession.doClose=Schließe WebSocket-Sitzung [{1}]
+wsSession.doClose=Schließe WebSocket-Sitzung [{0}]
wsSession.duplicateHandlerText=Ein Text Message Handler ist bereits
konfiguriert
wsSession.instanceNew=Registrierung der Endpunkt-Instanz ist fehlgeschlagen
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 569dc3c49c..1eb535f78a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -292,6 +292,9 @@
Improvements to French translations. (remm)
+
+Improvements to German translations. (markt)
+
-
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 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 218e9a8317 Improvements to French translations. (remm)
218e9a8317 is described below
commit 218e9a8317ce34c36f5225d1469e63e5f228553c
Author: Mark Thomas
AuthorDate: Fri Sep 2 13:28:03 2022 +0100
Improvements to French translations. (remm)
---
java/org/apache/catalina/core/LocalStrings_fr.properties| 2 ++
java/org/apache/tomcat/util/buf/LocalStrings_fr.properties | 2 ++
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 2 +-
webapps/docs/changelog.xml | 3 +++
5 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index f92e6f1612..4c11ec358c 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -68,6 +68,7 @@ applicationServletRegistration.setServletSecurity.ise=Les
contraintes de sécuri
applicationSessionCookieConfig.ise=La propriété [{0}] ne peut pas être ajoutée
au SessionCookieConfig pour le contexte [{1}] car le contexte a déjà été
initialisé
+aprListener.FIPSProviderNotDefault=Le provider FIPS doit être configuré comme
provider par défaut quand AprLifecycleListener est configuré en mode FIPS [{0}]
aprListener.aprDestroy=Echec de l'arrêt de la librairie Apache Tomcat Native
basée sur APR
aprListener.aprInit=La librairie Apache Tomcat Native basée sur APR qui permet
des performances optimales dans les environnements de production n''a pas été
trouvée sur le java.library.path : [{0}]
aprListener.aprInitDebug=La librairie Apache Tomcat Native basée sur APR n''a
pas été trouvée en utilisant les noms [{0}] dans le java.library.path [{1}],
les erreurs retournées sont [{2}]
@@ -88,6 +89,7 @@ aprListener.tcnVersion=Un version ancienne [{0}] de la
bibliothèque Apache Tomc
aprListener.tooLateForFIPSMode=Ne peut pas passer en mode FIPS, SSL a déjà été
initialisé
aprListener.tooLateForSSLEngine=Impossible d'appeler setSSLEngine, SSL a déjà
été initialisé
aprListener.tooLateForSSLRandomSeed=setSSLRandomSeed impossible : SSL a déjà
été initialisé
+aprListener.usingFIPSProvider=Utilisation d'OpenSSL avec le provider FIPS
comme provider par défaut
aprListener.wrongFIPSMode=Valuer inattendue de l''option FIPSMode de
AprLifecycleListener : [{0}]
asyncContextImpl.asyncDispatchError=Erreur lors d'un dispatch asynchrone
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
index ba593d9b99..38af8c80fa 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
@@ -27,6 +27,8 @@ encodedSolidusHandling.invalid=La valeur [{0}] n''est pas
reconnue
hexUtils.fromHex.nonHex=L'entrée doit être uniquement des chiffres héxadécimaux
hexUtils.fromHex.oddDigits=L'entrée doit contenir un nombre pair de chiffres
héxadécimaux
+messageBytes.illegalCharacter=Le caractère Unicode [{0}] ayant le code point
[{1}] ne peut être encodé, parce qu''il est en-dehors de l''éventail permis
0-255.
+
uDecoder.eof=Fin de fichier (EOF)
uDecoder.noSlash=Un caractère slash encodé n'est pas autorisé
uDecoder.urlDecode.conversionError=Echec de décodage [{0}] en utilisant le jeu
de caractères [{1}]
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index dde78519e9..979eb62ae9 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -155,6 +155,7 @@ sslUtilBase.aliasIgnored=Le mode FIPS est activé donc le
nom d''alias [{0}] ser
sslUtilBase.alias_no_key_entry=Le nom alias [{0}] n''identifie pas une entrée
de clé
sslUtilBase.invalidTrustManagerClassName=Le trustManagerClassName fourni [{0}]
n''implémente pas javax.net.ssl.TrustManager
sslUtilBase.keystore_load_failed=Impossible de changer la base de clés de type
[{0}] avec le chemin [{1}] à cause de [{2}]
+sslUtilBase.noCertFile=L'attribut certificateFile de SSLHostConfig doit être
défini lorsque un connecteur SSL est utilisé
sslUtilBase.noCrlSupport=Le truststoreProvider [{0}] ne supporte pas d''option
de configuration certificateRevocationFile
sslUtilBase.noKeys=Aucun alias pour les clés privées n'a été trouvé dans la
base de clés
sslUtilBase.noVerificationDepth=Le truststoreProvider [{0}] ne supporte pas
l''option de configuration certificateVerificationDepth
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
[tomcat] branch main updated: Improvements to Czech translations
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 1471b094ba Improvements to Czech translations
1471b094ba is described below
commit 1471b094ba78d468a27d1d4f3e3da37bb90d5af5
Author: Mark Thomas
AuthorDate: Fri Sep 2 13:23:07 2022 +0100
Improvements to Czech translations
---
.../apache/tomcat/util/buf/LocalStrings_cs.properties| 16
.../apache/tomcat/websocket/LocalStrings_cs.properties | 2 +-
webapps/docs/changelog.xml | 3 +++
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_cs.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_cs.properties
new file mode 100644
index 00..1a0a1214f0
--- /dev/null
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_cs.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+messageBytes.illegalCharacter=Unicode znak [{0}] na kódové značce [{1}] nemůže
být zakódován, protože je mimo povolený rozsah 0 až 255.
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_cs.properties
b/java/org/apache/tomcat/websocket/LocalStrings_cs.properties
index 33f1680534..f6716ec9e8 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_cs.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_cs.properties
@@ -24,7 +24,7 @@ wsRemoteEndpoint.closedDuringMessage=Zbytek zprávy nebude
odeslán, protože We
wsRemoteEndpoint.flushOnCloseFailed=Dávkové zprávy jsou po uzavření relace
stále povoleny. Nelze vyprázdnit zbývající dávkovou zprávu.
wsRemoteEndpoint.wrongState=Vzdálený koncový bod byl ve stavu [{0}], což je
pro volanou metodu neplatný stav
-wsSession.doClose=Zavírám WebSocket session [{1}]
+wsSession.doClose=Zavírám WebSocket session [{0}]
wsSession.duplicateHandlerText=Jednotka (handler) pro textové zprávy již byla
nakonfigurována
wsSession.instanceNew=Selhala registrace instance endpointu
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 849db08f01..03c3acd265 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -286,6 +286,9 @@
Improvements to Chinese translations. (lihan)
+
+Improvements to Czech translations. (markt)
+
-
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. (lihan)
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 17a8da7555 Improvements to Chinese translations. (lihan)
17a8da7555 is described below
commit 17a8da7555a4416ad8d44e7fd6b8867ce10fa03f
Author: Mark Thomas
AuthorDate: Fri Sep 2 13:21:38 2022 +0100
Improvements to Chinese translations. (lihan)
---
.../catalina/authenticator/LocalStrings_zh_CN.properties | 9 ++---
.../authenticator/jaspic/LocalStrings_zh_CN.properties | 3 ++-
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 12
.../apache/catalina/filters/LocalStrings_zh_CN.properties| 4 ++--
.../apache/catalina/ha/session/LocalStrings_zh_CN.properties | 6 +++---
java/org/apache/catalina/realm/LocalStrings_zh_CN.properties | 6 +++---
java/org/apache/catalina/ssi/LocalStrings_zh_CN.properties | 2 +-
.../apache/catalina/startup/LocalStrings_zh_CN.properties| 2 +-
.../catalina/storeconfig/LocalStrings_zh_CN.properties | 2 +-
.../catalina/tribes/membership/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/webresources/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/coyote/http11/LocalStrings_zh_CN.properties | 6 +++---
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 12 ++--
.../apache/jasper/resources/LocalStrings_zh_CN.properties| 2 +-
java/org/apache/naming/factory/LocalStrings_zh_CN.properties | 6 ++
.../org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties | 2 ++
.../apache/tomcat/util/compat/LocalStrings_zh_CN.properties | 2 ++
.../tomcat/util/digester/LocalStrings_zh_CN.properties | 4 ++--
.../tomcat/util/http/parser/LocalStrings_zh_CN.properties| 2 +-
.../org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 7 +--
.../tomcat/util/net/openssl/LocalStrings_zh_CN.properties| 4 ++--
.../apache/tomcat/websocket/LocalStrings_zh_CN.properties| 6 +++---
webapps/docs/changelog.xml | 3 +++
23 files changed, 66 insertions(+), 42 deletions(-)
diff --git
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index f74c009e8b..17a8983c1e 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -14,7 +14,7 @@
# limitations under the License.
authenticator.certificates=此请求中没有客户端证书链
-authenticator.changeSessionId=在身份验证时, 会话 ID 从 [{0} 更改为 [{1}]
+authenticator.changeSessionId=在身份验证时, 会话 ID 从 [{0}] 更改为 [{1}]
authenticator.check.authorize=用户名[{0}]从连接器获得，并被信任为有效。从Tomcat领域获取此用户的角色。
authenticator.check.authorizeFail=领域无法识别用户[{0}]。创建具有该名称且没有角色的主体。
authenticator.check.found=已通过身份验证 [{0}]
@@ -43,7 +43,7 @@ formAuthenticator.noErrorPage=没有为上下文[{0}]中的表单身份验证定
formAuthenticator.noLoginPage=在环境[{0}]中，未为FORM认证定义登录页面
singleSignOn.debug.associate=SSO将应用程序会话[{1}]与SSO会话[{0}]关联
-singleSignOn.debug.associateFail=SSO无法关联应用程序会话{0}，因为SSO会话{1}不存在。
+singleSignOn.debug.associateFail=SSO无法关联应用程序会话[{0}]，因为SSO会话[{1}]不存在。
singleSignOn.debug.cookieCheck=SSO检查SSO cookie
singleSignOn.debug.cookieNotFound=SSO没有找到SSO cookie
singleSignOn.debug.deregister=与SSO会话[{1}]关联的SSO过期应用程序会话[{0}]
@@ -52,7 +52,7 @@ singleSignOn.debug.deregisterNone=SSO注销了SSO会话[{0}]，但未找到关
singleSignOn.debug.hasPrincipal=找到以前经过身份验证的主体[{0}]
singleSignOn.debug.invoke=SSO为[{0}]处理请求
singleSignOn.debug.principalCheck=SSO为SSO会话[{0}]寻找缓存的Principal
-singleSignOn.debug.principalFound=SSO 找到了带着认证类型的缓存代理
+singleSignOn.debug.principalFound=SSO 找到了带着认证类型[{1}]的缓存Principal [{0}]
singleSignOn.debug.principalNotFound=SSO未找到缓存的Principal，为会话[{0}]擦除SSO cookie
singleSignOn.debug.register=使用身份验证类型[{2}]的用户[{1}]的SSO注册SSO会话[{0}]。
singleSignOn.debug.removeSession=SSO 从 SSO session [{1}] 中删除应用程序会话 [{0}]
@@ -70,3 +70,6 @@ spnegoAuthenticator.authHeaderNoToken=客户端发送的协商授权 header 未
spnegoAuthenticator.authHeaderNotNego=客户端发送的授权头不是以协商开始的。
spnegoAuthenticator.serviceLoginFail=无法作为服务主体登录
spnegoAuthenticator.ticketValidateFail=无法验证客户端提供的票证
+
+sslAuthenticatorValve.http2=虚拟主机 [{1}] 中的上下文 [{0}] 配置为使用 CLIENT-CERT 身份验证，并且
[{2}] 配置为支持 HTTP/2。使用 CLIENT-CERT 身份验证与使用 HTTP/2 不兼容。
+sslAuthenticatorValve.tls13=虚拟主机 [{1}] 中的上下文 [{0}] 配置为使用 CLIENT-CERT 身份验证，并且
[{2}] 配置为使用 JSSE 支持 TLS 1.3。使用 CLIENT-CERT 身份验证与使用 TLS 1.3 和 JSSE 不兼容。
diff --git
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
index c00919c149..3fe84f8cb2 100644
---
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
+++
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
@@ -17,11 +17,12 @@ authConfigFactoryImpl.load=从[{0}]加载持久化提供者注册信息
[tomcat] branch 9.0.x updated: Remove unused imports
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 23312939d7 Remove unused imports 23312939d7 is described below commit 23312939d7548ffe056a03132daf3a1e862c27b7 Author: Mark Thomas AuthorDate: Fri Sep 2 12:24:11 2022 +0100 Remove unused imports --- java/org/apache/catalina/valves/JsonErrorReportValve.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/java/org/apache/catalina/valves/JsonErrorReportValve.java b/java/org/apache/catalina/valves/JsonErrorReportValve.java index 9da5c33550..19afec6d84 100644 --- a/java/org/apache/catalina/valves/JsonErrorReportValve.java +++ b/java/org/apache/catalina/valves/JsonErrorReportValve.java @@ -18,11 +18,9 @@ package org.apache.catalina.valves; import java.io.IOException; import java.io.Writer; -import java.util.concurrent.atomic.AtomicBoolean; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; -import org.apache.coyote.ActionCode; import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.res.StringManager; - 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: Remove unused imports
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 1598926767 Remove unused imports 1598926767 is described below commit 1598926767bb48b4b7c00b0b84d99774edb84942 Author: Mark Thomas AuthorDate: Fri Sep 2 12:24:11 2022 +0100 Remove unused imports --- java/org/apache/catalina/valves/JsonErrorReportValve.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/java/org/apache/catalina/valves/JsonErrorReportValve.java b/java/org/apache/catalina/valves/JsonErrorReportValve.java index 9da5c33550..19afec6d84 100644 --- a/java/org/apache/catalina/valves/JsonErrorReportValve.java +++ b/java/org/apache/catalina/valves/JsonErrorReportValve.java @@ -18,11 +18,9 @@ package org.apache.catalina.valves; import java.io.IOException; import java.io.Writer; -import java.util.concurrent.atomic.AtomicBoolean; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; -import org.apache.coyote.ActionCode; import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.res.StringManager; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Remove unused imports
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 d463e8e5b5 Remove unused imports d463e8e5b5 is described below commit d463e8e5b528b5774f73df314c74bec81ea2ea8f Author: Mark Thomas AuthorDate: Fri Sep 2 12:24:11 2022 +0100 Remove unused imports --- java/org/apache/catalina/valves/JsonErrorReportValve.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/java/org/apache/catalina/valves/JsonErrorReportValve.java b/java/org/apache/catalina/valves/JsonErrorReportValve.java index 9da5c33550..19afec6d84 100644 --- a/java/org/apache/catalina/valves/JsonErrorReportValve.java +++ b/java/org/apache/catalina/valves/JsonErrorReportValve.java @@ -18,11 +18,9 @@ package org.apache.catalina.valves; import java.io.IOException; import java.io.Writer; -import java.util.concurrent.atomic.AtomicBoolean; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; -import org.apache.coyote.ActionCode; import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.res.StringManager; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66209] CPU regression when classpath Bloom filters are active
https://bz.apache.org/bugzilla/show_bug.cgi?id=66209 --- Comment #17 from Mark Thomas --- +1 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66196] HTTP/1 connector doesn't blow-up when HTTP header contains non-ASCII characters
https://bz.apache.org/bugzilla/show_bug.cgi?id=66196 --- Comment #5 from Mark Thomas --- Fixed in 10.1.x for 10.1.0-M18 onwards I intend to delay back-porting for a few releases in case the changes to MessageBytes triggers regressions. -- 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 main updated (64573401e9 -> 94a50262c0)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 64573401e9 Pull up duplicate check codes new 990b41c89c Refactor MessageBytes make conversions consistent with most recent set new 94a50262c0 Fix BZ 66196 - Log and drop invalid HTTP/1.1 response headers 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: .../apache/catalina/core/ApplicationContext.java | 1 + java/org/apache/catalina/mapper/Mapper.java| 1 + .../catalina/valves/rewrite/RewriteValve.java | 18 +- java/org/apache/coyote/http11/Http11Processor.java | 15 +- .../apache/coyote/http11/LocalStrings.properties | 1 + .../apache/tomcat/util/buf/LocalStrings.properties | 2 + java/org/apache/tomcat/util/buf/MessageBytes.java | 147 ++- .../coyote/http11/TestHttp11OutputBuffer.java | 81 .../apache/tomcat/util/buf/TestMessageBytes.java | 67 +++ .../util/buf/TestMessageBytesConversion.java | 207 + webapps/docs/changelog.xml | 5 + 11 files changed, 482 insertions(+), 63 deletions(-) create mode 100644 test/org/apache/tomcat/util/buf/TestMessageBytesConversion.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Fix BZ 66196 - Log and drop invalid HTTP/1.1 response headers
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
commit 94a50262c0df92f9eadec09f9a5f2823f8a7da5a
Author: Mark Thomas
AuthorDate: Fri Sep 2 11:24:06 2022 +0100
Fix BZ 66196 - Log and drop invalid HTTP/1.1 response headers
https://bz.apache.org/bugzilla/show_bug.cgi?id=66196
This also optimizes the common case of String -> Byte conversion in
MessageByte when ISO-8859-1 is used.
---
java/org/apache/coyote/http11/Http11Processor.java | 15 +++-
.../apache/coyote/http11/LocalStrings.properties | 1 +
.../apache/tomcat/util/buf/LocalStrings.properties | 2 +
java/org/apache/tomcat/util/buf/MessageBytes.java | 80 -
.../coyote/http11/TestHttp11OutputBuffer.java | 81 ++
.../apache/tomcat/util/buf/TestMessageBytes.java | 67 ++
.../util/buf/TestMessageBytesConversion.java | 2 +-
webapps/docs/changelog.xml | 5 ++
8 files changed, 235 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index f8c7312029..0094ade7aa 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -1063,7 +1063,20 @@ public class Http11Processor extends AbstractProcessor {
int size = headers.size();
for (int i = 0; i < size; i++) {
-outputBuffer.sendHeader(headers.getName(i),
headers.getValue(i));
+try {
+outputBuffer.sendHeader(headers.getName(i),
headers.getValue(i));
+} catch (IllegalArgumentException iae) {
+// Log the problematic header
+
log.warn(sm.getString("http11processor.response.invalidHeader",
+headers.getName(i), headers.getValue(i)), iae);
+// Remove the problematic header
+headers.removeHeader(i);
+size--;
+// Header buffer is corrupted. Reset it and start again.
+outputBuffer.resetHeaderBuffer();
+i = 0;
+outputBuffer.sendStatus();
+}
}
outputBuffer.endHeaders();
} catch (Throwable t) {
diff --git a/java/org/apache/coyote/http11/LocalStrings.properties
b/java/org/apache/coyote/http11/LocalStrings.properties
index d880c717af..3e49897b51 100644
--- a/java/org/apache/coyote/http11/LocalStrings.properties
+++ b/java/org/apache/coyote/http11/LocalStrings.properties
@@ -35,6 +35,7 @@ http11processor.request.nonNumericContentLength=The request
contained a content-
http11processor.request.prepare=Error preparing request
http11processor.request.process=Error processing request
http11processor.response.finish=Error finishing response
+http11processor.response.invalidHeader=The HTTP response header [{0}] with
value [{1}] has been removed from the response because it is invalid
http11processor.sendfile.error=Error sending data using sendfile. May be
caused by invalid request attributes for start/end points
http11processor.socket.info=Exception getting socket information
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings.properties
b/java/org/apache/tomcat/util/buf/LocalStrings.properties
index 2dd62b93e9..da283cb3f4 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings.properties
@@ -27,6 +27,8 @@ encodedSolidusHandling.invalid=The value [{0}] is not
recognised
hexUtils.fromHex.nonHex=The input must consist only of hex digits
hexUtils.fromHex.oddDigits=The input must consist of an even number of hex
digits
+messageBytes.illegalCharacter=The Unicode character [{0}] at code point [{1}]
cannot be encoded as it is outside the permitted range of 0 to 255
+
uDecoder.eof=End of file (EOF)
uDecoder.noSlash=The encoded slash character is not allowed
uDecoder.urlDecode.conversionError=Failed to decode [{0}] using character set
[{1}]
diff --git a/java/org/apache/tomcat/util/buf/MessageBytes.java
b/java/org/apache/tomcat/util/buf/MessageBytes.java
index d1d675fd02..50ae3596dc 100644
--- a/java/org/apache/tomcat/util/buf/MessageBytes.java
+++ b/java/org/apache/tomcat/util/buf/MessageBytes.java
@@ -19,9 +19,12 @@ package org.apache.tomcat.util.buf;
import java.io.IOException;
import java.io.Serializable;
import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
import java.nio.charset.Charset;
import java.util.Locale;
+import org.apache.tomcat.util.res.StringManager;
+
/**
* This class is used to represent a subarray of bytes in an HTTP message.
* It represents all request/response elements. The byte/char conversions are
@@ -35,8 +38,11 @@ import java.util.Locale;
* @author Costin Manolache
[tomcat] 01/02: Refactor MessageBytes make conversions consistent with most recent set
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
commit 990b41c89ce03ccc900fb58e8196f05273953b00
Author: Mark Thomas
AuthorDate: Thu Sep 1 14:05:20 2022 +0100
Refactor MessageBytes make conversions consistent with most recent set
This is preparation for fixing BZ 66196
https://bz.apache.org/bugzilla/show_bug.cgi?id=66196
---
.../apache/catalina/core/ApplicationContext.java | 1 +
java/org/apache/catalina/mapper/Mapper.java| 1 +
.../catalina/valves/rewrite/RewriteValve.java | 18 +-
java/org/apache/tomcat/util/buf/MessageBytes.java | 105 ++-
.../util/buf/TestMessageBytesConversion.java | 207 +
5 files changed, 267 insertions(+), 65 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
index 010d738cea..5cd5ad23a1 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -438,6 +438,7 @@ public class ApplicationContext implements ServletContext {
try {
// Map the URI
+uriMB.setChars(MessageBytes.EMPTY_CHAR_ARRAY, 0, 0);
CharChunk uriCC = uriMB.getCharChunk();
try {
uriCC.append(context.getPath());
diff --git a/java/org/apache/catalina/mapper/Mapper.java
b/java/org/apache/catalina/mapper/Mapper.java
index f51a69cd97..62d4023eb8 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -695,6 +695,7 @@ public final class Mapper {
if (defaultHostName == null) {
return;
}
+host.setChars(MessageBytes.EMPTY_CHAR_ARRAY, 0, 0);
host.getCharChunk().append(defaultHostName);
}
host.toChars();
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
index 07f718df26..e1589f801a 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -492,49 +492,39 @@ public class RewriteValve extends ValveBase {
contextPath = request.getContextPath();
}
// Populated the encoded (i.e. undecoded) requestURI
-request.getCoyoteRequest().requestURI().setString(null);
+
request.getCoyoteRequest().requestURI().setChars(MessageBytes.EMPTY_CHAR_ARRAY,
0, 0);
CharChunk chunk =
request.getCoyoteRequest().requestURI().getCharChunk();
-chunk.recycle();
if (context) {
// This is neither decoded nor normalized
chunk.append(contextPath);
}
chunk.append(URLEncoder.DEFAULT.encode(urlStringDecoded,
uriCharset));
-request.getCoyoteRequest().requestURI().toChars();
// Decoded and normalized URI
// Rewriting may have denormalized the URL
urlStringDecoded = RequestUtil.normalize(urlStringDecoded);
-request.getCoyoteRequest().decodedURI().setString(null);
+
request.getCoyoteRequest().decodedURI().setChars(MessageBytes.EMPTY_CHAR_ARRAY,
0, 0);
chunk =
request.getCoyoteRequest().decodedURI().getCharChunk();
-chunk.recycle();
if (context) {
// This is decoded and normalized
chunk.append(request.getServletContext().getContextPath());
}
chunk.append(urlStringDecoded);
-request.getCoyoteRequest().decodedURI().toChars();
// Set the new Query if there is one
if (queryStringDecoded != null) {
-
request.getCoyoteRequest().queryString().setString(null);
+
request.getCoyoteRequest().queryString().setChars(MessageBytes.EMPTY_CHAR_ARRAY,
0, 0);
chunk =
request.getCoyoteRequest().queryString().getCharChunk();
-chunk.recycle();
chunk.append(URLEncoder.QUERY.encode(queryStringDecoded, uriCharset));
if (qsa && originalQueryStringEncoded != null &&
originalQueryStringEncoded.length() > 0) {
chunk.append('&');
chunk.append(originalQueryStringEncoded);
}
-if (!chunk.isNull()) {
-request.getCoyoteRequest().queryString().toChars();
-}
Re: Why JsonErrorReportValve doesn't exist in 8.5.x
On 02/09/2022 10:23, Han Li wrote: Hi all, I found that JsonErrorReportValve doesn't exist in 8.5.x，but exists in all other branch. I have looked at the implementation of this class and found nothing at the code level that 8.5.x couldn’t support, And I also didn’t find any useful information on the mailing list. So why does 8.5.x not support this feature? I don't recall any discussion about this and I can't find anything in the archives. I'd have no objection to it being back-ported. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Why JsonErrorReportValve doesn't exist in 8.5.x
Hi all, I found that JsonErrorReportValve doesn't exist in 8.5.x，but exists in all other branch. I have looked at the implementation of this class and found nothing at the code level that 8.5.x couldn’t support, And I also didn’t find any useful information on the mailing list. So why does 8.5.x not support this feature? Thanks, Han - 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: Pull up duplicate check codes
This is an automated email from the ASF dual-hosted git repository.
lihan 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 26ba1fcccf Pull up duplicate check codes
26ba1fcccf is described below
commit 26ba1fcccf5c29e771845e27cba0d47cbe563c6b
Author: lihan
AuthorDate: Fri Sep 2 16:41:28 2022 +0800
Pull up duplicate check codes
---
.../apache/catalina/valves/ErrorReportValve.java | 35 +++---
.../catalina/valves/JsonErrorReportValve.java | 18 ---
2 files changed, 17 insertions(+), 36 deletions(-)
diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java
b/java/org/apache/catalina/valves/ErrorReportValve.java
index 43e0e111df..f98a0d6a07 100644
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -141,6 +141,23 @@ public class ErrorReportValve extends ValveBase {
response.setSuspended(false);
try {
+int statusCode = response.getStatus();
+
+// Do nothing on a 1xx, 2xx and 3xx status
+// Do nothing if anything has been written already
+// Do nothing if the response hasn't been explicitly marked as in
error
+//and that error has not been reported.
+if (statusCode < 400 || response.getContentWritten() > 0 ||
!response.setErrorReported()) {
+return;
+}
+
+// If an error has occurred that prevents further I/O, don't waste
time
+// producing an error report that will never be read
+AtomicBoolean result = new AtomicBoolean(false);
+response.getCoyoteResponse().action(ActionCode.IS_IO_ALLOWED,
result);
+if (!result.get()) {
+return;
+}
report(request, response, throwable);
} catch (Throwable tt) {
ExceptionUtils.handleThrowable(tt);
@@ -160,25 +177,7 @@ public class ErrorReportValve extends ValveBase {
* a root cause exception
*/
protected void report(Request request, Response response, Throwable
throwable) {
-
int statusCode = response.getStatus();
-
-// Do nothing on a 1xx, 2xx and 3xx status
-// Do nothing if anything has been written already
-// Do nothing if the response hasn't been explicitly marked as in error
-//and that error has not been reported.
-if (statusCode < 400 || response.getContentWritten() > 0 ||
!response.setErrorReported()) {
-return;
-}
-
-// If an error has occurred that prevents further I/O, don't waste time
-// producing an error report that will never be read
-AtomicBoolean result = new AtomicBoolean(false);
-response.getCoyoteResponse().action(ActionCode.IS_IO_ALLOWED, result);
-if (!result.get()) {
-return;
-}
-
ErrorPage errorPage = null;
if (throwable != null) {
errorPage = errorPageSupport.find(throwable);
diff --git a/java/org/apache/catalina/valves/JsonErrorReportValve.java
b/java/org/apache/catalina/valves/JsonErrorReportValve.java
index 8ba4acbc3f..9da5c33550 100644
--- a/java/org/apache/catalina/valves/JsonErrorReportValve.java
+++ b/java/org/apache/catalina/valves/JsonErrorReportValve.java
@@ -41,25 +41,7 @@ public class JsonErrorReportValve extends ErrorReportValve {
@Override
protected void report(Request request, Response response, Throwable
throwable) {
-
int statusCode = response.getStatus();
-
-// Do nothing on a 1xx, 2xx and 3xx status
-// Do nothing if anything has been written already
-// Do nothing if the response hasn't been explicitly marked as in error
-//and that error has not been reported.
-if (statusCode < 400 || response.getContentWritten() > 0 ||
!response.setErrorReported()) {
-return;
-}
-
-// If an error has occurred that prevents further I/O, don't waste time
-// producing an error report that will never be read
-AtomicBoolean result = new AtomicBoolean(false);
-response.getCoyoteResponse().action(ActionCode.IS_IO_ALLOWED, result);
-if (!result.get()) {
-return;
-}
-
StringManager smClient = StringManager.getManager(Constants.Package,
request.getLocales());
response.setLocale(smClient.getLocale());
String type = null;
-
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: Pull up duplicate check codes
This is an automated email from the ASF dual-hosted git repository.
lihan 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 9ad34a856e Pull up duplicate check codes
9ad34a856e is described below
commit 9ad34a856edd88f9a0616c1e44be0d165c8d0bc4
Author: lihan
AuthorDate: Fri Sep 2 16:41:28 2022 +0800
Pull up duplicate check codes
---
.../apache/catalina/valves/ErrorReportValve.java | 35 +++---
.../catalina/valves/JsonErrorReportValve.java | 18 ---
2 files changed, 17 insertions(+), 36 deletions(-)
diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java
b/java/org/apache/catalina/valves/ErrorReportValve.java
index 126de87eb7..e7fbc696e4 100644
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -141,6 +141,23 @@ public class ErrorReportValve extends ValveBase {
response.setSuspended(false);
try {
+int statusCode = response.getStatus();
+
+// Do nothing on a 1xx, 2xx and 3xx status
+// Do nothing if anything has been written already
+// Do nothing if the response hasn't been explicitly marked as in
error
+//and that error has not been reported.
+if (statusCode < 400 || response.getContentWritten() > 0 ||
!response.setErrorReported()) {
+return;
+}
+
+// If an error has occurred that prevents further I/O, don't waste
time
+// producing an error report that will never be read
+AtomicBoolean result = new AtomicBoolean(false);
+response.getCoyoteResponse().action(ActionCode.IS_IO_ALLOWED,
result);
+if (!result.get()) {
+return;
+}
report(request, response, throwable);
} catch (Throwable tt) {
ExceptionUtils.handleThrowable(tt);
@@ -160,25 +177,7 @@ public class ErrorReportValve extends ValveBase {
* a root cause exception
*/
protected void report(Request request, Response response, Throwable
throwable) {
-
int statusCode = response.getStatus();
-
-// Do nothing on a 1xx, 2xx and 3xx status
-// Do nothing if anything has been written already
-// Do nothing if the response hasn't been explicitly marked as in error
-//and that error has not been reported.
-if (statusCode < 400 || response.getContentWritten() > 0 ||
!response.setErrorReported()) {
-return;
-}
-
-// If an error has occurred that prevents further I/O, don't waste time
-// producing an error report that will never be read
-AtomicBoolean result = new AtomicBoolean(false);
-response.getCoyoteResponse().action(ActionCode.IS_IO_ALLOWED, result);
-if (!result.get()) {
-return;
-}
-
ErrorPage errorPage = null;
if (throwable != null) {
errorPage = errorPageSupport.find(throwable);
diff --git a/java/org/apache/catalina/valves/JsonErrorReportValve.java
b/java/org/apache/catalina/valves/JsonErrorReportValve.java
index 8ba4acbc3f..9da5c33550 100644
--- a/java/org/apache/catalina/valves/JsonErrorReportValve.java
+++ b/java/org/apache/catalina/valves/JsonErrorReportValve.java
@@ -41,25 +41,7 @@ public class JsonErrorReportValve extends ErrorReportValve {
@Override
protected void report(Request request, Response response, Throwable
throwable) {
-
int statusCode = response.getStatus();
-
-// Do nothing on a 1xx, 2xx and 3xx status
-// Do nothing if anything has been written already
-// Do nothing if the response hasn't been explicitly marked as in error
-//and that error has not been reported.
-if (statusCode < 400 || response.getContentWritten() > 0 ||
!response.setErrorReported()) {
-return;
-}
-
-// If an error has occurred that prevents further I/O, don't waste time
-// producing an error report that will never be read
-AtomicBoolean result = new AtomicBoolean(false);
-response.getCoyoteResponse().action(ActionCode.IS_IO_ALLOWED, result);
-if (!result.get()) {
-return;
-}
-
StringManager smClient = StringManager.getManager(Constants.Package,
request.getLocales());
response.setLocale(smClient.getLocale());
String type = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Pull up duplicate check codes
This is an automated email from the ASF dual-hosted git repository.
lihan 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 64573401e9 Pull up duplicate check codes
64573401e9 is described below
commit 64573401e9e5f5f3c9b34eb919f59bb89d8c1e1d
Author: lihan
AuthorDate: Fri Sep 2 16:41:28 2022 +0800
Pull up duplicate check codes
---
.../apache/catalina/valves/ErrorReportValve.java | 35 +++---
.../catalina/valves/JsonErrorReportValve.java | 18 ---
2 files changed, 17 insertions(+), 36 deletions(-)
diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java
b/java/org/apache/catalina/valves/ErrorReportValve.java
index 126de87eb7..e7fbc696e4 100644
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -141,6 +141,23 @@ public class ErrorReportValve extends ValveBase {
response.setSuspended(false);
try {
+int statusCode = response.getStatus();
+
+// Do nothing on a 1xx, 2xx and 3xx status
+// Do nothing if anything has been written already
+// Do nothing if the response hasn't been explicitly marked as in
error
+//and that error has not been reported.
+if (statusCode < 400 || response.getContentWritten() > 0 ||
!response.setErrorReported()) {
+return;
+}
+
+// If an error has occurred that prevents further I/O, don't waste
time
+// producing an error report that will never be read
+AtomicBoolean result = new AtomicBoolean(false);
+response.getCoyoteResponse().action(ActionCode.IS_IO_ALLOWED,
result);
+if (!result.get()) {
+return;
+}
report(request, response, throwable);
} catch (Throwable tt) {
ExceptionUtils.handleThrowable(tt);
@@ -160,25 +177,7 @@ public class ErrorReportValve extends ValveBase {
* a root cause exception
*/
protected void report(Request request, Response response, Throwable
throwable) {
-
int statusCode = response.getStatus();
-
-// Do nothing on a 1xx, 2xx and 3xx status
-// Do nothing if anything has been written already
-// Do nothing if the response hasn't been explicitly marked as in error
-//and that error has not been reported.
-if (statusCode < 400 || response.getContentWritten() > 0 ||
!response.setErrorReported()) {
-return;
-}
-
-// If an error has occurred that prevents further I/O, don't waste time
-// producing an error report that will never be read
-AtomicBoolean result = new AtomicBoolean(false);
-response.getCoyoteResponse().action(ActionCode.IS_IO_ALLOWED, result);
-if (!result.get()) {
-return;
-}
-
ErrorPage errorPage = null;
if (throwable != null) {
errorPage = errorPageSupport.find(throwable);
diff --git a/java/org/apache/catalina/valves/JsonErrorReportValve.java
b/java/org/apache/catalina/valves/JsonErrorReportValve.java
index 8ba4acbc3f..9da5c33550 100644
--- a/java/org/apache/catalina/valves/JsonErrorReportValve.java
+++ b/java/org/apache/catalina/valves/JsonErrorReportValve.java
@@ -41,25 +41,7 @@ public class JsonErrorReportValve extends ErrorReportValve {
@Override
protected void report(Request request, Response response, Throwable
throwable) {
-
int statusCode = response.getStatus();
-
-// Do nothing on a 1xx, 2xx and 3xx status
-// Do nothing if anything has been written already
-// Do nothing if the response hasn't been explicitly marked as in error
-//and that error has not been reported.
-if (statusCode < 400 || response.getContentWritten() > 0 ||
!response.setErrorReported()) {
-return;
-}
-
-// If an error has occurred that prevents further I/O, don't waste time
-// producing an error report that will never be read
-AtomicBoolean result = new AtomicBoolean(false);
-response.getCoyoteResponse().action(ActionCode.IS_IO_ALLOWED, result);
-if (!result.get()) {
-return;
-}
-
StringManager smClient = StringManager.getManager(Constants.Package,
request.getLocales());
response.setLocale(smClient.getLocale());
String type = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
