[Bug 64121] New: Log messages should not be localized

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64121

Bug ID: 64121
   Summary: Log messages should not be localized
   Product: Tomcat 9
   Version: 9.0.x
  Hardware: PC
OS: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: ktamura.biz...@gmail.com
  Target Milestone: -

Log messages should not be localized because of the following reasons:

 - To make it easier to find out cause and solution for message by Google
search. Japanese message allows us to search only Japanese information.
 - In general, the readers of Tomcat logs are developers or administrators who
can understand English so there are no need to be localized. 
 - It can cause Mojibake in Tomcat logs if Tomcat/OS settings is incorrect.
 - We often need to replace localized messages in Tomcat logs with English
messages for some reasons.

I will do pull request if this is accepted.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 9.0.31

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 2/5/20 4:27 PM, Mark Thomas wrote:
> The proposed Apache Tomcat 9.0.31 release is now available for
> voting.
> 
> The major changes compared to the 9.0.30 release are:
> 
> - AJP defaults changed to listen the loopback address, require a
> secret and to be disabled in the sample server.xml
> 
> - The JmxRemoteLifecycleListener is now deprecated
> 
> - The HTTP Connector attribute rejectIllegalHeaderName is renamed
> to rejectIllegalHeader and expanded to include header values as
> well as names
> 
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog: 
> https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html
> 
> It can be obtained from: 
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.31/ The
> Maven staging repo is: 
> https://repository.apache.org/content/repositories/orgapachetomcat-124
5/
>
> 
The tag is:
> https://github.com/apache/tomcat/tree/9.0.31 
> https://github.com/apache/tomcat/tree/9.0.31
> 
> The proposed 9.0.31 release is: [ ] Broken - do not release [ ]
> Stable - go ahead and release as 9.0.31

I am having some odd issues with the 9.0.31 build over AJP. Some
requests are fine, others are not fine. Tomcat reports a 200 response,
but httpd reports a 503. httpd is proxying via mod_proxy_ajp. This
setup with 8.5.51 testing earlier today was working with the same
mod_proxy_ajp configuration. The Tomcat 9 configuration does not
differ appreciably from the Tomcat 8.5 configuration.

I will investigate further tomorrow.

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl48u7IACgkQHPApP6U8
pFhiGw/+OiAneQaRYAzO3FJfYoVUbiMCTZrpTQzWupQSxzjfVZSGw59McvTsByWm
M87EwI1WP+y8vHrGR/5wgjacJ0brrwiCdCk5ozZoGJC+YiFKbbl/CRaBzsWgfKrl
hKvSCUY/sV5+XxhfiTZYz88EFUUBu8t4soerpvOlvawKBT20TafYsOHN522m53pl
sRkVYHEyD4y5TV1Nf5tVsgjqPIGboQDZPWSzD509DFhaVWByYSdQX8SvUCxrVO3M
5uFnIEubH9H5haGPQ2PRHy93TGIh8q12Ujr78KmMFj/sKFsNVT8N608imP2U4N8G
ZrGdwv3N6anrQhdv4bg8fRLNktCixr5GWHOjMjmuaRM9PCm4xR5e6sFzL6V1hJIa
XcIWnXQryv9qL50gidcF3S1YjOF7B/qyUfn+b22Ppr66QjKA/dBVndiyb2dC7quK
iWEJ3bcGE1ZXSlDveHZq5GMnB4hQpimse2ynslwdhX7sE4UoyfI1XWiF5/zYIGt+
CtN7rREg09L6zCjSxdFeUEVzHLFwbvm1wZiSvMrNa1ubRF6ggwntTLC/ul4jR23u
7Jy3g63Wl5bk1fegtuX0bjlyLKlUua6oMBn6w4WOps018jXWDKEQBWyZhL0P1hE2
n/8xsbyxzfNToqDFjqfCuvZTXMuom8MmaHYtS/i5m7Dvww0padU=
=0KbZ
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 8.5.51

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 2/5/20 5:49 PM, Mark Thomas wrote:
> The proposed Apache Tomcat 8.5.51 release is now available for
> voting.
> 
> The major changes compared to the 8.5.50 release are:
> 
> - AJP defaults changed to listen the loopback address, require a
> secret and to be disabled in the sample server.xml
> 
> - The JmxRemoteLifecycleListener is now deprecated
> 
> - The HTTP Connector attribute rejectIllegalHeaderName is renamed
> to rejectIllegalHeader and expanded to include header values as
> well as names
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog: 
> https://ci.apache.org/projects/tomcat/tomcat85/docs/changelog.html
> 
> It can be obtained from: 
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.51/
> 
> The Maven staging repo is: 
> https://repository.apache.org/content/repositories/orgapachetomcat-124
6/
>
>  The tag is: https://github.com/apache/tomcat/tree/8.5.51 
> 05bfeed882fadd6e3b5c64a7851125750d37e297
> 
> The proposed 8.5.51 release is: [ ] Broken - do not release [X]
> Stable - go ahead and release as 8.5.51

Thanks markt for RMing.

Tested with a vanilla servlet + JSP web application. Nothing fancy.
Failed unit tests are likely due to specific ciphers not supported by
my local version of OpenSSL.

Details:

* Environment
*  Java (build): openjdk version "1.8.0_232" OpenJDK Runtime
Environment (build 1.8.0_232-8u232-b09-1~deb9u1-b09) OpenJDK 64-Bit
Server VM (build 25.232-b09, mixed mode)
*  Java (test): openjdk version "1.8.0_232" OpenJDK Runtime
Environment (build 1.8.0_232-8u232-b09-1~deb9u1-b09) OpenJDK 64-Bit
Server VM (build 25.232-b09, mixed mode)
*  OS:   Linux 4.9.0-9-amd64 x86_64
*  cc:   cc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516
*  make: GNU Make 4.1
*  OpenSSL:  OpenSSL 1.1.1 11 Sep 2018
*  APR:  1.5.2
*
* Valid SHA-512 signature for apache-tomcat-8.5.51.zip
* Valid GPG signature for apache-tomcat-8.5.51.zip
* Valid SHA-512 signature for apache-tomcat-8.5.51.tar.gz
* Valid GPG signature for apache-tomcat-8.5.51.tar.gz
* Valid SHA-512 signature for apache-tomcat-8.5.51.exe
* Valid GPG signature for apache-tomcat-8.5.51.exe
* Valid SHA512 signature for apache-tomcat-8.5.51-src.zip
* Valid GPG signature for apache-tomcat-8.5.51-src.zip
* Valid SHA512 signature for apache-tomcat-8.5.51-src.tar.gz
* Valid GPG signature for apache-tomcat-8.5.51-src.tar.gz
*
* Binary Zip and tarball: Same
* Source Zip and tarball: Same
*
* Building dependencies returned: 0
* tcnative builds cleanly
* Tomcat builds cleanly
* Junit Tests: FAILED
*
* Tests that failed:
* org.apache.tomcat.util.net.openssl.ciphers.TestCipher.APR.txt
* org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO.txt
* org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO2.txt
*
org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfiguratio
nParser.APR.txt
*
org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfiguratio
nParser.NIO.txt
*
org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfiguratio
nParser.NIO2.txt
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl48t20ACgkQHPApP6U8
pFi28RAAqWulwxP26Y/04NBRuluQd3T5OIRCk0vMm2IRIt8J0EtmKx7ubWhPYVSr
3VTBNyctWsRAsF09sM3TU5HAWbkoPhD7zO2WnRt+Kz+2jfSWFsFgygxqtXECH6y4
HUUfbMb2ThrYFTp8p14Bv7DAEkTFxErZpEDb9P7d+eOWowpm7ULj7MMXy/yAqxi4
+97TI0eioT74VidfOJ1Mh/iI2smxh/F1/+w1E9nn+Foj7aGdmyefUmYVgirkLtEs
2wX1/vPfXxUfdxB+kNm4qOhlp2MAdsrMocKqim11C3jD5rMYXy3iXnsYR2rLn6tC
aDLEV5oRhZiIZACRsLdRDSjKaA05vEZ8yoSHqFlSjNDr6wl+5+uglvsMUE0gd3Fc
JOmJO7ct4RAvEXeEio/WdMc49SEECFPU4yswOqIhuk3bd9LjzCCqd9JK/4bRU+jV
dnV52+RFbXLmHsh1plKH/0YxN2S1TK/LHUfl8n9fmXdhXbLZGmYWkkXI0crXBbgE
1/4yQTgL1FtzGnf9albJO3FpR9RWrrsV5APL8HSZ7dqpfdx/M2PHiSHnyMYDGRA2
EZ4i+CP9vEV8AsaAmmfFME5S0v7SbxbqhNU6L8mEKGsj7ufPFMr7QbRPqk1WJC4F
4aAB83ZLoUTD1ac2FEJMGhRQNknBfHjD5ODQWJU5WTI9KVphbI8=
=1Um7
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot failure in on tomcat-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-trunk while building 
tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/4924

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] c47691d0772a8dd3b765674ae747716fc3632bf6
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: ws

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new c47691d  ws
c47691d is described below

commit c47691d0772a8dd3b765674ae747716fc3632bf6
Author: Mark Thomas 
AuthorDate: Thu Feb 6 22:44:19 2020 +

ws
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c5dc3ec..61bc7db 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -48,7 +48,7 @@
   
 
   
-Parameterize JSP version and API class names in localization messages 
to 
+Parameterize JSP version and API class names in localization messages 
to
 allow simpler re-use between major versions. (markt)
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] [OT] Release Apache Tomcat 10.0.0.0-M1

[Rémy Maucherat]

On Thu, Feb 6, 2020 at 4:46 PM Christopher Schultz <
ch...@christopherschultz.net> wrote:

> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> Mark,
>
> On 2/6/20 10:35 AM, Mark Thomas wrote:
> > On February 6, 2020 3:10:16 PM UTC, Christopher Schultz
> >  wrote:
> >> -BEGIN PGP SIGNED MESSAGE- Hash: SHA256
> >>
> >> Konstantin,
> >>
> >> On 2/6/20 7:36 AM, Konstantin Kolinko wrote:
> >>> Thus far my vote is
> >>>
> >>> The proposed 10.0.0.0-M1 release is: [x] Broken - do not
> >>> release
> >>>
> >>> because of the numbering scheme.
> >>
> >> Please remember:
> >>
> >> 1. The transitional version numbering scheme *is* completely
> >> confusing
> >>
> >> 2. The target version numbering scheme is VERY consistent, and a
> >> good idea IMO
> >>
> >> 3. The transitional version numbering scheme will be retired
> >> ASAP
> >>
> >> Please consider changing your -1 release-veto vote.
> >
> > For the record, this is not a veto. Release votes may not be
> > vetoed.
>
> Fair enough, but generally speaking, any -1s on release-vote are taken
> with a lot of weight around here, as you very well know. I'd prefer
> not to release in conflict with *any* objections if it's possible.
>

:)
It's hard to come up with something decent for a temporary branch like this
one, right now I don't have any better ideas. Obviously there's going to be
some ongoing confusion caused by this Jakarta renaming ...

I think there are only two real options:
a) release stable with a weird number or something indicating this isn't a
real Tomcat release and it will go away soonish
b) stay in M mode until Jakarta EE 10
I prefer a) since we don't know how long it will take until Jakarta EE 10,
and it will make early Jakarta EE adopters happier. It would be a shame to
see people drop Tomcat simply because we decided to not release for
relatively trivial reasons.

Rémy


>
> > As release manager I'm not adverse to a *slight* delay in this
> > release if we appear to be heading towards a modified consensus.
>
> - -chris
> -BEGIN PGP SIGNATURE-
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl48NLYACgkQHPApP6U8
> pFggdg/+Jqi6DsoXqXQdHCR5TrXTlUIJpgUlSwiTRH+ArGxZqb0V4O5Nb9Y1qL8t
> 4NRY8fcrGy1OEra7YRm9WakBbQ3FXkiq+/cng8NzMYkXDz+8MsXOevgarUdJgr/C
> CZF9+xXQ/ZxNec4FO1+KN8ocUVB87irSY/uJ/QSpbifca9VofFwfUh3ITeUBSO8J
> FfpyoJCxIhy66MBW/LNIvedkeFbJGVMcxnwn+IIRtXiMWrp68SxnUth68ySWx7l2
> lpOH2y5LofgDWWaPE4CQZiOOGI7vEZaIWOJB0RjrcUT4CtFGKBvrrVLuiFlhnqRy
> j8fvysNRuSzYVx8PPoL6hB93DnVXZtZxXgdJxFgcZZLaZMP/rWsLswXsr0TDlqKL
> EWUA1IBMnbRAJ2FLoqG9cvBirKOCVlIuj9OW9KkGFXVyBZuEk0+A/vGn3UAlSOA+
> 7NsvydY2sNcuhy+85i6ljnDyIarzD9Wdly3g7egUpMaZaCLce77856Hpx1ExsKY3
> 6ojyAD/ObtuIjfDVY+XabKwoshJXYEPoZri6HjoaCMpZatpxKP4o7QURd5snV9Dk
> msb1vMZ7yAsr8ZMPY3UEJAYRq+HttcSg0kVHdV3pDJtI4dyl/ZCemSupI0VDGv8y
> pY+P6TDkurK94a627Qq1FKBNiLo+g3UJdwg9KTMa6JU9xxgTEmQ=
> =FFfY
> -END PGP SIGNATURE-
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: [VOTE] [OT] Release Apache Tomcat 10.0.0.0-M1

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 2/6/20 10:35 AM, Mark Thomas wrote:
> On February 6, 2020 3:10:16 PM UTC, Christopher Schultz
>  wrote:
>> -BEGIN PGP SIGNED MESSAGE- Hash: SHA256
>> 
>> Konstantin,
>> 
>> On 2/6/20 7:36 AM, Konstantin Kolinko wrote:
>>> Thus far my vote is
>>> 
>>> The proposed 10.0.0.0-M1 release is: [x] Broken - do not
>>> release
>>> 
>>> because of the numbering scheme.
>> 
>> Please remember:
>> 
>> 1. The transitional version numbering scheme *is* completely
>> confusing
>> 
>> 2. The target version numbering scheme is VERY consistent, and a
>> good idea IMO
>> 
>> 3. The transitional version numbering scheme will be retired
>> ASAP
>> 
>> Please consider changing your -1 release-veto vote.
> 
> For the record, this is not a veto. Release votes may not be
> vetoed.

Fair enough, but generally speaking, any -1s on release-vote are taken
with a lot of weight around here, as you very well know. I'd prefer
not to release in conflict with *any* objections if it's possible.

> As release manager I'm not adverse to a *slight* delay in this 
> release if we appear to be heading towards a modified consensus.

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl48NLYACgkQHPApP6U8
pFggdg/+Jqi6DsoXqXQdHCR5TrXTlUIJpgUlSwiTRH+ArGxZqb0V4O5Nb9Y1qL8t
4NRY8fcrGy1OEra7YRm9WakBbQ3FXkiq+/cng8NzMYkXDz+8MsXOevgarUdJgr/C
CZF9+xXQ/ZxNec4FO1+KN8ocUVB87irSY/uJ/QSpbifca9VofFwfUh3ITeUBSO8J
FfpyoJCxIhy66MBW/LNIvedkeFbJGVMcxnwn+IIRtXiMWrp68SxnUth68ySWx7l2
lpOH2y5LofgDWWaPE4CQZiOOGI7vEZaIWOJB0RjrcUT4CtFGKBvrrVLuiFlhnqRy
j8fvysNRuSzYVx8PPoL6hB93DnVXZtZxXgdJxFgcZZLaZMP/rWsLswXsr0TDlqKL
EWUA1IBMnbRAJ2FLoqG9cvBirKOCVlIuj9OW9KkGFXVyBZuEk0+A/vGn3UAlSOA+
7NsvydY2sNcuhy+85i6ljnDyIarzD9Wdly3g7egUpMaZaCLce77856Hpx1ExsKY3
6ojyAD/ObtuIjfDVY+XabKwoshJXYEPoZri6HjoaCMpZatpxKP4o7QURd5snV9Dk
msb1vMZ7yAsr8ZMPY3UEJAYRq+HttcSg0kVHdV3pDJtI4dyl/ZCemSupI0VDGv8y
pY+P6TDkurK94a627Qq1FKBNiLo+g3UJdwg9KTMa6JU9xxgTEmQ=
=FFfY
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 10.0.0.0-M1

[Mark Thomas]

On February 6, 2020 3:10:16 PM UTC, Christopher Schultz 
 wrote:
>-BEGIN PGP SIGNED MESSAGE-
>Hash: SHA256
>
>Konstantin,
>
>On 2/6/20 7:36 AM, Konstantin Kolinko wrote:
>> Thus far my vote is
>> 
>> The proposed 10.0.0.0-M1 release is: [x] Broken - do not release
>> 
>> because of the numbering scheme.
>
>Please remember:
>
>1. The transitional version numbering scheme *is* completely confusing
>
>2. The target version numbering scheme is VERY consistent, and a good
>idea IMO
>
>3. The transitional version numbering scheme will be retired ASAP
>
>Please consider changing your -1 release-veto vote.

For the record, this is not a veto. Release votes may not be vetoed.

As release manager I'm not adverse to a *slight* delay in this release if we 
appear to be heading towards a modified consensus.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 8.5.51

[Rémy Maucherat]

On Wed, Feb 5, 2020 at 11:49 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 8.5.51 release is now available for voting.
>
> The major changes compared to the 8.5.50 release are:
>
> - AJP defaults changed to listen the loopback address, require a secret
>   and to be disabled in the sample server.xml
>
> - The JmxRemoteLifecycleListener is now deprecated
>
> - The HTTP Connector attribute rejectIllegalHeaderName is renamed to
>   rejectIllegalHeader and expanded to include header values as well as
>   names
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat85/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.51/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1246/
>
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.51
> 05bfeed882fadd6e3b5c64a7851125750d37e297
>
> The proposed 8.5.51 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.51
>
> Rémy

Re: [VOTE] Release Apache Tomcat 10.0.0.0-M1

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Konstantin,

On 2/6/20 7:36 AM, Konstantin Kolinko wrote:
> Thus far my vote is
> 
> The proposed 10.0.0.0-M1 release is: [x] Broken - do not release
> 
> because of the numbering scheme.

Please remember:

1. The transitional version numbering scheme *is* completely confusing

2. The target version numbering scheme is VERY consistent, and a good
idea IMO

3. The transitional version numbering scheme will be retired ASAP

Please consider changing your -1 release-veto vote.

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl48LFgACgkQHPApP6U8
pFhQFRAAjCgSnuyQmJdOE3ZseR/4KJiRNYSUHkUiQLPNOzVmI3RDtOvyOV3eIEsT
E/1zL2v1PL86WmqUlMfVBg6xVr0uiH9Hu3Qtn5a929IvFtnJ3PEmeFveLX1FBMqf
6udf7rhTncH8KH9didDAjWo//U23w1ToiwX7XfC7b7yPrLWlLaKoPPmQPEz8yr9h
BhLeINxWmrhA4iANstUvw/Adz7FSbysgRnE7E5pZb3ceIlb77Cb6o/qFsjxZ8S09
J0cFwXMMfFzISjpNGh6L8pSjmplAufsa3pRuv9+5rEiiPgfQcqdg7mv/zO4+O/iH
rMVo8wm+oPSnnRMj/Eo8p24RIbgu1ypvuRce23jdoD/Q/1vXtW3Oc6aK1GkO3Aqk
drHqsPDYLKl0/o3WgRbiK59U4Idy5/GnlxAdsWwd01Ir7A5utbVQ101220zSpMPZ
6Zg5Nc4tamV0n0b+Ytw9ZsMyxoUXv1lc6Pz88LPRpre0KlMgFJ04xHPYLRqbDvWd
l/mh+g/RDSVBZkY9q9TNbaKFYr5yvovRrxEgKvfs1s/WPcW6RG+0Yvo1AkHLoTHy
bIfNBYnysXFkc0040lXufH2mOjuzU2Ib2opr4/aM7AGLZMzJxpl0WASU1t3CsJs1
qfwgx/hibHNV4hGGY4Hz1CzxZC325E3opPgB74qouVNvudx/+Ek=
=Mgon
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 10.0.0.0-M1

[Martin Grigorov]

On Thu, Feb 6, 2020 at 3:58 PM Rémy Maucherat  wrote:

> On Thu, Feb 6, 2020 at 2:31 PM VP Brand  wrote:
>
>> On 06/02/2020 12:36, Konstantin Kolinko wrote:
>>
>> 
>>
>> > This cannot be achieved with the proposed numbering scheme.
>>
>> Please explain why.
>>
>> > When I think about numbering schemes such as semver, or used for
>> > Maven, or RPM packages, the numbers essentially imply that 10.0.0 and
>> > 10.0.1 are binary compatible with only minor changes. When you update
>> > a version of a package, version "10.0.1" will silently supersede
>> > "10.0.0". But that is not the case here.
>>
>> We are free to define any release numbering scheme we like. Tomcat has
>> never followed semantic versioning and I don't think it ever will
>> because of the desire (with the exception of Jakarta EE 9) to have the
>> major version follow releases of the Servlet spec.
>>
>> > It is rather hard to explain to people that "10.0.0" is a separate of
>> > branch of development and a separate chain of releases.
>>
>> It is simply a special case for Jakarta EE 9 because a) we expect
>> Jakarta EE 9 to be a transition release and b) it allows us to align
>> major Tomcat versions with Jakarta EE versions.
>>
>> >> The plan was discussed and the final version of it is here:
>> https://cwiki.apache.org/confluence/display/TOMCAT/Jakarta+EE+Release+Numbering
>> >
>> > The page says "10.0.0.Mx" (in step 1, step 2)
>>
>> There is a typo. I've fixed it. I've also switched to -Mx for milestones
>> rather than .Mx for consistency with how Mx is normally used.
>>
>> > Trying to achieve exact matching between Tomcat version and EE
>> > specification version does not really matter. E.g. Tomcat 9.0 is Java
>> > EE 8, not 9.
>>
>> I think it is useful. It helps reduce confusion if they are aligned.
>>
>> > Thus far my vote is
>> >
>> > The proposed 10.0.0.0-M1 release is:
>> > [x] Broken - do not release
>> >
>> > because of the numbering scheme.
>>
>> ACK.
>>
>> Another point to keep in mind is that we expect Jakarta EE 10 to follow
>> on quickly from Jakarta EE 9. If we were to follow our normal numbering
>> plan that would mean EOL'ing 7.0.x and 8.5.x in quick succession. I
>> think that would be bad for our users.
>>
>> If we didn't EOL 8.5.x that would leave us supporting 8.5.x, 9.0.x,
>> 10.0.x, 11.0.x and 9.11.x - five major versions in parallel compared to
>> the current three.
>>
>> The current approach is the best plan the community has come up with to
>> date that enables us to:
>> - EOL Jakarta EE 9 support out of sequence
>> - continue Java EE 8 support in a 9.x branch where X is meaningful
>> - work on Jakarta EE 10 in parallel with Jakarta EE 9 support
>>
>> If you have an alternative proposal, now is the time to propose it.
>>
>
> I agree dedicating the Tomcat 10 branch to Jakarta EE 9 is very bad since
> it would be EOLed instantly (no actual users and/or no developer interest
> to support it). Plus I like matching the EE number and the Tomcat branch
> number.
>
> An option in to do Jakarta EE 9 in 10.0 and Jakarta EE 10 as 10.1. But
> this normally also implies some support for 10.0, and at the moment the
> forecast is that there will be none.
>
> Another possible option I can think of is to not release that 10.0.0.0 at
> all. That means that right now 10.0 is in M mode doing Jakarta EE 9, it
> will switch to tracking EE 10 when it starts and remains in M mode until EE
> 10 is final. Developers who want to migrate to Jakarta can still use these
> M builds even though they are not stable, etc.
>

I think this would be the less confusing schema for the users.
Tomcat 10.0.0-Mx will be for Jakarta EE 9.
Once Jakarta EE 10 is released we can remove the -Mx


> I don't really like it and would much prefer if, as a simple exception,
> people would agree to release that interim 10.0.0.0 ...
>
> Rémy
>
>
>>
>> Mark
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>

Re: [VOTE] Release Apache Tomcat 10.0.0.0-M1

[Rémy Maucherat]

On Thu, Feb 6, 2020 at 2:31 PM VP Brand  wrote:

> On 06/02/2020 12:36, Konstantin Kolinko wrote:
>
> 
>
> > This cannot be achieved with the proposed numbering scheme.
>
> Please explain why.
>
> > When I think about numbering schemes such as semver, or used for
> > Maven, or RPM packages, the numbers essentially imply that 10.0.0 and
> > 10.0.1 are binary compatible with only minor changes. When you update
> > a version of a package, version "10.0.1" will silently supersede
> > "10.0.0". But that is not the case here.
>
> We are free to define any release numbering scheme we like. Tomcat has
> never followed semantic versioning and I don't think it ever will
> because of the desire (with the exception of Jakarta EE 9) to have the
> major version follow releases of the Servlet spec.
>
> > It is rather hard to explain to people that "10.0.0" is a separate of
> > branch of development and a separate chain of releases.
>
> It is simply a special case for Jakarta EE 9 because a) we expect
> Jakarta EE 9 to be a transition release and b) it allows us to align
> major Tomcat versions with Jakarta EE versions.
>
> >> The plan was discussed and the final version of it is here:
> https://cwiki.apache.org/confluence/display/TOMCAT/Jakarta+EE+Release+Numbering
> >
> > The page says "10.0.0.Mx" (in step 1, step 2)
>
> There is a typo. I've fixed it. I've also switched to -Mx for milestones
> rather than .Mx for consistency with how Mx is normally used.
>
> > Trying to achieve exact matching between Tomcat version and EE
> > specification version does not really matter. E.g. Tomcat 9.0 is Java
> > EE 8, not 9.
>
> I think it is useful. It helps reduce confusion if they are aligned.
>
> > Thus far my vote is
> >
> > The proposed 10.0.0.0-M1 release is:
> > [x] Broken - do not release
> >
> > because of the numbering scheme.
>
> ACK.
>
> Another point to keep in mind is that we expect Jakarta EE 10 to follow
> on quickly from Jakarta EE 9. If we were to follow our normal numbering
> plan that would mean EOL'ing 7.0.x and 8.5.x in quick succession. I
> think that would be bad for our users.
>
> If we didn't EOL 8.5.x that would leave us supporting 8.5.x, 9.0.x,
> 10.0.x, 11.0.x and 9.11.x - five major versions in parallel compared to
> the current three.
>
> The current approach is the best plan the community has come up with to
> date that enables us to:
> - EOL Jakarta EE 9 support out of sequence
> - continue Java EE 8 support in a 9.x branch where X is meaningful
> - work on Jakarta EE 10 in parallel with Jakarta EE 9 support
>
> If you have an alternative proposal, now is the time to propose it.
>

I agree dedicating the Tomcat 10 branch to Jakarta EE 9 is very bad since
it would be EOLed instantly (no actual users and/or no developer interest
to support it). Plus I like matching the EE number and the Tomcat branch
number.

An option in to do Jakarta EE 9 in 10.0 and Jakarta EE 10 as 10.1. But this
normally also implies some support for 10.0, and at the moment the forecast
is that there will be none.

Another possible option I can think of is to not release that 10.0.0.0 at
all. That means that right now 10.0 is in M mode doing Jakarta EE 9, it
will switch to tracking EE 10 when it starts and remains in M mode until EE
10 is final. Developers who want to migrate to Jakarta can still use these
M builds even though they are not stable, etc.
I don't really like it and would much prefer if, as a simple exception,
people would agree to release that interim 10.0.0.0 ...

Rémy


>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: [VOTE] Release Apache Tomcat 10.0.0.0-M1

[Mark Thomas]

On 06/02/2020 13:31, VP Brand wrote:

Sorry, selected the wrong sender when composing this reply. Definitely
not sent wearing my VP, Brand hat. This was just me, writing as me.

Mark



> On 06/02/2020 12:36, Konstantin Kolinko wrote:
> 
> 
> 
>> This cannot be achieved with the proposed numbering scheme.
> 
> Please explain why.
> 
>> When I think about numbering schemes such as semver, or used for
>> Maven, or RPM packages, the numbers essentially imply that 10.0.0 and
>> 10.0.1 are binary compatible with only minor changes. When you update
>> a version of a package, version "10.0.1" will silently supersede
>> "10.0.0". But that is not the case here.
> 
> We are free to define any release numbering scheme we like. Tomcat has
> never followed semantic versioning and I don't think it ever will
> because of the desire (with the exception of Jakarta EE 9) to have the
> major version follow releases of the Servlet spec.
> 
>> It is rather hard to explain to people that "10.0.0" is a separate of
>> branch of development and a separate chain of releases.
> 
> It is simply a special case for Jakarta EE 9 because a) we expect
> Jakarta EE 9 to be a transition release and b) it allows us to align
> major Tomcat versions with Jakarta EE versions.
> 
>>> The plan was discussed and the final version of it is here: 
>>> https://cwiki.apache.org/confluence/display/TOMCAT/Jakarta+EE+Release+Numbering
>>
>> The page says "10.0.0.Mx" (in step 1, step 2)
> 
> There is a typo. I've fixed it. I've also switched to -Mx for milestones
> rather than .Mx for consistency with how Mx is normally used.
> 
>> Trying to achieve exact matching between Tomcat version and EE
>> specification version does not really matter. E.g. Tomcat 9.0 is Java
>> EE 8, not 9.
> 
> I think it is useful. It helps reduce confusion if they are aligned.
> 
>> Thus far my vote is
>>
>> The proposed 10.0.0.0-M1 release is:
>> [x] Broken - do not release
>>
>> because of the numbering scheme.
> 
> ACK.
> 
> Another point to keep in mind is that we expect Jakarta EE 10 to follow
> on quickly from Jakarta EE 9. If we were to follow our normal numbering
> plan that would mean EOL'ing 7.0.x and 8.5.x in quick succession. I
> think that would be bad for our users.
> 
> If we didn't EOL 8.5.x that would leave us supporting 8.5.x, 9.0.x,
> 10.0.x, 11.0.x and 9.11.x - five major versions in parallel compared to
> the current three.
> 
> The current approach is the best plan the community has come up with to
> date that enables us to:
> - EOL Jakarta EE 9 support out of sequence
> - continue Java EE 8 support in a 9.x branch where X is meaningful
> - work on Jakarta EE 10 in parallel with Jakarta EE 9 support
> 
> If you have an alternative proposal, now is the time to propose it.
> 
> 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

Re: [VOTE] Release Apache Tomcat 10.0.0.0-M1

[VP Brand]

On 06/02/2020 12:36, Konstantin Kolinko wrote:



> This cannot be achieved with the proposed numbering scheme.

Please explain why.

> When I think about numbering schemes such as semver, or used for
> Maven, or RPM packages, the numbers essentially imply that 10.0.0 and
> 10.0.1 are binary compatible with only minor changes. When you update
> a version of a package, version "10.0.1" will silently supersede
> "10.0.0". But that is not the case here.

We are free to define any release numbering scheme we like. Tomcat has
never followed semantic versioning and I don't think it ever will
because of the desire (with the exception of Jakarta EE 9) to have the
major version follow releases of the Servlet spec.

> It is rather hard to explain to people that "10.0.0" is a separate of
> branch of development and a separate chain of releases.

It is simply a special case for Jakarta EE 9 because a) we expect
Jakarta EE 9 to be a transition release and b) it allows us to align
major Tomcat versions with Jakarta EE versions.

>> The plan was discussed and the final version of it is here: 
>> https://cwiki.apache.org/confluence/display/TOMCAT/Jakarta+EE+Release+Numbering
> 
> The page says "10.0.0.Mx" (in step 1, step 2)

There is a typo. I've fixed it. I've also switched to -Mx for milestones
rather than .Mx for consistency with how Mx is normally used.

> Trying to achieve exact matching between Tomcat version and EE
> specification version does not really matter. E.g. Tomcat 9.0 is Java
> EE 8, not 9.

I think it is useful. It helps reduce confusion if they are aligned.

> Thus far my vote is
> 
> The proposed 10.0.0.0-M1 release is:
> [x] Broken - do not release
> 
> because of the numbering scheme.

ACK.

Another point to keep in mind is that we expect Jakarta EE 10 to follow
on quickly from Jakarta EE 9. If we were to follow our normal numbering
plan that would mean EOL'ing 7.0.x and 8.5.x in quick succession. I
think that would be bad for our users.

If we didn't EOL 8.5.x that would leave us supporting 8.5.x, 9.0.x,
10.0.x, 11.0.x and 9.11.x - five major versions in parallel compared to
the current three.

The current approach is the best plan the community has come up with to
date that enables us to:
- EOL Jakarta EE 9 support out of sequence
- continue Java EE 8 support in a 9.x branch where X is meaningful
- work on Jakarta EE 10 in parallel with Jakarta EE 9 support

If you have an alternative proposal, now is the time to propose it.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 9.0.31

[Rémy Maucherat]

On Wed, Feb 5, 2020 at 10:27 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 9.0.31 release is now available for voting.
>
> The major changes compared to the 9.0.30 release are:
>
> - AJP defaults changed to listen the loopback address, require a secret
>   and to be disabled in the sample server.xml
>
> - The JmxRemoteLifecycleListener is now deprecated
>
> - The HTTP Connector attribute rejectIllegalHeaderName is renamed to
>   rejectIllegalHeader and expanded to include header values as well as
>   names
>
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.31/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1245/
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.31
> https://github.com/apache/tomcat/tree/9.0.31
>
> The proposed 9.0.31 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 9.0.31
>
> Rémy

[CONF] Apache Tomcat > Jakarta EE Release Numbering

[Mark Thomas (Confluence)]

Title: Message Title



 
 
 
There's 1 new edit on this page 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Jakarta EE Release Numbering 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Mark Thomas edited this page 
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Here's the version comment 
 
 
 
 
 
 
 
 
 
 
 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Mark Thomas edited at 01:13 PM 
 
 
  
 
 

 
 
 
 
 
 
 
 
 Correct 10.0.0.0-Mx version number  
 
 
  
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Here's what changed: 
 
 
 
 
 
 
 
 
 
 
 ... 
 
7 : Continues to support Java EE 6 
8 : Continues to support Java EE 7 
9 : Continues to support Java EE 8 
10.0.0.0-Mx (master) development branch for Jakarta EE 9 support 
 Note the 10.0.0.0-Mx will be Milestone releases ... Apply Tomcat API changes planned for Tomcat 10 to 10.0.0.0-Mx Apply Jakarta EE 9 package rename changes. Other changes applied to 10.0.0.0-Mx and then back-ported to 9.0.x, 8.5.x and 7.0.x Monthly milestone releases of 10.0.0.0-Mx alongside 9.0.x and 8.5.x ... Once Jakarta EE 9 is released and Tomcat 10.0.0.0-Mx passes the TCK Release 10.0.0.0 (note the extra element in the version number) ... 
 
7 : Continues to support Java EE 6 
8 : Continues to support Java EE 7 
9 : Continues to support Java EE 8 
9.10: Continues to support Java EE 8 with Tomcat API identical to latest Tomcat 10 
10.0.0: Continues to support Jakarta EE 9. Critical / important fixes only. Will be EOL'd as soon as Jakarta EE 10 is stable. 
10.0.1.-Mx (master): Development branch for Jakarta EE 10 support 
 ...  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Go to page history 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
View page 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 7.1.2  
 
 
  
 
 
 
 
 
 
 
 
 

[tomcat] branch 7.0.x updated: Javadoc clean-up to avoid warnings with newer Java versions

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 3a740e9  Javadoc clean-up to avoid warnings with newer Java versions
3a740e9 is described below

commit 3a740e992ddafad51e716566e5081cc2176e5368
Author: Mark Thomas 
AuthorDate: Thu Feb 6 12:46:52 2020 +

Javadoc clean-up to avoid warnings with newer Java versions
---
 java/org/apache/jasper/compiler/AntCompiler.java   |   2 +
 .../org/apache/jasper/compiler/BeanRepository.java |   2 +
 java/org/apache/jasper/compiler/Compiler.java  |  27 +-
 .../apache/jasper/compiler/ELFunctionMapper.java   |   1 +
 java/org/apache/jasper/compiler/ELInterpreter.java |   3 +-
 .../jasper/compiler/ELInterpreterFactory.java  |   5 +-
 .../apache/jasper/compiler/ErrorDispatcher.java| 103 ++---
 7 files changed, 101 insertions(+), 42 deletions(-)

diff --git a/java/org/apache/jasper/compiler/AntCompiler.java 
b/java/org/apache/jasper/compiler/AntCompiler.java
index 2dcd528..f54a32f 100644
--- a/java/org/apache/jasper/compiler/AntCompiler.java
+++ b/java/org/apache/jasper/compiler/AntCompiler.java
@@ -349,6 +349,8 @@ public class AntCompiler extends Compiler {
 
 
 /**
+ * @return the stream that has been wrapped
+ *
  * @deprecated Unused. Will be removed in Tomcat 8.0.x.
  */
 @Deprecated
diff --git a/java/org/apache/jasper/compiler/BeanRepository.java 
b/java/org/apache/jasper/compiler/BeanRepository.java
index e3cc96d..fa0e062 100644
--- a/java/org/apache/jasper/compiler/BeanRepository.java
+++ b/java/org/apache/jasper/compiler/BeanRepository.java
@@ -35,6 +35,8 @@ public class BeanRepository {
 
 /**
  * Constructor.
+ * @param loader The class loader
+ * @param err The error dispatcher that will be used to report errors
  */
 public BeanRepository(ClassLoader loader, ErrorDispatcher err) {
 this.loader = loader;
diff --git a/java/org/apache/jasper/compiler/Compiler.java 
b/java/org/apache/jasper/compiler/Compiler.java
index 4f6e9c3..6345409 100644
--- a/java/org/apache/jasper/compiler/Compiler.java
+++ b/java/org/apache/jasper/compiler/Compiler.java
@@ -86,6 +86,7 @@ public abstract class Compiler {
  * return null. Used in development mode for generating detailed error
  * messages. http://bz.apache.org/bugzilla/show_bug.cgi?id=37062.
  * 
+ * @return the page nodes
  */
 public Node.Nodes getPageNodes() {
 return this.pageNodes;
@@ -332,13 +333,21 @@ public abstract class Compiler {
 }
 
 /**
- * Compile the servlet from .java file to .class file
+ * Servlet compilation. This compiles the generated sources into
+ * Servlets.
+ * @param smap The SMAP files for source debugging
+ * @throws FileNotFoundException Source files not found
+ * @throws JasperException Compilation error
+ * @throws Exception Some other error
  */
 protected abstract void generateClass(String[] smap)
 throws FileNotFoundException, JasperException, Exception;
 
 /**
- * Compile the jsp file from the current engine context
+ * Compile the jsp file from the current engine context.
+ * @throws FileNotFoundException Source files not found
+ * @throws JasperException Compilation error
+ * @throws Exception Some other error
  */
 public void compile() throws FileNotFoundException, JasperException,
 Exception {
@@ -352,6 +361,9 @@ public abstract class Compiler {
  * @param compileClass
  *If true, generate both .java and .class file If false,
  *generate only .java file
+ * @throws FileNotFoundException Source files not found
+ * @throws JasperException Compilation error
+ * @throws Exception Some other error
  */
 public void compile(boolean compileClass) throws FileNotFoundException,
 JasperException, Exception {
@@ -367,6 +379,9 @@ public abstract class Compiler {
  *generate only .java file
  * @param jspcMode
  *true if invoked from JspC, false otherwise
+ * @throws FileNotFoundException Source files not found
+ * @throws JasperException Compilation error
+ * @throws Exception Some other error
  */
 public void compile(boolean compileClass, boolean jspcMode)
 throws FileNotFoundException, JasperException, Exception {
@@ -427,6 +442,8 @@ public abstract class Compiler {
 /**
  * This is a protected method intended to be overridden by subclasses of
  * Compiler. This is used by the compile method to do all the compilation.
+ * @return true if the source generation and compilation
+ *  should occur
  */
 public boolean isOutDated() {
 return isOutDated(true);
@@ -441,6 +458,8 @@ public 

Re: [VOTE] Release Apache Tomcat 10.0.0.0-M1

[Konstantin Kolinko]

чт, 6 февр. 2020 г. в 15:06, Rémy Maucherat :
>> >> >
>> >> > The proposed Apache Tomcat 10.0.0.0-M1 release is now available for
>> >> > voting. This is the first release of 10.0.0.x and is based on 9.0.31.
>> >>
>> >> It is odd to see 4 numbers in "10.0.0.0" instead of the usual 3
>> >> "10.0.0", "10.0.x".
>> >>
>> >> Was it intended?
>> >
>> >
>> > Yes, it is all explained in the release plan for Jakarta. 10.0.0.x with 
>> > Jakarta EE 9 will be followed by the "real" release which will be 10.0.1 
>> > (then 10.0.2, 10.0.3, etc) with Jakarta EE 10 (with stuff actually new in 
>> > it).
>>
>> Thank you for your response, but all this is rather confusing.
>>
>> 1). Why cannot we go with the usual 10.0.x for Jakarta EE 9, followed
>> by 10.0.y for Jakarta EE 10,
>> e.g. see Specifications page in the wiki like it was for WebSocket 1.0
>> and WebSocket 1.1 (since 8.0.13),
>> and maintenance releases of the Servlet specification?
>>
>> [1] 
>> https://cwiki.apache.org/confluence/x/Bi8lBg#Specifications-JavaAPIforWebSocket
>>
> 10.0.0.x will not be immediately EOLed I suppose, so that's why there's an 
> extra number.

This cannot be achieved with the proposed numbering scheme.

When I think about numbering schemes such as semver, or used for
Maven, or RPM packages, the numbers essentially imply that 10.0.0 and
10.0.1 are binary compatible with only minor changes. When you update
a version of a package, version "10.0.1" will silently supersede
"10.0.0". But that is not the case here.

It is rather hard to explain to people that "10.0.0" is a separate of
branch of development and a separate chain of releases.

> The plan was discussed and the final version of it is here: 
> https://cwiki.apache.org/confluence/display/TOMCAT/Jakarta+EE+Release+Numbering

The page says "10.0.0.Mx" (in step 1, step 2)


Trying to achieve exact matching between Tomcat version and EE
specification version does not really matter. E.g. Tomcat 9.0 is Java
EE 8, not 9.


Thus far my vote is

The proposed 10.0.0.0-M1 release is:
[x] Broken - do not release

because of the numbering scheme.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 7.0.x updated: Back-port translation updates

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 85d96a7  Back-port translation updates
85d96a7 is described below

commit 85d96a7de74c51034ed9c327dba0bc1a98d36c69
Author: Mark Thomas 
AuthorDate: Thu Feb 6 12:20:55 2020 +

Back-port translation updates
---
 .../catalina/manager/LocalStrings.properties   |  6 +++---
 .../group/interceptors/LocalStrings_de.properties  | 17 +++
 .../group/interceptors/LocalStrings_es.properties  | 16 ++
 .../group/interceptors/LocalStrings_fr.properties  | 23 
 .../group/interceptors/LocalStrings_ja.properties  | 23 
 .../group/interceptors/LocalStrings_ko.properties  | 23 
 .../group/interceptors/LocalStrings_ru.properties  | 16 ++
 .../interceptors/LocalStrings_zh_CN.properties | 20 +
 .../jasper/resources/LocalStrings_zh_CN.properties | 25 --
 .../util/http/parser/LocalStrings_fr.properties|  7 ++
 .../util/http/parser/LocalStrings_ja.properties|  7 ++
 .../util/http/parser/LocalStrings_ko.properties|  7 ++
 .../util/http/parser/LocalStrings_zh_CN.properties |  7 ++
 .../tomcat/websocket/LocalStrings_fr.properties|  1 +
 .../tomcat/websocket/LocalStrings_ko.properties|  1 +
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  2 ++
 webapps/docs/changelog.xml | 12 +++
 .../WEB-INF/classes/LocalStrings_zh_CN.properties  |  6 ++
 18 files changed, 210 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/manager/LocalStrings.properties 
b/java/org/apache/catalina/manager/LocalStrings.properties
index 13b083b..001fcaa 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -103,6 +103,9 @@ htmlManagerServlet.serverTitle=Server Information
 htmlManagerServlet.serverVersion=Tomcat Version
 htmlManagerServlet.title=Tomcat Web Application Manager
 
+jmxProxyServlet.noBeanFound=Cannot find MBean with object name [{0}]
+jmxProxyServlet.noOperationOnBean=Cannot find operation [{0}] with [{1}] 
arguments on object name [{2}], which is a [{3}]
+
 managerServlet.alreadyContext=FAIL - Application already exists at path [{0}]
 managerServlet.alreadyDocBase=FAIL - Directory [{0}] is already in use
 managerServlet.configured=OK - Deployed application from context file [{0}]
@@ -167,6 +170,3 @@ managerServlet.vminfo=OK - VM info
 
 statusServlet.complete=Complete Server Status
 statusServlet.title=Server Status
-
-jmxProxyServlet.noOperationOnBean=Cannot find operation [{0}] with [{1}] 
arguments on object name [{2}], which is a [{3}]
-jmxProxyServlet.noBeanFound=Cannot find MBean with object name [{0}]
diff --git 
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_de.properties 
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_de.properties
new file mode 100644
index 000..e9f2d3e
--- /dev/null
+++ 
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_de.properties
@@ -0,0 +1,17 @@
+# 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.
+
+encryptInterceptor.decrypt.error.short-message=Konnte die Nachricht nicht 
entschlüsseln: Vorzeitiges Ende der Nachricht
+encryptInterceptor.decrypt.failed=Nachricht konnte nicht entschlüsselt werden
diff --git 
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_es.properties 
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_es.properties
new file mode 100644
index 000..113c217
--- /dev/null
+++ 
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_es.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 

Re: [VOTE] Release Apache Tomcat 8.5.51

[Martin Grigorov]

On Thu, Feb 6, 2020 at 12:49 AM Mark Thomas  wrote:

> The proposed Apache Tomcat 8.5.51 release is now available for voting.
>
> The major changes compared to the 8.5.50 release are:
>
> - AJP defaults changed to listen the loopback address, require a secret
>   and to be disabled in the sample server.xml
>
> - The JmxRemoteLifecycleListener is now deprecated
>
> - The HTTP Connector attribute rejectIllegalHeaderName is renamed to
>   rejectIllegalHeader and expanded to include header values as well as
>   names
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat85/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.51/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1246/
>
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.51
> 05bfeed882fadd6e3b5c64a7851125750d37e297
>
> The proposed 8.5.51 release is:
> [ ] Broken - do not release
> [ X ] Stable - go ahead and release as 8.5.51
>

Regards,
Martin


>
> -
> 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: Back-port translation updates

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 4cbc834  Back-port translation updates
4cbc834 is described below

commit 4cbc8346eeca7f95c98e23e7cee33c9cd6406081
Author: Mark Thomas 
AuthorDate: Thu Feb 6 12:16:46 2020 +

Back-port translation updates
---
 .../catalina/connector/LocalStrings.properties |  2 +-
 .../catalina/manager/LocalStrings.properties   |  6 +++---
 .../interceptors/LocalStrings_zh_CN.properties |  1 +
 .../webresources/LocalStrings_fr.properties|  2 ++
 .../webresources/LocalStrings_ko.properties|  2 ++
 java/org/apache/coyote/ajp/LocalStrings.properties |  2 +-
 .../jasper/resources/LocalStrings_zh_CN.properties | 25 --
 .../tomcat/websocket/LocalStrings_fr.properties|  1 +
 .../tomcat/websocket/LocalStrings_ko.properties|  1 +
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  2 ++
 webapps/docs/changelog.xml | 12 +++
 .../WEB-INF/classes/LocalStrings_zh_CN.properties  |  6 ++
 12 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/catalina/connector/LocalStrings.properties 
b/java/org/apache/catalina/connector/LocalStrings.properties
index 0804159..97e284c 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -28,8 +28,8 @@ coyoteConnector.parseBodyMethodNoTrace=TRACE method MUST NOT 
include an entity (
 coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed
 coyoteConnector.protocolHandlerInitializationFailed=Protocol handler 
initialization failed
 coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler 
instantiation failed
-coyoteConnector.protocolHandlerNoAprListener=The configured protocol [{0}] 
requires the AprLifecycleListener which is not available
 coyoteConnector.protocolHandlerNoAprLibrary=The configured protocol [{0}] 
requires the APR/native library which is not available
+coyoteConnector.protocolHandlerNoAprListener=The configured protocol [{0}] 
requires the AprLifecycleListener which is not available
 coyoteConnector.protocolHandlerPauseFailed=Protocol handler pause failed
 coyoteConnector.protocolHandlerResumeFailed=Protocol handler resume failed
 coyoteConnector.protocolHandlerStartFailed=Protocol handler start failed
diff --git a/java/org/apache/catalina/manager/LocalStrings.properties 
b/java/org/apache/catalina/manager/LocalStrings.properties
index eaa4d2b..34a63a5 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -114,6 +114,9 @@ htmlManagerServlet.serverTitle=Server Information
 htmlManagerServlet.serverVersion=Tomcat Version
 htmlManagerServlet.title=Tomcat Web Application Manager
 
+jmxProxyServlet.noBeanFound=Cannot find MBean with object name [{0}]
+jmxProxyServlet.noOperationOnBean=Cannot find operation [{0}] with [{1}] 
arguments on object name [{2}], which is a [{3}]
+
 managerServlet.alreadyContext=FAIL - Application already exists at path [{0}]
 managerServlet.certsNotAvailable=Certificate information cannot be obtained 
from this connector at runtime
 managerServlet.deleteFail=FAIL - Unable to delete [{0}]. The continued 
presence of this file may cause problems.
@@ -177,6 +180,3 @@ managerServlet.vminfo=OK - VM info
 
 statusServlet.complete=Complete Server Status
 statusServlet.title=Server Status
-
-jmxProxyServlet.noOperationOnBean=Cannot find operation [{0}] with [{1}] 
arguments on object name [{2}], which is a [{3}]
-jmxProxyServlet.noBeanFound=Cannot find MBean with object name [{0}]
diff --git 
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
 
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
index 1d91d41..15573d8 100644
--- 
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
+++ 
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
@@ -33,6 +33,7 @@ 
nonBlockingCoordinator.processCoordinationMessage.failed=处理协调消息时
 
 staticMembershipInterceptor.no.failureDetector=没有TcpFailureDetector。 
自动检测静态成员无法正常工作。 通过在TcpFailureDetector下定义StaticMembershipInterceptor，可以自动检测静态成员。
 
staticMembershipInterceptor.no.pingInterceptor=在没有TcpPingInterceptor的情况下，静态成员的健康检查不会正常工作。只有定义了TcpPingInterceptor，才能使健康检查正常进行。
+staticMembershipInterceptor.sendLocalMember.failed=本地成员通知失败
 staticMembershipInterceptor.sendShutdown.failed=关闭通知失败。
 
 tcpFailureDetector.failureDetection.failed=无法进行失败监测，假定成员宕机。[{0}]
diff --git a/java/org/apache/catalina/webresources/LocalStrings_fr.properties 
b/java/org/apache/catalina/webresources/LocalStrings_fr.properties
index 9939f5a..4ecf78c 100644
--- 

Re: [VOTE] Release Apache Tomcat 9.0.31

[Martin Grigorov]

On Wed, Feb 5, 2020 at 11:27 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 9.0.31 release is now available for voting.
>
> The major changes compared to the 9.0.30 release are:
>
> - AJP defaults changed to listen the loopback address, require a secret
>   and to be disabled in the sample server.xml
>
> - The JmxRemoteLifecycleListener is now deprecated
>
> - The HTTP Connector attribute rejectIllegalHeaderName is renamed to
>   rejectIllegalHeader and expanded to include header values as well as
>   names
>
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.31/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1245/
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.31
> https://github.com/apache/tomcat/tree/9.0.31
>
> The proposed 9.0.31 release is:
> [ ] Broken - do not release
> [ X ] Stable - go ahead and release as 9.0.31
>

Regards,
Martin


>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[tomcat] branch 7.0.x updated (c7803ee -> 9d67994)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from c7803ee  Fix typo
 new 7af6585  Parameterize JSP spec version in localization messages to 
ease re-use
 new 9d67994  Parameterize localization string to ease Java EE / Jakarta EE 
re-use

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/jasper/Constants.java   | 2 ++
 java/org/apache/jasper/compiler/TagFileProcessor.java   | 3 ++-
 java/org/apache/jasper/resources/LocalStrings.properties| 4 ++--
 java/org/apache/jasper/resources/LocalStrings_es.properties | 4 ++--
 java/org/apache/jasper/resources/LocalStrings_fr.properties | 4 ++--
 java/org/apache/jasper/resources/LocalStrings_ja.properties | 4 ++--
 java/org/apache/jasper/resources/LocalStrings_ko.properties | 3 ++-
 java/org/apache/jasper/runtime/HttpJspBase.java | 3 ++-
 java/org/apache/jasper/runtime/JspFactoryImpl.java  | 3 +--
 webapps/docs/changelog.xml  | 4 
 10 files changed, 21 insertions(+), 13 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/02: Parameterize JSP spec version in localization messages to ease re-use

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 7af658511fbaf9597fa8cb2561f6b45aacd24218
Author: Mark Thomas 
AuthorDate: Thu Feb 6 10:01:47 2020 +

Parameterize JSP spec version in localization messages to ease re-use
---
 java/org/apache/jasper/Constants.java   | 2 ++
 java/org/apache/jasper/resources/LocalStrings.properties| 2 +-
 java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_fr.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ja.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ko.properties | 1 +
 java/org/apache/jasper/runtime/HttpJspBase.java | 3 ++-
 java/org/apache/jasper/runtime/JspFactoryImpl.java  | 3 +--
 webapps/docs/changelog.xml  | 4 
 9 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/jasper/Constants.java 
b/java/org/apache/jasper/Constants.java
index a8f9d26..cf80615 100644
--- a/java/org/apache/jasper/Constants.java
+++ b/java/org/apache/jasper/Constants.java
@@ -30,6 +30,8 @@ import java.util.List;
  */
 public class Constants {
 
+public static final String SPEC_VERSION = "2.2";
+
 /**
  * The base class of the generated servlets.
  */
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index 5c6d87b..8285e7e 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=According to TLD, tag [{0}] must be 
empty, but is not
 
-jsp.engine.info=Jasper JSP 2.2 Engine
+jsp.engine.info=Jasper JSP {0} Engine
 jsp.error.action.isnottagfile=[{0}] action can be used in tag files only
 jsp.error.action.istagfile=[{0}] action cannot be used in a tag file
 jsp.error.attempt_to_clear_flushed_buffer=Error: Attempt to clear a buffer 
that's already been flushed
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties 
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 214b893..efb8df5 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=Según el TLD, el tag [{0}] debe de 
estar vacío, pero no lo está
 
-jsp.engine.info=Motor Jasper JSP 2.2
+jsp.engine.info=Motor Jasper JSP {0}
 jsp.error.action.isnottagfile=La acción [{0}] sólo se puede usar en archivos 
tag
 jsp.error.action.istagfile=La acción [{0}] no se puede usar en un archivo tag
 jsp.error.attempt_to_clear_flushed_buffer=Error: Se ha intentado limpiar un 
buffer que ya había sido escrito
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index c448801..aa2fbef 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=D''après la TLD, le tag [{0}] doit être 
vide, mais ne l''est pas
 
-jsp.engine.info=Moteur Jasper JSP 2.2
+jsp.engine.info=Moteur Jasper JSP {0}
 jsp.error.action.isnottagfile=L''action [{0}] ne peut être utilisée que dans 
un fichier tag
 jsp.error.action.istagfile=L''action [{0}] ne peut être utilisée dans un 
fichier tag
 jsp.error.attempt_to_clear_flushed_buffer=Erreur: Tentative d'effacement d'un 
tampon qui a déjà été vidangé (flush)
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties 
b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index 0924af7..f82cc6d 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=TLDに従ってタグ [{0}] は空でなければいけませんが、そうではありません
 
-jsp.engine.info=Jasper JSP 2.2エンジン
+jsp.engine.info=Jasper JSP {0}エンジン
 jsp.error.action.isnottagfile=[{0}] アクションはタグファイル中でのみ使用できません
 jsp.error.action.istagfile=[{0}] アクションはタグファイル中で使用できません
 jsp.error.attempt_to_clear_flushed_buffer=エラー: 既にフラッシュされているバッファをクリアしようとしました
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties 
b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index 1968db5..e47de8b 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -15,6 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=TLD 파일에 따르면, [{0}] 태그는 반드시 비어 있어야 하는데, 
그렇지 않습니다,
 
+jsp.engine.info=Jasper JSP {0} 엔진
 jsp.error.action.isnottagfile=[{0}] 액션은 오직 태그 파일들 내에서만 사용될 수 있습니다.
 jsp.error.action.istagfile=[{0}] 액션은 태그 파일 내에서 사용될 수 없습니다.
 

[tomcat] 02/02: Parameterize localization string to ease Java EE / Jakarta EE re-use

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 9d67994c368c5cdb1cc466f376f117022265f994
Author: Mark Thomas 
AuthorDate: Thu Feb 6 11:04:04 2020 +

Parameterize localization string to ease Java EE / Jakarta EE re-use
---
 java/org/apache/jasper/compiler/TagFileProcessor.java   | 3 ++-
 java/org/apache/jasper/resources/LocalStrings.properties| 2 +-
 java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_fr.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ja.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ko.properties | 2 +-
 webapps/docs/changelog.xml  | 4 ++--
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/jasper/compiler/TagFileProcessor.java 
b/java/org/apache/jasper/compiler/TagFileProcessor.java
index d881c42..84b7c7a 100644
--- a/java/org/apache/jasper/compiler/TagFileProcessor.java
+++ b/java/org/apache/jasper/compiler/TagFileProcessor.java
@@ -26,6 +26,7 @@ import java.util.Vector;
 
 import javax.el.MethodExpression;
 import javax.el.ValueExpression;
+import javax.servlet.jsp.tagext.JspFragment;
 import javax.servlet.jsp.tagext.TagAttributeInfo;
 import javax.servlet.jsp.tagext.TagFileInfo;
 import javax.servlet.jsp.tagext.TagInfo;
@@ -253,7 +254,7 @@ class TagFileProcessor {
 // type is fixed to "JspFragment" and a translation error
 // must occur if specified.
 if (type != null) {
-err.jspError(n, "jsp.error.fragmentwithtype");
+err.jspError(n, "jsp.error.fragmentwithtype", 
JspFragment.class.getName());
 }
 // rtexprvalue is fixed to "true" and a translation error
 // must occur if specified.
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index 8285e7e..f6123be 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -72,7 +72,7 @@ jsp.error.file.cannot.read=Cannot read file: [{0}]
 jsp.error.file.not.found=File [{0}] not found
 jsp.error.file.not.registered=file [{0}] not seen in include
 jsp.error.flush=Exception occurred when flushing data
-jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' 
attributes.  If 'fragment' is present, 'type' is fixed as 
'javax.servlet.jsp.tagext.JspFragment'
+jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' 
attributes.  If 'fragment' is present, 'type' is fixed as '{0}'
 jsp.error.function.classnotfound=The class [{0}] specified in TLD for the 
function [{1}] cannot be found: [{2}]
 jsp.error.include.exception=Unable to include [{0}]
 jsp.error.include.tag=Invalid jsp:include tag
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties 
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index efb8df5..6b50ed9 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -71,7 +71,7 @@ jsp.error.file.cannot.read=No se puede leer el archivo: [{0}]
 jsp.error.file.not.found=Archivo JSP [{0}] no encontrado
 jsp.error.file.not.registered=Archivo {0} not visto en include
 jsp.error.flush=Excepción sucedida al vaciar los datos
-jsp.error.fragmentwithtype=No puede especificar ambos atributos 'fragment' y 
'type'. Si está presente 'fragment', 'type' se pone como 
'javax.servlet.jsp.tagext.JspFragment'
+jsp.error.fragmentwithtype=No puede especificar ambos atributos 'fragment' y 
'type'. Si está presente 'fragment', 'type' se pone como '{0}'
 jsp.error.function.classnotfound=La clase [{0}] especificada en el TLD para la 
función [{1}] no se puede hallar: [{2}]
 jsp.error.include.exception=No se puede incluir [{0}]
 jsp.error.include.tag=Tag jsp:include no válido
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index aa2fbef..9954c00 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -71,7 +71,7 @@ jsp.error.file.cannot.read=Impossible de lire le fichier: 
[{0}]
 jsp.error.file.not.found=Le fichier [{0}] n''a pas été trouvé
 jsp.error.file.not.registered=Le fichier {0} n''apparaît pas dans l''inclusion 
(include)
 jsp.error.flush=Une exception s'est produite lors de l'envoi des données
-jsp.error.fragmentwithtype=On ne peut indiquer à la fois les attributs 
'fragment' et 'type'.  Si 'fragment' est présent, 'type' est fixé comme 
'javax.servlet.jsp.tagext.JspFragment'
+jsp.error.fragmentwithtype=On ne peut indiquer à la fois les attributs 
'fragment' et 'type'.  Si 

[tomcat] 01/03: Parameterize JSP spec version in localization messages to ease re-use

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 64d64800f978a0e5bdb15f4e3cf27565b10cc7a2
Author: Mark Thomas 
AuthorDate: Thu Feb 6 10:01:47 2020 +

Parameterize JSP spec version in localization messages to ease re-use
---
 java/org/apache/jasper/Constants.java   | 2 ++
 java/org/apache/jasper/resources/LocalStrings.properties| 2 +-
 java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_fr.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ja.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ko.properties | 2 +-
 java/org/apache/jasper/runtime/HttpJspBase.java | 3 ++-
 java/org/apache/jasper/runtime/JspFactoryImpl.java  | 3 +--
 webapps/docs/changelog.xml  | 8 
 9 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/jasper/Constants.java 
b/java/org/apache/jasper/Constants.java
index ebb5fa0..14fc618 100644
--- a/java/org/apache/jasper/Constants.java
+++ b/java/org/apache/jasper/Constants.java
@@ -30,6 +30,8 @@ import java.util.List;
  */
 public class Constants {
 
+public static final String SPEC_VERSION = "2.3";
+
 /**
  * The base class of the generated servlets.
  */
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index 929bb6a..598f32f 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=According to TLD, tag [{0}] must be 
empty, but is not
 
-jsp.engine.info=Jasper JSP 2.3 Engine
+jsp.engine.info=Jasper JSP {0} Engine
 jsp.error.action.isnottagfile=[{0}] action can be used in tag files only
 jsp.error.action.istagfile=[{0}] action cannot be used in a tag file
 jsp.error.attempt_to_clear_flushed_buffer=Error: Attempt to clear a buffer 
that's already been flushed
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties 
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 41dda9b..584772d 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=Según el TLD, el tag [{0}] debe de 
estar vacío, pero no lo está
 
-jsp.engine.info=Motor Jasper JSP 2.3
+jsp.engine.info=Motor Jasper JSP {0}
 jsp.error.action.isnottagfile=La acción [{0}] sólo se puede usar en archivos 
tag
 jsp.error.action.istagfile=La acción [{0}] no se puede usar en un archivo tag
 jsp.error.attempt_to_clear_flushed_buffer=Error: Se ha intentado limpiar un 
buffer que ya había sido escrito
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 5010b4b..0c58724 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=D''après la TLD, le tag [{0}] doit être 
vide, mais ne l''est pas
 
-jsp.engine.info=Moteur Jasper JSP 2.3
+jsp.engine.info=Moteur Jasper JSP {0}
 jsp.error.action.isnottagfile=L''action [{0}] ne peut être utilisée que dans 
un fichier tag
 jsp.error.action.istagfile=L''action [{0}] ne peut être utilisée dans un 
fichier tag
 jsp.error.attempt_to_clear_flushed_buffer=Erreur: Tentative d'effacement d'un 
tampon qui a déjà été vidangé (flush)
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties 
b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index 7a10510..4427ff6 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=TLDに従ってタグ [{0}] は空でなければいけませんが、そうではありません
 
-jsp.engine.info=Jasper JSP 2.3エンジン
+jsp.engine.info=Jasper JSP {0}エンジン
 jsp.error.action.isnottagfile=[{0}] アクションはタグファイル中でのみ使用できません
 jsp.error.action.istagfile=[{0}] アクションはタグファイル中で使用できません
 jsp.error.attempt_to_clear_flushed_buffer=エラー: 既にフラッシュされているバッファをクリアしようとしました
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties 
b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index 4361c42..5bc96e6 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=TLD 파일에 따르면, [{0}] 태그는 반드시 비어 있어야 하는데, 
그렇지 않습니다,
 
-jsp.engine.info=Jasper JSP 2.3 엔진
+jsp.engine.info=Jasper JSP {0} 엔진
 jsp.error.action.isnottagfile=[{0}] 액션은 오직 태그 파일들 내에서만 사용될 수 있습니다.
 jsp.error.action.istagfile=[{0}] 액션은 

[tomcat] 03/03: Fix typos

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 2d5f9ecb5a47f2fd48aed84e66902c3348d560db
Author: Mark Thomas 
AuthorDate: Thu Feb 6 12:00:40 2020 +

Fix typos
---
 java/org/apache/coyote/AbstractProtocol.java   | 4 ++--
 java/org/apache/coyote/LocalStrings.properties | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/coyote/AbstractProtocol.java 
b/java/org/apache/coyote/AbstractProtocol.java
index f021791..39153f1 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -399,7 +399,7 @@ public abstract class AbstractProtocol implements 
ProtocolHandler,
 
 public void addWaitingProcessor(Processor processor) {
 if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractProcotol.waitingProcerssor.add", 
processor));
+
getLog().debug(sm.getString("abstractProtocol.waitingProcessor.add", 
processor));
 }
 waitingProcessors.add(processor);
 }
@@ -407,7 +407,7 @@ public abstract class AbstractProtocol implements 
ProtocolHandler,
 
 public void removeWaitingProcessor(Processor processor) {
 if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractProcotol.waitingProcerssor.remove", 
processor));
+
getLog().debug(sm.getString("abstractProtocol.waitingProcessor.remove", 
processor));
 }
 waitingProcessors.remove(processor);
 }
diff --git a/java/org/apache/coyote/LocalStrings.properties 
b/java/org/apache/coyote/LocalStrings.properties
index 5262a86..c5e97c0 100644
--- a/java/org/apache/coyote/LocalStrings.properties
+++ b/java/org/apache/coyote/LocalStrings.properties
@@ -35,8 +35,8 @@ abstractProcessor.socket.ssl=Exception getting SSL attributes
 abstractProtocol.mbeanDeregistrationFailed=Failed to deregister MBean named 
[{0}] from MBean server [{1}]
 abstractProtocol.processorRegisterError=Error registering request processor
 abstractProtocol.processorUnregisterError=Error unregistering request processor
-abstractProcotol.waitingProcerssor.add=Added processor [{0}] to waiting 
processors
-abstractProcotol.waitingProcerssor.remove=Removed processor [{0}] from waiting 
processors
+abstractProtocol.waitingProcessor.add=Added processor [{0}] to waiting 
processors
+abstractProtocol.waitingProcessor.remove=Removed processor [{0}] from waiting 
processors
 
 abstractProtocolHandler.destroy=Destroying ProtocolHandler [{0}]
 abstractProtocolHandler.destroyError=Failed to destroy end point associated 
with ProtocolHandler [{0}]


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/03: Parameterize localization string to ease Java EE / Jakarta EE re-use

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 81089f17e73d38c30be6b7a88190f9432e9e3f91
Author: Mark Thomas 
AuthorDate: Thu Feb 6 11:04:04 2020 +

Parameterize localization string to ease Java EE / Jakarta EE re-use
---
 java/org/apache/jasper/compiler/TagFileProcessor.java   | 3 ++-
 java/org/apache/jasper/resources/LocalStrings.properties| 2 +-
 java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_fr.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ja.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ko.properties | 2 +-
 webapps/docs/changelog.xml  | 4 ++--
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/jasper/compiler/TagFileProcessor.java 
b/java/org/apache/jasper/compiler/TagFileProcessor.java
index d26ba94..7482a14 100644
--- a/java/org/apache/jasper/compiler/TagFileProcessor.java
+++ b/java/org/apache/jasper/compiler/TagFileProcessor.java
@@ -24,6 +24,7 @@ import java.util.Vector;
 
 import javax.el.MethodExpression;
 import javax.el.ValueExpression;
+import javax.servlet.jsp.tagext.JspFragment;
 import javax.servlet.jsp.tagext.TagAttributeInfo;
 import javax.servlet.jsp.tagext.TagFileInfo;
 import javax.servlet.jsp.tagext.TagInfo;
@@ -251,7 +252,7 @@ class TagFileProcessor {
 // type is fixed to "JspFragment" and a translation error
 // must occur if specified.
 if (type != null) {
-err.jspError(n, "jsp.error.fragmentwithtype");
+err.jspError(n, "jsp.error.fragmentwithtype", 
JspFragment.class.getName());
 }
 // rtexprvalue is fixed to "true" and a translation error
 // must occur if specified.
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index 598f32f..bc45b72 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -70,7 +70,7 @@ jsp.error.file.already.registered=Recursive include of file 
[{0}]
 jsp.error.file.cannot.read=Cannot read file: [{0}]
 jsp.error.file.not.found=File [{0}] not found
 jsp.error.flush=Exception occurred when flushing data
-jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' 
attributes.  If 'fragment' is present, 'type' is fixed as 
'javax.servlet.jsp.tagext.JspFragment'
+jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' 
attributes.  If 'fragment' is present, 'type' is fixed as '{0}'
 jsp.error.function.classnotfound=The class [{0}] specified in TLD for the 
function [{1}] cannot be found: [{2}]
 jsp.error.include.exception=Unable to include [{0}]
 jsp.error.include.tag=Invalid jsp:include tag
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties 
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 584772d..7d1b61e 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -69,7 +69,7 @@ jsp.error.file.already.registered=El archivo [{0}] ya se ha 
visto, ¿podría ser
 jsp.error.file.cannot.read=No se puede leer el archivo: [{0}]
 jsp.error.file.not.found=Archivo JSP [{0}] no encontrado
 jsp.error.flush=Excepción sucedida al vaciar los datos
-jsp.error.fragmentwithtype=No puede especificar ambos atributos 'fragment' y 
'type'. Si está presente 'fragment', 'type' se pone como 
'javax.servlet.jsp.tagext.JspFragment'
+jsp.error.fragmentwithtype=No puede especificar ambos atributos 'fragment' y 
'type'. Si está presente 'fragment', 'type' se pone como '{0}'
 jsp.error.function.classnotfound=La clase [{0}] especificada en el TLD para la 
función [{1}] no se puede hallar: [{2}]
 jsp.error.include.exception=No se puede incluir [{0}]
 jsp.error.include.tag=Tag jsp:include no válido
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 0c58724..383ebd9 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -70,7 +70,7 @@ jsp.error.file.already.registered=Inclusion récursive du 
fichier [{0}]
 jsp.error.file.cannot.read=Impossible de lire le fichier: [{0}]
 jsp.error.file.not.found=Le fichier [{0}] n''a pas été trouvé
 jsp.error.flush=Une exception s'est produite lors de l'envoi des données
-jsp.error.fragmentwithtype=On ne peut indiquer à la fois les attributs 
'fragment' et 'type'.  Si 'fragment' est présent, 'type' est fixé comme 
'javax.servlet.jsp.tagext.JspFragment'
+jsp.error.fragmentwithtype=On ne peut indiquer à la fois les attributs 
'fragment' et 'type'.  

[tomcat] branch 8.5.x updated (11c40d2 -> 2d5f9ec)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 11c40d2  Increment version for next dev cycle
 new 64d6480  Parameterize JSP spec version in localization messages to 
ease re-use
 new 81089f1  Parameterize localization string to ease Java EE / Jakarta EE 
re-use
 new 2d5f9ec  Fix typos

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:
 java/org/apache/coyote/AbstractProtocol.java| 4 ++--
 java/org/apache/coyote/LocalStrings.properties  | 4 ++--
 java/org/apache/jasper/Constants.java   | 2 ++
 java/org/apache/jasper/compiler/TagFileProcessor.java   | 3 ++-
 java/org/apache/jasper/resources/LocalStrings.properties| 4 ++--
 java/org/apache/jasper/resources/LocalStrings_es.properties | 4 ++--
 java/org/apache/jasper/resources/LocalStrings_fr.properties | 4 ++--
 java/org/apache/jasper/resources/LocalStrings_ja.properties | 4 ++--
 java/org/apache/jasper/resources/LocalStrings_ko.properties | 4 ++--
 java/org/apache/jasper/runtime/HttpJspBase.java | 3 ++-
 java/org/apache/jasper/runtime/JspFactoryImpl.java  | 3 +--
 webapps/docs/changelog.xml  | 8 
 12 files changed, 29 insertions(+), 18 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 10.0.0.0-M1

[Rémy Maucherat]

On Thu, Feb 6, 2020 at 12:51 PM Konstantin Kolinko 
wrote:

> чт, 6 февр. 2020 г. в 14:26, Rémy Maucherat :
> >
> > On Thu, Feb 6, 2020 at 12:23 PM Konstantin Kolinko <
> knst.koli...@gmail.com> wrote:
> >>
> >> ср, 5 февр. 2020 г. в 22:22, Mark Thomas :
> >> >
> >> > The proposed Apache Tomcat 10.0.0.0-M1 release is now available for
> >> > voting. This is the first release of 10.0.0.x and is based on 9.0.31.
> >>
> >> It is odd to see 4 numbers in "10.0.0.0" instead of the usual 3
> >> "10.0.0", "10.0.x".
> >>
> >> Was it intended?
> >
> >
> > Yes, it is all explained in the release plan for Jakarta. 10.0.0.x with
> Jakarta EE 9 will be followed by the "real" release which will be 10.0.1
> (then 10.0.2, 10.0.3, etc) with Jakarta EE 10 (with stuff actually new in
> it).
>
> Thank you for your response, but all this is rather confusing.
>
> 1). Why cannot we go with the usual 10.0.x for Jakarta EE 9, followed
> by 10.0.y for Jakarta EE 10,
> e.g. see Specifications page in the wiki like it was for WebSocket 1.0
> and WebSocket 1.1 (since 8.0.13),
> and maintenance releases of the Servlet specification?
>
> [1]
> https://cwiki.apache.org/confluence/x/Bi8lBg#Specifications-JavaAPIforWebSocket
>
> 10.0.0.x will not be immediately EOLed I suppose, so that's why there's an
extra number.
The plan was discussed and the final version of it is here:
https://cwiki.apache.org/confluence/display/TOMCAT/Jakarta+EE+Release+Numbering


> 2) I hope that somebody will update the following pages:
> https://tomcat.apache.org/whichversion.html
> https://cwiki.apache.org/confluence/display/TOMCAT/Tomcat+Versions
> https://cwiki.apache.org/confluence/display/TOMCAT/Specifications
>
> It is a lot better to stick to the existing numbering scheme (even if
> we would skip versions: e,g, Tomcat 10 for Jakarta EE 9 that stays as
> "alpha", followed by stable Tomcat 11 for Jakarta EE 10), rather that
> to invent a new one.
>

So we decided to invent a new numbering scheme (actually: make a small
exception just for this very special release) because this way the EE
version matches the Tomcat version number and this is Good. There was a
perfected opportunity to do that since Jakarta EE 9 is not a real release
(it is only a renamed EE 8) and will only need short term support.

Rémy


>
> Best regards,
> Konstantin Kolinko
>
> -
> 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 typos

[markt]

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 b693d7c  Fix typos
b693d7c is described below

commit b693d7c1981fa7f51e58bc8c8e72e3fe80b7b773
Author: Mark Thomas 
AuthorDate: Thu Feb 6 12:00:40 2020 +

Fix typos
---
 java/org/apache/coyote/AbstractProtocol.java   | 4 ++--
 java/org/apache/coyote/LocalStrings.properties | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/coyote/AbstractProtocol.java 
b/java/org/apache/coyote/AbstractProtocol.java
index b41ad32..cb326dc 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -392,7 +392,7 @@ public abstract class AbstractProtocol implements 
ProtocolHandler,
 
 public void addWaitingProcessor(Processor processor) {
 if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractProcotol.waitingProcerssor.add", 
processor));
+
getLog().debug(sm.getString("abstractProtocol.waitingProcessor.add", 
processor));
 }
 waitingProcessors.add(processor);
 }
@@ -400,7 +400,7 @@ public abstract class AbstractProtocol implements 
ProtocolHandler,
 
 public void removeWaitingProcessor(Processor processor) {
 if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractProcotol.waitingProcerssor.remove", 
processor));
+
getLog().debug(sm.getString("abstractProtocol.waitingProcessor.remove", 
processor));
 }
 waitingProcessors.remove(processor);
 }
diff --git a/java/org/apache/coyote/LocalStrings.properties 
b/java/org/apache/coyote/LocalStrings.properties
index b20d056..6acb6be 100644
--- a/java/org/apache/coyote/LocalStrings.properties
+++ b/java/org/apache/coyote/LocalStrings.properties
@@ -36,8 +36,8 @@ abstractProcessor.socket.ssl=Exception getting SSL attributes
 abstractProtocol.mbeanDeregistrationFailed=Failed to deregister MBean named 
[{0}] from MBean server [{1}]
 abstractProtocol.processorRegisterError=Error registering request processor
 abstractProtocol.processorUnregisterError=Error unregistering request processor
-abstractProcotol.waitingProcerssor.add=Added processor [{0}] to waiting 
processors
-abstractProcotol.waitingProcerssor.remove=Removed processor [{0}] from waiting 
processors
+abstractProtocol.waitingProcessor.add=Added processor [{0}] to waiting 
processors
+abstractProtocol.waitingProcessor.remove=Removed processor [{0}] from waiting 
processors
 
 abstractProtocolHandler.asyncTimeoutError=Error processing async timeouts
 abstractProtocolHandler.destroy=Destroying ProtocolHandler [{0}]


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Fix typos

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new fbf2891  Fix typos
fbf2891 is described below

commit fbf28916eedb844097c0abe49afd6f1dda975073
Author: Mark Thomas 
AuthorDate: Thu Feb 6 12:00:40 2020 +

Fix typos
---
 java/org/apache/coyote/AbstractProtocol.java   | 4 ++--
 java/org/apache/coyote/LocalStrings.properties | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/coyote/AbstractProtocol.java 
b/java/org/apache/coyote/AbstractProtocol.java
index 92ff009..1190c99 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -369,7 +369,7 @@ public abstract class AbstractProtocol implements 
ProtocolHandler,
 
 public void addWaitingProcessor(Processor processor) {
 if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractProcotol.waitingProcerssor.add", 
processor));
+
getLog().debug(sm.getString("abstractProtocol.waitingProcessor.add", 
processor));
 }
 waitingProcessors.add(processor);
 }
@@ -377,7 +377,7 @@ public abstract class AbstractProtocol implements 
ProtocolHandler,
 
 public void removeWaitingProcessor(Processor processor) {
 if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractProcotol.waitingProcerssor.remove", 
processor));
+
getLog().debug(sm.getString("abstractProtocol.waitingProcessor.remove", 
processor));
 }
 waitingProcessors.remove(processor);
 }
diff --git a/java/org/apache/coyote/LocalStrings.properties 
b/java/org/apache/coyote/LocalStrings.properties
index b20d056..6acb6be 100644
--- a/java/org/apache/coyote/LocalStrings.properties
+++ b/java/org/apache/coyote/LocalStrings.properties
@@ -36,8 +36,8 @@ abstractProcessor.socket.ssl=Exception getting SSL attributes
 abstractProtocol.mbeanDeregistrationFailed=Failed to deregister MBean named 
[{0}] from MBean server [{1}]
 abstractProtocol.processorRegisterError=Error registering request processor
 abstractProtocol.processorUnregisterError=Error unregistering request processor
-abstractProcotol.waitingProcerssor.add=Added processor [{0}] to waiting 
processors
-abstractProcotol.waitingProcerssor.remove=Removed processor [{0}] from waiting 
processors
+abstractProtocol.waitingProcessor.add=Added processor [{0}] to waiting 
processors
+abstractProtocol.waitingProcessor.remove=Removed processor [{0}] from waiting 
processors
 
 abstractProtocolHandler.asyncTimeoutError=Error processing async timeouts
 abstractProtocolHandler.destroy=Destroying ProtocolHandler [{0}]


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 10.0.0.0-M1

[Konstantin Kolinko]

чт, 6 февр. 2020 г. в 14:26, Rémy Maucherat :
>
> On Thu, Feb 6, 2020 at 12:23 PM Konstantin Kolinko  
> wrote:
>>
>> ср, 5 февр. 2020 г. в 22:22, Mark Thomas :
>> >
>> > The proposed Apache Tomcat 10.0.0.0-M1 release is now available for
>> > voting. This is the first release of 10.0.0.x and is based on 9.0.31.
>>
>> It is odd to see 4 numbers in "10.0.0.0" instead of the usual 3
>> "10.0.0", "10.0.x".
>>
>> Was it intended?
>
>
> Yes, it is all explained in the release plan for Jakarta. 10.0.0.x with 
> Jakarta EE 9 will be followed by the "real" release which will be 10.0.1 
> (then 10.0.2, 10.0.3, etc) with Jakarta EE 10 (with stuff actually new in it).

Thank you for your response, but all this is rather confusing.

1). Why cannot we go with the usual 10.0.x for Jakarta EE 9, followed
by 10.0.y for Jakarta EE 10,
e.g. see Specifications page in the wiki like it was for WebSocket 1.0
and WebSocket 1.1 (since 8.0.13),
and maintenance releases of the Servlet specification?

[1] 
https://cwiki.apache.org/confluence/x/Bi8lBg#Specifications-JavaAPIforWebSocket

2) I hope that somebody will update the following pages:
https://tomcat.apache.org/whichversion.html
https://cwiki.apache.org/confluence/display/TOMCAT/Tomcat+Versions
https://cwiki.apache.org/confluence/display/TOMCAT/Specifications

It is a lot better to stick to the existing numbering scheme (even if
we would skip versions: e,g, Tomcat 10 for Jakarta EE 9 that stays as
"alpha", followed by stable Tomcat 11 for Jakarta EE 10), rather that
to invent a new one.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 9.0.x updated: Back-port translation updates

[markt]

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 cdef3dd  Back-port translation updates
cdef3dd is described below

commit cdef3ddc2403096ab7b7fb45da28e4d34ee267ea
Author: Mark Thomas 
AuthorDate: Thu Feb 6 11:47:36 2020 +

Back-port translation updates
---
 .../interceptors/LocalStrings_zh_CN.properties |  1 +
 .../webresources/LocalStrings_fr.properties|  2 ++
 .../jasper/resources/LocalStrings_zh_CN.properties | 25 --
 .../tomcat/websocket/LocalStrings_fr.properties|  1 +
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  2 ++
 webapps/docs/changelog.xml | 12 +++
 .../WEB-INF/classes/LocalStrings_zh_CN.properties  |  6 ++
 7 files changed, 43 insertions(+), 6 deletions(-)

diff --git 
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
 
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
index d3f44fb..1dc5bc7 100644
--- 
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
+++ 
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
@@ -47,6 +47,7 @@ 
nonBlockingCoordinator.processCoordinationMessage.failed=处理协调消息时
 
 staticMembershipInterceptor.no.failureDetector=没有TcpFailureDetector。 
自动检测静态成员无法正常工作。 通过在TcpFailureDetector下定义StaticMembershipInterceptor，可以自动检测静态成员。
 
staticMembershipInterceptor.no.pingInterceptor=在没有TcpPingInterceptor的情况下，静态成员的健康检查不会正常工作。只有定义了TcpPingInterceptor，才能使健康检查正常进行。
+staticMembershipInterceptor.sendLocalMember.failed=本地成员通知失败
 staticMembershipInterceptor.sendShutdown.failed=关闭通知失败。
 
 tcpFailureDetector.failureDetection.failed=无法进行失败监测，假定成员宕机。[{0}]
diff --git a/java/org/apache/catalina/webresources/LocalStrings_fr.properties 
b/java/org/apache/catalina/webresources/LocalStrings_fr.properties
index 9939f5a..4ecf78c 100644
--- a/java/org/apache/catalina/webresources/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings_fr.properties
@@ -25,6 +25,8 @@ cache.backgroundEvictFail=Le processus d''arrière plan 
d''éviction du cache n'
 cache.objectMaxSizeTooBig=La valeur [{0}]kB pour l''objectMaxSize est plus 
grade que la limite de maxSize/20 son elle a été réduite à [{1}]kB\n
 cache.objectMaxSizeTooBigBytes=La valeur de taille d''objet maximale pouvant 
être mis en cache de [{0}]kB est supérieure à Integer.MAX_VALUE qui est le 
maximum, la limite a donc été fixée à Integer.MAX_VALUE octets
 
+cachedResource.invalidURL=La création d''une instance de 
CachedResourceURLStreamHandler a échouée car l''URL [{0}] est malformée
+
 classpathUrlStreamHandler.notFound=Impossible de charger la ressource [{0}] en 
utilisant le chargeur de classe de contexte du thread ou celui de la classe 
actuelle
 
 dirResourceSet.manifestFail=Impossible de lire le manifeste depuis [{0}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties 
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index 2b6c38e..0a92c63 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -80,15 +80,28 @@ jsp.error.noFunction=无法使用指定的前缀找到函数[{0}]
 jsp.error.not.in.template=在模板文本体中, [{0}] 是不允许的.
 jsp.error.outputfolder=无输出目录
 jsp.error.overflow=错误：JSP缓冲区溢出
+jsp.error.page.conflict.autoflush=页面指令：“ autoFlush”非法多次出现不同值（旧值: [{0}], 新值: 
[{1}]）
+jsp.error.page.conflict.buffer=页面指令：“ buffer”非法多次出现不同值（旧值: [{0}], 新值: [{1}]）
 
jsp.error.page.conflict.contenttype=Page指令：非法出现多次出现的''contentType''具有不同的值（old：[{0}]，new：[{1}]）
+jsp.error.page.conflict.deferredsyntaxallowedasliteral=页面指令：“ 
deferredSyntaxAllowedAsLiteral”非法多次出现不同值（旧值: [{0}], 新值: [{1}]）
 jsp.error.page.conflict.errorpage=页指令：不同值的多次出现“errorPage”的非法值（旧:[{0}],新:[{1}]）
-jsp.error.page.conflict.language=页指令：多次出现不同值的“语言”(旧：[{0}]，新：[{1}])
-jsp.error.page.conflict.session=Page指令：多次出现具有不同值的''session''非法（old：[{0}]，new：[{1}]）
+jsp.error.page.conflict.extends=页面指令：“ extends”非法多次出现不同值（旧值: [{0}], 新值: [{1}]）
+jsp.error.page.conflict.info=页面指令：“ info”非法多次出现不同值（旧值: [{0}], 新值: [{1}]）
+jsp.error.page.conflict.iselignored=页面指令：“ isELIgnored”非法多次出现不同值（旧值: [{0}], 
新值: [{1}]）
+jsp.error.page.conflict.iserrorpage=页面指令：“ isErrorPage”非法多次出现不同值（旧值: [{0}], 
新值: [{1}]）
+jsp.error.page.conflict.isthreadsafe=页面指令：“ isThreadSafe”非法多次出现不同值（旧值: [{0}], 
新值: [{1}]）
+jsp.error.page.conflict.language=页面指令：“ language” 非法多次出现不同值（ 旧值：[{0}]，新值：[{1}] 
）
+jsp.error.page.conflict.session=页面指令：“session” 非法多次出现不同值（ 旧值：[{0}]，新值：[{1}] ）
 
jsp.error.page.conflict.trimdirectivewhitespaces=页面指令：违法出现多个有不同的值（旧值：[{0}]，新值：[{1}]）的''trimDirectiveWhitespaces''
-jsp.error.page.invalid.deferredsyntaxallowedasliteral=页面指令：deferredSyntaxAllowedAsLiteral的值无效

[tomcat] branch 9.0.x updated (f9faad6 -> 78b6ee8)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from f9faad6  Increment version number for next development cycle
 new 27a42b9  Parameterize JSP spec version in localization messages to 
ease re-use
 new 78b6ee8  Parameterize localization string to ease Java EE / Jakarta EE 
re-use

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/jasper/Constants.java   | 2 ++
 java/org/apache/jasper/compiler/TagFileProcessor.java   | 3 ++-
 java/org/apache/jasper/resources/LocalStrings.properties| 4 ++--
 java/org/apache/jasper/resources/LocalStrings_es.properties | 4 ++--
 java/org/apache/jasper/resources/LocalStrings_fr.properties | 4 ++--
 java/org/apache/jasper/resources/LocalStrings_ja.properties | 4 ++--
 java/org/apache/jasper/resources/LocalStrings_ko.properties | 4 ++--
 java/org/apache/jasper/runtime/HttpJspBase.java | 3 ++-
 java/org/apache/jasper/runtime/JspFactoryImpl.java  | 3 +--
 webapps/docs/changelog.xml  | 8 
 10 files changed, 25 insertions(+), 14 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/02: Parameterize localization string to ease Java EE / Jakarta EE re-use

[markt]

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

commit 78b6ee8372a25fab7e3bb0748263707e2f69031f
Author: Mark Thomas 
AuthorDate: Thu Feb 6 11:04:04 2020 +

Parameterize localization string to ease Java EE / Jakarta EE re-use
---
 java/org/apache/jasper/compiler/TagFileProcessor.java   | 3 ++-
 java/org/apache/jasper/resources/LocalStrings.properties| 2 +-
 java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_fr.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ja.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ko.properties | 2 +-
 webapps/docs/changelog.xml  | 4 ++--
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/jasper/compiler/TagFileProcessor.java 
b/java/org/apache/jasper/compiler/TagFileProcessor.java
index 3b3300d..7be773d 100644
--- a/java/org/apache/jasper/compiler/TagFileProcessor.java
+++ b/java/org/apache/jasper/compiler/TagFileProcessor.java
@@ -25,6 +25,7 @@ import java.util.Vector;
 
 import javax.el.MethodExpression;
 import javax.el.ValueExpression;
+import javax.servlet.jsp.tagext.JspFragment;
 import javax.servlet.jsp.tagext.TagAttributeInfo;
 import javax.servlet.jsp.tagext.TagFileInfo;
 import javax.servlet.jsp.tagext.TagInfo;
@@ -252,7 +253,7 @@ class TagFileProcessor {
 // type is fixed to "JspFragment" and a translation error
 // must occur if specified.
 if (type != null) {
-err.jspError(n, "jsp.error.fragmentwithtype");
+err.jspError(n, "jsp.error.fragmentwithtype", 
JspFragment.class.getName());
 }
 // rtexprvalue is fixed to "true" and a translation error
 // must occur if specified.
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index 5710da0..17a0ace 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -76,7 +76,7 @@ jsp.error.file.already.registered=Recursive include of file 
[{0}]
 jsp.error.file.cannot.read=Cannot read file: [{0}]
 jsp.error.file.not.found=File [{0}] not found
 jsp.error.flush=Exception occurred when flushing data
-jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' 
attributes.  If 'fragment' is present, 'type' is fixed as 
'javax.servlet.jsp.tagext.JspFragment'
+jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' 
attributes.  If 'fragment' is present, 'type' is fixed as '{0}'
 jsp.error.function.classnotfound=The class [{0}] specified in TLD for the 
function [{1}] cannot be found: [{2}]
 jsp.error.include.exception=Unable to include [{0}]
 jsp.error.include.tag=Invalid jsp:include tag
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties 
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index fd7d86c..e5eb63e 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -69,7 +69,7 @@ jsp.error.file.already.registered=El archivo [{0}] ya se ha 
visto, ¿podría ser
 jsp.error.file.cannot.read=No se puede leer el archivo: [{0}]
 jsp.error.file.not.found=Archivo JSP [{0}] no encontrado
 jsp.error.flush=Excepción sucedida al vaciar los datos
-jsp.error.fragmentwithtype=No puede especificar ambos atributos 'fragment' y 
'type'. Si está presente 'fragment', 'type' se pone como 
'javax.servlet.jsp.tagext.JspFragment'
+jsp.error.fragmentwithtype=No puede especificar ambos atributos 'fragment' y 
'type'. Si está presente 'fragment', 'type' se pone como '{0}'
 jsp.error.function.classnotfound=La clase [{0}] especificada en el TLD para la 
función [{1}] no se puede hallar: [{2}]
 jsp.error.include.exception=No se puede incluir [{0}]
 jsp.error.include.tag=Tag jsp:include no válido
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 110ce83..9970182 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -76,7 +76,7 @@ jsp.error.file.already.registered=Inclusion récursive du 
fichier [{0}]
 jsp.error.file.cannot.read=Impossible de lire le fichier: [{0}]
 jsp.error.file.not.found=Le fichier [{0}] n''a pas été trouvé
 jsp.error.flush=Une exception s'est produite lors de l'envoi des données
-jsp.error.fragmentwithtype=On ne peut indiquer à la fois les attributs 
'fragment' et 'type'.  Si 'fragment' est présent, 'type' est fixé comme 
'javax.servlet.jsp.tagext.JspFragment'
+jsp.error.fragmentwithtype=On ne peut indiquer à la fois les attributs 
'fragment' et 'type'.  

[tomcat] 01/02: Parameterize JSP spec version in localization messages to ease re-use

[markt]

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

commit 27a42b9fb4d395fb98ce22c477f9c521369c
Author: Mark Thomas 
AuthorDate: Thu Feb 6 10:01:47 2020 +

Parameterize JSP spec version in localization messages to ease re-use
---
 java/org/apache/jasper/Constants.java   | 2 ++
 java/org/apache/jasper/resources/LocalStrings.properties| 2 +-
 java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_fr.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ja.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ko.properties | 2 +-
 java/org/apache/jasper/runtime/HttpJspBase.java | 3 ++-
 java/org/apache/jasper/runtime/JspFactoryImpl.java  | 3 +--
 webapps/docs/changelog.xml  | 8 
 9 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/jasper/Constants.java 
b/java/org/apache/jasper/Constants.java
index ebb5fa0..14fc618 100644
--- a/java/org/apache/jasper/Constants.java
+++ b/java/org/apache/jasper/Constants.java
@@ -30,6 +30,8 @@ import java.util.List;
  */
 public class Constants {
 
+public static final String SPEC_VERSION = "2.3";
+
 /**
  * The base class of the generated servlets.
  */
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index 6574f84..5710da0 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=According to TLD, tag [{0}] must be 
empty, but is not
 
-jsp.engine.info=Jasper JSP 2.3 Engine
+jsp.engine.info=Jasper JSP {0} Engine
 jsp.error.URLMustStartWithSlash=Path [{0}] must start with a slash character
 jsp.error.action.isnottagfile=[{0}] action can be used in tag files only
 jsp.error.action.istagfile=[{0}] action cannot be used in a tag file
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties 
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index c7c470b..fd7d86c 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=Según el TLD, el tag [{0}] debe de 
estar vacío, pero no lo está
 
-jsp.engine.info=Motor Jasper JSP 2.3
+jsp.engine.info=Motor Jasper JSP {0}
 jsp.error.action.isnottagfile=La acción [{0}] sólo se puede usar en archivos 
tag
 jsp.error.action.istagfile=La acción [{0}] no se puede usar en un archivo tag
 jsp.error.attempt_to_clear_flushed_buffer=Error: Se ha intentado limpiar un 
buffer que ya había sido escrito
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index d311b8d..110ce83 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=D''après la TLD, le tag [{0}] doit être 
vide, mais ne l''est pas
 
-jsp.engine.info=Moteur Jasper JSP 2.3
+jsp.engine.info=Moteur Jasper JSP {0}
 jsp.error.URLMustStartWithSlash=Le chemin [{0}] doit commencer par un 
caractère slash
 jsp.error.action.isnottagfile=L''action [{0}] ne peut être utilisée que dans 
un fichier tag
 jsp.error.action.istagfile=L''action [{0}] ne peut être utilisée dans un 
fichier tag
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties 
b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index 3820aaf..e0fff33 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=TLDに従ってタグ [{0}] は空でなければいけませんが、そうではありません
 
-jsp.engine.info=Jasper JSP 2.3エンジン
+jsp.engine.info=Jasper JSP {0}エンジン
 jsp.error.URLMustStartWithSlash=パス[{0}]はスラッシュ文字で始まる必要があります。
 jsp.error.action.isnottagfile=[{0}] アクションはタグファイル中でのみ使用できません
 jsp.error.action.istagfile=[{0}] アクションはタグファイル中で使用できません
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties 
b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index 5ca9865..ece8dc4 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=TLD 파일에 따르면, [{0}] 태그는 반드시 비어 있어야 하는데, 
그렇지 않습니다,
 
-jsp.engine.info=Jasper JSP 2.3 엔진
+jsp.engine.info=Jasper JSP {0} 엔진
 jsp.error.URLMustStartWithSlash=경로 [{0}]은(는) 반드시 슬래시 문자로 시작해야 합니다.
 jsp.error.action.isnottagfile=[{0}] 액션은 오직 태그 파일들 내에서만 사용될 수 있습니다.
 jsp.error.action.istagfile=[{0}] 액션은 태그 파일 

Re: [VOTE] Release Apache Tomcat 10.0.0.0-M1

[Rémy Maucherat]

On Thu, Feb 6, 2020 at 12:23 PM Konstantin Kolinko 
wrote:

> ср, 5 февр. 2020 г. в 22:22, Mark Thomas :
> >
> > The proposed Apache Tomcat 10.0.0.0-M1 release is now available for
> > voting. This is the first release of 10.0.0.x and is based on 9.0.31.
>
> It is odd to see 4 numbers in "10.0.0.0" instead of the usual 3
> "10.0.0", "10.0.x".
>
> Was it intended?
>

Yes, it is all explained in the release plan for Jakarta. 10.0.0.x with
Jakarta EE 9 will be followed by the "real" release which will be 10.0.1
(then 10.0.2, 10.0.3, etc) with Jakarta EE 10 (with stuff actually new in
it).

Rémy


>
> Best regards,
> Konstantin Kolinko
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[tomcat] 02/02: Expand Chinese translations. Contribution by BoltzmannWxd.

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 44e1d59e56e91667a8b5fae404818d9cb506374f
Author: Mark Thomas 
AuthorDate: Thu Feb 6 11:22:21 2020 +

Expand Chinese translations. Contribution by BoltzmannWxd.
---
 .../interceptors/LocalStrings_zh_CN.properties |  1 +
 .../jasper/resources/LocalStrings_zh_CN.properties | 25 --
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  2 ++
 webapps/docs/changelog.xml |  4 
 .../WEB-INF/classes/LocalStrings_zh_CN.properties  |  6 ++
 5 files changed, 32 insertions(+), 6 deletions(-)

diff --git 
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
 
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
index d3f44fb..1dc5bc7 100644
--- 
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
+++ 
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
@@ -47,6 +47,7 @@ 
nonBlockingCoordinator.processCoordinationMessage.failed=处理协调消息时
 
 staticMembershipInterceptor.no.failureDetector=没有TcpFailureDetector。 
自动检测静态成员无法正常工作。 通过在TcpFailureDetector下定义StaticMembershipInterceptor，可以自动检测静态成员。
 
staticMembershipInterceptor.no.pingInterceptor=在没有TcpPingInterceptor的情况下，静态成员的健康检查不会正常工作。只有定义了TcpPingInterceptor，才能使健康检查正常进行。
+staticMembershipInterceptor.sendLocalMember.failed=本地成员通知失败
 staticMembershipInterceptor.sendShutdown.failed=关闭通知失败。
 
 tcpFailureDetector.failureDetection.failed=无法进行失败监测，假定成员宕机。[{0}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties 
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index 2b6c38e..0a92c63 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -80,15 +80,28 @@ jsp.error.noFunction=无法使用指定的前缀找到函数[{0}]
 jsp.error.not.in.template=在模板文本体中, [{0}] 是不允许的.
 jsp.error.outputfolder=无输出目录
 jsp.error.overflow=错误：JSP缓冲区溢出
+jsp.error.page.conflict.autoflush=页面指令：“ autoFlush”非法多次出现不同值（旧值: [{0}], 新值: 
[{1}]）
+jsp.error.page.conflict.buffer=页面指令：“ buffer”非法多次出现不同值（旧值: [{0}], 新值: [{1}]）
 
jsp.error.page.conflict.contenttype=Page指令：非法出现多次出现的''contentType''具有不同的值（old：[{0}]，new：[{1}]）
+jsp.error.page.conflict.deferredsyntaxallowedasliteral=页面指令：“ 
deferredSyntaxAllowedAsLiteral”非法多次出现不同值（旧值: [{0}], 新值: [{1}]）
 jsp.error.page.conflict.errorpage=页指令：不同值的多次出现“errorPage”的非法值（旧:[{0}],新:[{1}]）
-jsp.error.page.conflict.language=页指令：多次出现不同值的“语言”(旧：[{0}]，新：[{1}])
-jsp.error.page.conflict.session=Page指令：多次出现具有不同值的''session''非法（old：[{0}]，new：[{1}]）
+jsp.error.page.conflict.extends=页面指令：“ extends”非法多次出现不同值（旧值: [{0}], 新值: [{1}]）
+jsp.error.page.conflict.info=页面指令：“ info”非法多次出现不同值（旧值: [{0}], 新值: [{1}]）
+jsp.error.page.conflict.iselignored=页面指令：“ isELIgnored”非法多次出现不同值（旧值: [{0}], 
新值: [{1}]）
+jsp.error.page.conflict.iserrorpage=页面指令：“ isErrorPage”非法多次出现不同值（旧值: [{0}], 
新值: [{1}]）
+jsp.error.page.conflict.isthreadsafe=页面指令：“ isThreadSafe”非法多次出现不同值（旧值: [{0}], 
新值: [{1}]）
+jsp.error.page.conflict.language=页面指令：“ language” 非法多次出现不同值（ 旧值：[{0}]，新值：[{1}] 
）
+jsp.error.page.conflict.session=页面指令：“session” 非法多次出现不同值（ 旧值：[{0}]，新值：[{1}] ）
 
jsp.error.page.conflict.trimdirectivewhitespaces=页面指令：违法出现多个有不同的值（旧值：[{0}]，新值：[{1}]）的''trimDirectiveWhitespaces''
-jsp.error.page.invalid.deferredsyntaxallowedasliteral=页面指令：deferredSyntaxAllowedAsLiteral的值无效
-jsp.error.page.invalid.import=网页指令：无效引用
-jsp.error.page.invalid.iselignored=页面指令：忽略的无效值
-jsp.error.page.invalid.session=页面提示：session值无效
+jsp.error.page.invalid.buffer=页面指令：buffer 值无效
+jsp.error.page.invalid.deferredsyntaxallowedasliteral=页面指令：deferredSyntaxAllowedAsLiteral的
 值无效
+jsp.error.page.invalid.import=页面指令：import 值无效
+jsp.error.page.invalid.iselignored=页面指令：isELIgnored 值无效
+jsp.error.page.invalid.iserrorpage=页面指令：isErrorPage 值无效
+jsp.error.page.invalid.isthreadsafe=页面指令：isThreadSafe 值无效
+jsp.error.page.invalid.session=页面指令：session 值无效
+jsp.error.page.invalid.trimdirectivewhitespaces=页面指令：trimDirectiveWhitespaces 
值无效
+jsp.error.page.language.nonjava=页面指令：language 属性无效
 jsp.error.page.multi.pageencoding=页指令不能有多次出现的页编码
 jsp.error.page.noSession=无法访问不参与任何会话的页中的会话作用域
 jsp.error.page.nullThrowable=空异常
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties 
b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
index 59340f2..4fa3946 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
@@ -73,6 +73,8 @@ wsWebSocketContainer.missingAnnotation=无法使用POJO类[{0}]，因为它未
 wsWebSocketContainer.missingLocationHeader=处理HTTP响应码 [{0}] 失败。响应头缺少Location
 wsWebSocketContainer.missingWWWAuthenticateHeader=无法处理HTTP响应代码[{0}]。 
缺少WWW-Authenticate标头作为响应
 wsWebSocketContainer.pathNoHost=URI中未指定主机

[tomcat] branch master updated (2e69b8b -> 44e1d59)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 2e69b8b  Parameterize localization string to ease Java EE / Jakarta EE 
re-use
 new 929cd8c  Expand coverage of French translations (remm)
 new 44e1d59  Expand Chinese translations. Contribution by BoltzmannWxd.

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:
 .../interceptors/LocalStrings_zh_CN.properties |  1 +
 .../webresources/LocalStrings_fr.properties|  2 ++
 .../jasper/resources/LocalStrings_zh_CN.properties | 25 --
 .../tomcat/websocket/LocalStrings_fr.properties|  1 +
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  2 ++
 webapps/docs/changelog.xml |  8 +++
 .../WEB-INF/classes/LocalStrings_zh_CN.properties  |  6 ++
 7 files changed, 39 insertions(+), 6 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/02: Expand coverage of French translations (remm)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 929cd8cc0b1caf69ebaf8579d25f88d47de1f41c
Author: Mark Thomas 
AuthorDate: Thu Feb 6 11:17:54 2020 +

Expand coverage of French translations (remm)
---
 java/org/apache/catalina/webresources/LocalStrings_fr.properties | 2 ++
 java/org/apache/tomcat/websocket/LocalStrings_fr.properties  | 1 +
 webapps/docs/changelog.xml   | 4 
 3 files changed, 7 insertions(+)

diff --git a/java/org/apache/catalina/webresources/LocalStrings_fr.properties 
b/java/org/apache/catalina/webresources/LocalStrings_fr.properties
index 9939f5a..4ecf78c 100644
--- a/java/org/apache/catalina/webresources/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings_fr.properties
@@ -25,6 +25,8 @@ cache.backgroundEvictFail=Le processus d''arrière plan 
d''éviction du cache n'
 cache.objectMaxSizeTooBig=La valeur [{0}]kB pour l''objectMaxSize est plus 
grade que la limite de maxSize/20 son elle a été réduite à [{1}]kB\n
 cache.objectMaxSizeTooBigBytes=La valeur de taille d''objet maximale pouvant 
être mis en cache de [{0}]kB est supérieure à Integer.MAX_VALUE qui est le 
maximum, la limite a donc été fixée à Integer.MAX_VALUE octets
 
+cachedResource.invalidURL=La création d''une instance de 
CachedResourceURLStreamHandler a échouée car l''URL [{0}] est malformée
+
 classpathUrlStreamHandler.notFound=Impossible de charger la ressource [{0}] en 
utilisant le chargeur de classe de contexte du thread ou celui de la classe 
actuelle
 
 dirResourceSet.manifestFail=Impossible de lire le manifeste depuis [{0}]
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties 
b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
index 33a2f9e..efb8941 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
@@ -35,6 +35,7 @@ caseInsensitiveKeyMap.nullKey=Les clés nulles ne sont pas 
admises
 
 futureToSendHandler.timeout=Le délai d''attente de l''opération est dépassé 
après avoir attendu [{0}] [{1}] pour qu''elle se termine
 
+perMessageDeflate.alreadyClosed=Le transformateur a été fermé et ne peut plus 
être utilisé
 perMessageDeflate.deflateFailed=Impossible de décompresser une trame WebSocket 
compressée
 perMessageDeflate.duplicateParameter=Double définition pour le paramètre 
d''extension [{0}]
 perMessageDeflate.invalidState=Etat invalide
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c6b7b2c..9b59298 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -59,6 +59,10 @@
 Update implementated specification version information in a few places
 where it has not been updated for Jakarta EE 9. (markt)
   
+  
+Expand the coverage of the French translations provided with Apache
+Tomcat. (remm)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 10.0.0.0-M1

[Konstantin Kolinko]

ср, 5 февр. 2020 г. в 22:22, Mark Thomas :
>
> The proposed Apache Tomcat 10.0.0.0-M1 release is now available for
> voting. This is the first release of 10.0.0.x and is based on 9.0.31.

It is odd to see 4 numbers in "10.0.0.0" instead of the usual 3
"10.0.0", "10.0.x".

Was it intended?

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Parameterize localization string to ease Java EE / Jakarta EE re-use

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 2e69b8b  Parameterize localization string to ease Java EE / Jakarta EE 
re-use
2e69b8b is described below

commit 2e69b8b9edb218ab77214a9789b0d8d1aae7b98f
Author: Mark Thomas 
AuthorDate: Thu Feb 6 11:04:04 2020 +

Parameterize localization string to ease Java EE / Jakarta EE re-use
---
 java/org/apache/jasper/compiler/TagFileProcessor.java   | 3 ++-
 java/org/apache/jasper/resources/LocalStrings.properties| 2 +-
 java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_fr.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ja.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ko.properties | 2 +-
 webapps/docs/changelog.xml  | 4 ++--
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/jasper/compiler/TagFileProcessor.java 
b/java/org/apache/jasper/compiler/TagFileProcessor.java
index af1ed91..c91b2aa 100644
--- a/java/org/apache/jasper/compiler/TagFileProcessor.java
+++ b/java/org/apache/jasper/compiler/TagFileProcessor.java
@@ -25,6 +25,7 @@ import java.util.Vector;
 
 import jakarta.el.MethodExpression;
 import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.tagext.JspFragment;
 import jakarta.servlet.jsp.tagext.TagAttributeInfo;
 import jakarta.servlet.jsp.tagext.TagFileInfo;
 import jakarta.servlet.jsp.tagext.TagInfo;
@@ -252,7 +253,7 @@ class TagFileProcessor {
 // type is fixed to "JspFragment" and a translation error
 // must occur if specified.
 if (type != null) {
-err.jspError(n, "jsp.error.fragmentwithtype");
+err.jspError(n, "jsp.error.fragmentwithtype", 
JspFragment.class.getName());
 }
 // rtexprvalue is fixed to "true" and a translation error
 // must occur if specified.
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index a63e77c..17a0ace 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -76,7 +76,7 @@ jsp.error.file.already.registered=Recursive include of file 
[{0}]
 jsp.error.file.cannot.read=Cannot read file: [{0}]
 jsp.error.file.not.found=File [{0}] not found
 jsp.error.flush=Exception occurred when flushing data
-jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' 
attributes.  If 'fragment' is present, 'type' is fixed as 
'jakarta.servlet.jsp.tagext.JspFragment'
+jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' 
attributes.  If 'fragment' is present, 'type' is fixed as '{0}'
 jsp.error.function.classnotfound=The class [{0}] specified in TLD for the 
function [{1}] cannot be found: [{2}]
 jsp.error.include.exception=Unable to include [{0}]
 jsp.error.include.tag=Invalid jsp:include tag
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties 
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 6046657..e5eb63e 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -69,7 +69,7 @@ jsp.error.file.already.registered=El archivo [{0}] ya se ha 
visto, ¿podría ser
 jsp.error.file.cannot.read=No se puede leer el archivo: [{0}]
 jsp.error.file.not.found=Archivo JSP [{0}] no encontrado
 jsp.error.flush=Excepción sucedida al vaciar los datos
-jsp.error.fragmentwithtype=No puede especificar ambos atributos 'fragment' y 
'type'. Si está presente 'fragment', 'type' se pone como 
'jakarta.servlet.jsp.tagext.JspFragment'
+jsp.error.fragmentwithtype=No puede especificar ambos atributos 'fragment' y 
'type'. Si está presente 'fragment', 'type' se pone como '{0}'
 jsp.error.function.classnotfound=La clase [{0}] especificada en el TLD para la 
función [{1}] no se puede hallar: [{2}]
 jsp.error.include.exception=No se puede incluir [{0}]
 jsp.error.include.tag=Tag jsp:include no válido
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 505c7e2..9970182 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -76,7 +76,7 @@ jsp.error.file.already.registered=Inclusion récursive du 
fichier [{0}]
 jsp.error.file.cannot.read=Impossible de lire le fichier: [{0}]
 jsp.error.file.not.found=Le fichier [{0}] n''a pas été trouvé
 jsp.error.flush=Une exception s'est produite lors de l'envoi des données
-jsp.error.fragmentwithtype=On ne peut indiquer à la fois les attributs 

[tomcat] branch master updated (51f8c1c -> 319b6c8)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 51f8c1c  Increment version for next dev cycle
 new fb51a07  Update translation import/export to handle javax -> jakarta 
migration
 new 09afab2  Parameterize JSP spec version in localization messages to 
ease re-use
 new 319b6c8  Update spec versions

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:
 BUILDING.txt |  7 ---
 RELEASE-NOTES| 10 +-
 java/org/apache/jasper/Constants.java|  2 ++
 java/org/apache/jasper/resources/LocalStrings.properties |  2 +-
 .../apache/jasper/resources/LocalStrings_es.properties   |  2 +-
 .../apache/jasper/resources/LocalStrings_fr.properties   |  2 +-
 .../apache/jasper/resources/LocalStrings_ja.properties   |  2 +-
 .../apache/jasper/resources/LocalStrings_ko.properties   |  2 +-
 java/org/apache/jasper/runtime/HttpJspBase.java  |  3 ++-
 java/org/apache/jasper/runtime/JspFactoryImpl.java   |  3 +--
 .../org/apache/tomcat/buildutil/translate/Constants.java |  3 +++
 java/org/apache/tomcat/buildutil/translate/Import.java   |  2 +-
 java/org/apache/tomcat/buildutil/translate/Utils.java|  3 +++
 webapps/docs/changelog.xml   | 16 
 14 files changed, 42 insertions(+), 17 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/03: Update translation import/export to handle javax -> jakarta migration

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit fb51a0780522e3a2f011fcdff883b8819447fe53
Author: Mark Thomas 
AuthorDate: Thu Feb 6 09:36:32 2020 +

Update translation import/export to handle javax -> jakarta migration
---
 java/org/apache/tomcat/buildutil/translate/Constants.java | 3 +++
 java/org/apache/tomcat/buildutil/translate/Import.java| 2 +-
 java/org/apache/tomcat/buildutil/translate/Utils.java | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/buildutil/translate/Constants.java 
b/java/org/apache/tomcat/buildutil/translate/Constants.java
index 403daa6..c4c4a5a 100644
--- a/java/org/apache/tomcat/buildutil/translate/Constants.java
+++ b/java/org/apache/tomcat/buildutil/translate/Constants.java
@@ -26,4 +26,7 @@ public class Constants {
 public static final String STORAGE_DIR = ".settings/translations";
 
 public static final String END_PACKAGE_MARKER = ".zzz.";
+
+public static final String JAVA_EE_SUBSTRING = "java.javax";
+public static final String JAKARTA_EE_SUBSTRING = "java.jakarta";
 }
diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java 
b/java/org/apache/tomcat/buildutil/translate/Import.java
index 4cf6fec..bdffd73 100644
--- a/java/org/apache/tomcat/buildutil/translate/Import.java
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -124,7 +124,7 @@ public class Import {
 
 public CompositeKey(String in) {
 int posPkg = in.indexOf(Constants.END_PACKAGE_MARKER);
-pkg = in.substring(0, posPkg);
+pkg = in.substring(0, posPkg).replace(Constants.JAVA_EE_SUBSTRING, 
Constants.JAKARTA_EE_SUBSTRING);
 key = in.substring(posPkg + Constants.END_PACKAGE_MARKER.length());
 int posGroup = key.indexOf('.');
 if (posGroup == -1) {
diff --git a/java/org/apache/tomcat/buildutil/translate/Utils.java 
b/java/org/apache/tomcat/buildutil/translate/Utils.java
index 5eb015f..e7f7795 100644
--- a/java/org/apache/tomcat/buildutil/translate/Utils.java
+++ b/java/org/apache/tomcat/buildutil/translate/Utils.java
@@ -129,6 +129,9 @@ public class Utils {
 prefix = prefix.substring(root.getCanonicalPath().length() + 1);
 prefix = prefix.replace(File.separatorChar, '.');
 prefix = prefix + Constants.END_PACKAGE_MARKER;
+// POEditor uses javax package names.
+// Renaming here is less work than renaming terms in POEditor
+prefix = prefix.replace(Constants.JAKARTA_EE_SUBSTRING, 
Constants.JAVA_EE_SUBSTRING);
 return prefix;
 }
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 03/03: Update spec versions

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 319b6c8e23e034da5e2cf90a8bfb54ef70572f2f
Author: Mark Thomas 
AuthorDate: Thu Feb 6 10:05:54 2020 +

Update spec versions
---
 BUILDING.txt   |  7 ---
 RELEASE-NOTES  | 10 +-
 webapps/docs/changelog.xml |  8 
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index f8695fb..a8d31a6 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -19,9 +19,10 @@
 Building The Apache Tomcat @VERSION_MAJOR_MINOR@ Servlet/JSP 
Container
 
 
-This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a 
container that
-implements the Servlet 4.0, JSP 2.3, EL 3.0, WebSocket 1.1 and JASPIC 1.1
-specifications from the Java Community Process .
+This project contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a 
container that
+implements the Jakarta Servlet 5.0, JSP 3.0, EL 4.0, WebSocket 2.0 and
+Authentication 2.0 specifications from the Jakarta EE project at Eclipse
+.
 
 Note: If you just need to run Apache Tomcat, it is not necessary to build
 it. You may simply download a binary distribution. It is cross-platform.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c4e88e1..ae7072f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -74,19 +74,19 @@ for use by web applications (by placing them in "lib"):
 * catalina-storeconfig.jar (Generation of XML configuration from current state)
 * catalina-tribes.jar (Group communication)
 * ecj-@JDT_VERSION@.jar (Eclipse JDT Java compiler)
-* el-api.jar (EL 3.0 API)
+* el-api.jar (EL 4.0 API)
 * jasper.jar (Jasper 2 Compiler and Runtime)
 * jasper-el.jar (Jasper 2 EL implementation)
-* jsp-api.jar (JSP 2.3 API)
-* servlet-api.jar (Servlet 4.0 API)
+* jsp-api.jar (JSP 3.0 API)
+* servlet-api.jar (Servlet 5.0 API)
 * tomcat-api.jar (Interfaces shared by Catalina and Jasper)
 * tomcat-coyote.jar (Tomcat connectors and utility classes)
 * tomcat-dbcp.jar (package renamed database connection pool based on Commons 
DBCP 2)
 * tomcat-jdbc.jar (Tomcat's database connection pooling solution)
 * tomcat-jni.jar (Interface to the native component of the APR/native 
connector)
 * tomcat-util.jar (Various utilities)
-* tomcat-websocket.jar (WebSocket 1.1 implementation)
-* websocket-api.jar (WebSocket 1.1 API)
+* tomcat-websocket.jar (WebSocket 2.0 implementation)
+* websocket-api.jar (WebSocket 2.0 API)
 
 You can make additional APIs available to all of your web applications by
 putting unpacked classes into a "classes" directory (not created by default),
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5fd3a3b..6771063 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -53,6 +53,14 @@
   
 
   
+  
+
+  
+Update implementated specification version information in a few places
+where it has not been updated for Jakarta EE 9. (markt)
+  
+
+  
 
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/03: Parameterize JSP spec version in localization messages to ease re-use

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 09afab24d6a6a223ff1bf4eb4876f9003f9e6364
Author: Mark Thomas 
AuthorDate: Thu Feb 6 10:01:47 2020 +

Parameterize JSP spec version in localization messages to ease re-use
---
 java/org/apache/jasper/Constants.java   | 2 ++
 java/org/apache/jasper/resources/LocalStrings.properties| 2 +-
 java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_fr.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ja.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ko.properties | 2 +-
 java/org/apache/jasper/runtime/HttpJspBase.java | 3 ++-
 java/org/apache/jasper/runtime/JspFactoryImpl.java  | 3 +--
 webapps/docs/changelog.xml  | 8 
 9 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/jasper/Constants.java 
b/java/org/apache/jasper/Constants.java
index 73e3bf2..43730f6 100644
--- a/java/org/apache/jasper/Constants.java
+++ b/java/org/apache/jasper/Constants.java
@@ -30,6 +30,8 @@ import java.util.List;
  */
 public class Constants {
 
+public static final String SPEC_VERSION = "3.0";
+
 /**
  * The base class of the generated servlets.
  */
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index e7a4e4d..a63e77c 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=According to TLD, tag [{0}] must be 
empty, but is not
 
-jsp.engine.info=Jasper JSP 3.0 Engine
+jsp.engine.info=Jasper JSP {0} Engine
 jsp.error.URLMustStartWithSlash=Path [{0}] must start with a slash character
 jsp.error.action.isnottagfile=[{0}] action can be used in tag files only
 jsp.error.action.istagfile=[{0}] action cannot be used in a tag file
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties 
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index b71e975..6046657 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=Según el TLD, el tag [{0}] debe de 
estar vacío, pero no lo está
 
-jsp.engine.info=Motor Jasper JSP 3.0
+jsp.engine.info=Motor Jasper JSP {0}
 jsp.error.action.isnottagfile=La acción [{0}] sólo se puede usar en archivos 
tag
 jsp.error.action.istagfile=La acción [{0}] no se puede usar en un archivo tag
 jsp.error.attempt_to_clear_flushed_buffer=Error: Se ha intentado limpiar un 
buffer que ya había sido escrito
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index e3e0812..505c7e2 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=D''après la TLD, le tag [{0}] doit être 
vide, mais ne l''est pas
 
-jsp.engine.info=Moteur Jasper JSP 3.0
+jsp.engine.info=Moteur Jasper JSP {0}
 jsp.error.URLMustStartWithSlash=Le chemin [{0}] doit commencer par un 
caractère slash
 jsp.error.action.isnottagfile=L''action [{0}] ne peut être utilisée que dans 
un fichier tag
 jsp.error.action.istagfile=L''action [{0}] ne peut être utilisée dans un 
fichier tag
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties 
b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index f47a2de..bb3f8bc 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=TLDに従ってタグ [{0}] は空でなければいけませんが、そうではありません
 
-jsp.engine.info=Jasper JSP 3.0エンジン
+jsp.engine.info=Jasper JSP {0}エンジン
 jsp.error.URLMustStartWithSlash=パス[{0}]はスラッシュ文字で始まる必要があります。
 jsp.error.action.isnottagfile=[{0}] アクションはタグファイル中でのみ使用できません
 jsp.error.action.istagfile=[{0}] アクションはタグファイル中で使用できません
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties 
b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index 5cf8e16..96ccab6 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=TLD 파일에 따르면, [{0}] 태그는 반드시 비어 있어야 하는데, 
그렇지 않습니다,
 
-jsp.engine.info=Jasper JSP 3.0 엔진
+jsp.engine.info=Jasper JSP {0} 엔진
 jsp.error.URLMustStartWithSlash=경로 [{0}]은(는) 반드시 슬래시 문자로 시작해야 합니다.
 jsp.error.action.isnottagfile=[{0}] 액션은 오직 태그 파일들 내에서만 사용될 수 있습니다.
 jsp.error.action.istagfile=[{0}] 액션은 태그 

[CONF] Apache Tomcat > Debugging

[Konstantin Kolinko (Confluence)]

Title: Message Title



 
 
 
There's 1 new edit on this page 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Debugging 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Konstantin Kolinko edited this page 
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Here's the version comment 
 
 
 
 
 
 
 
 
 
 
 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Konstantin Kolinko edited at 10:26 AM 
 
 
  
 
 

 
 
 
 
 
 
 
 
 Link to existing pages on the same topic. The text was moved to the "Troubleshooting" page.  
 
 
  
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Here's what changed: 
 
 
 
 
 
 
 
 
 
 
  Too many open file descriptors   Identify the code that opens the descriptors using a tool such as http://file-leak-detector.kohsuke.org/See the following FAQ pages:  
 
 Troubleshooting and Diagnostics  
 Developing → Debugging  
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Go to page history 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
View page 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 7.1.2  
 
 
  
 
 
 
 
 
 
 
 
 

[CONF] Apache Tomcat > Troubleshooting and Diagnostics

[Konstantin Kolinko (Confluence)]

Title: Message Title



 
 
 
There's 1 new edit on this page 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Troubleshooting and Diagnostics 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Konstantin Kolinko edited this page 
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Here's the version comment 
 
 
 
 
 
 
 
 
 
 
 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Konstantin Kolinko edited at 10:21 AM 
 
 
  
 
 

 
 
 
 
 
 
 
 
 Add an item about "File leak detector" (moving it from a top-level "Debugging" page)  
 
 
  
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Here's what changed: 
 
 
 
 
 
 
 
 
 
 
 ... 
 
 How To: Capture a thread dump  
 How To: Capture a heap dump  
 How To: Examine a Stacktrace  
 How To: Configure Tomcat for debugging  
 FAQ: Developing  
 FAQ: Memory  
 Tomcat Memory Leak Protection  
 Notes on using JMX clients  
 Tools JMX Clients 
 
JJConsole: Documentation  
VisualVM: Documentation, Project  
 ... Accessing response objects after their lifetime can lead to security issues in your application, such as sending responses to wrong clients, mixing up responses. If you can reproduce the issue and the above diagnostic does not show your own bug, but a bug in Apache Tomcat, if the problem manifests as a security issue, see how to report it.  Troubleshooting "Too many open file descriptors"   The code that opens the descriptors can be identified using a tool such as http://file-leak-detector.kohsuke.org/   
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Go to page history 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
View page 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 7.1.2  
 
 
  
 
 
 
 
 
 
 
 
 

[tomcat-jakartaee-migration] branch master updated: Clarify

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new c18e6ba  Clarify
c18e6ba is described below

commit c18e6ba28492a75fee737a92566c7c3925b9a137
Author: remm 
AuthorDate: Thu Feb 6 11:09:58 2020 +0100

Clarify
---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 279e283..9f6717e 100644
--- a/README.md
+++ b/README.md
@@ -18,8 +18,9 @@ Build the migration tool with:
 
 Migrate your Servlet application with:
 
-java -cp target/jakartaee-migration-*-shaded.jar 
org.apache.tomcat.jakartaee.Migration /path/to/my-javax.war my-jakarta.war
+java -jar target/jakartaee-migration-*-shaded.jar  
 
+The source should be a path to a compressed archive, a folder or an individual 
file. The destination will be created at the specified path as a resource of 
the same type as the source.
 
 ## Differences between Java EE 8 and Jakarta EE 9
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat-jakartaee-migration] branch master updated: Remove `` quotes. There is no need of them in Markdown

[mgrigorov]

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 711425f  Remove `` quotes. There is no need of them in Markdown
711425f is described below

commit 711425ff35f37e04cbd2a3e5f631923a8627af02
Author: Martin Tzvetanov Grigorov 
AuthorDate: Thu Feb 6 11:59:36 2020 +0200

Remove `` quotes. There is no need of them in Markdown
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index dc17576..279e283 100644
--- a/README.md
+++ b/README.md
@@ -12,13 +12,13 @@ The aim of the tool is to take a web application written 
for Java EE 8 that runs
 
 Build the migration tool with:
 
-`mvn verify`
+mvn verify
 
 ### Migrate
 
 Migrate your Servlet application with:
 
-`java -cp target/jakartaee-migration-*-shaded.jar 
org.apache.tomcat.jakartaee.Migration /path/to/my-javax.war my-jakarta.war`
+java -cp target/jakartaee-migration-*-shaded.jar 
org.apache.tomcat.jakartaee.Migration /path/to/my-javax.war my-jakarta.war
 
 
 ## Differences between Java EE 8 and Jakarta EE 9


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat-jakartaee-migration] branch master updated: Add Usage to the README

[mgrigorov]

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 4291ffe  Add Usage to the README
4291ffe is described below

commit 4291ffe79f9040407bbbdc83a32ae991881219f4
Author: Martin Tzvetanov Grigorov 
AuthorDate: Thu Feb 6 11:55:51 2020 +0200

Add Usage to the README
---
 README.md | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/README.md b/README.md
index 334d031..dc17576 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,21 @@ This tool is a work in progress.
 
 The aim of the tool is to take a web application written for Java EE 8 that 
runs on Apache Tomcat 9 and convert it automatically so it runs on Apache 
Tomcat 10 which implements Jakarta EE 9.
 
+## Usage
+
+### Build
+
+Build the migration tool with:
+
+`mvn verify`
+
+### Migrate
+
+Migrate your Servlet application with:
+
+`java -cp target/jakartaee-migration-*-shaded.jar 
org.apache.tomcat.jakartaee.Migration /path/to/my-javax.war my-jakarta.war`
+
+
 ## Differences between Java EE 8 and Jakarta EE 9
 
 Jakarta EE 9 is still under development and there are some details that remain 
to be worked out.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 10.0.0.0-M1

[Martin Grigorov]

On Wed, Feb 5, 2020 at 9:22 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 10.0.0.0-M1 release is now available for
> voting. This is the first release of 10.0.0.x and is based on 9.0.31.
>
> The major changes compared to 9.0.31  are:
>
> - Complete the javax to jakarta package rename
>
> - Remove duplication of configuration between HTTP/1.1 and HTTP/2.
>   HTTP/2 will now inherit values from HTTP/1.1.
>
> - Remove deprecated code
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat10/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.0.0-M1/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1244/
> The tag is:
> https://github.com/apache/tomcat/tree/10.0.0.0-M1
> 9797ba13e0e554c3b8e990f2dc4f846d2bdccf6d
>
> The proposed 10.0.0.0-M1 release is:
> [ ] Broken - do not release
> [ X ] Alpha  - go ahead and release as 10.0.0.0-M1
>

Tested migrated Apache Wicket examples on both amd64 and arm64
architectures!

Regards,
Martin


> I opted to only include alpha here as there are still some potentially
> significant changes on the TOMCAT-NEXT list.
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: [VOTE] Release Apache Tomcat 10.0.0.0-M1

[Romain Manni-Bucau]

+1 (non binding)

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | Book



Le jeu. 6 févr. 2020 à 09:58, Martin Grigorov  a
écrit :

> Hi,
>
> I have a question about
> https://github.com/apache/tomcat-jakartaee-migration
> 
>  tool:
> How is it supposed to be used ?
> It's README does not explain this.
>
> I've found
> https://github.com/apache/tomcat-jakartaee-migration/blob/master/src/main/scripts/migrate.sh
>  and
> from it I've figured:
>
> java -cp target/jakartaee-migration-0.0.2-SNAPSHOT-shaded.jar
> org.apache.tomcat.jakartaee.Migration
> ~/devel/apache-tomcat-10.0.0.0-M1/webapps/we.war we.war
>
> but it fails with NPE:
>
> Feb 06, 2020 10:56:35 AM org.apache.tomcat.jakartaee.Migration execute
> INFO: Performing migration from source
> [/home/martin/devel/apache-tomcat-10.0.0.0-M1/webapps/we.war] to
> destination [/home/martin/git/apache/tomcat-jakartaee-migration/we.war]
> Exception in thread "main" java.lang.NullPointerException
> at org.apache.tomcat.jakartaee.Migration.execute(Migration.java:87)
> at org.apache.tomcat.jakartaee.Migration.main(Migration.java:198)
>
> Martin
>
>
> On Wed, Feb 5, 2020 at 9:22 PM Mark Thomas  wrote:
>
>> The proposed Apache Tomcat 10.0.0.0-M1 release is now available for
>> voting. This is the first release of 10.0.0.x and is based on 9.0.31.
>>
>> The major changes compared to 9.0.31  are:
>>
>> - Complete the javax to jakarta package rename
>>
>> - Remove duplication of configuration between HTTP/1.1 and HTTP/2.
>>   HTTP/2 will now inherit values from HTTP/1.1.
>>
>> - Remove deprecated code
>>
>> Along with lots of other bug fixes and improvements.
>>
>> For full details, see the changelog:
>> https://ci.apache.org/projects/tomcat/tomcat10/docs/changelog.html
>>
>> It can be obtained from:
>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.0.0-M1/
>> The Maven staging repo is:
>> https://repository.apache.org/content/repositories/orgapachetomcat-1244/
>> The tag is:
>> https://github.com/apache/tomcat/tree/10.0.0.0-M1
>> 9797ba13e0e554c3b8e990f2dc4f846d2bdccf6d
>>
>> The proposed 10.0.0.0-M1 release is:
>> [ ] Broken - do not release
>> [ ] Alpha  - go ahead and release as 10.0.0.0-M1
>>
>> I opted to only include alpha here as there are still some potentially
>> significant changes on the TOMCAT-NEXT list.
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>

Re: Migration tool usage

[Martin Grigorov]

On Thu, Feb 6, 2020 at 11:24 AM Rémy Maucherat  wrote:

> On Thu, Feb 6, 2020 at 10:13 AM Mark Thomas  wrote:
>
>> > but it fails with NPE:
>>
>> It is expecting a full path to the destination. And you probably want a
>> different file for the destination as well.
>>
>
> I assumed too much from the getParentFile API, so it's fixed now.
>

Thanks!
It is fixed indeed!

Wicket examples are running fine on Tomcat 10!


>
>>
>> There is lots of scope to improve both the handling and documentation of
>> input parameters. It is a Tomcat utility rather than a personal project
>> now so feel free to dive and and improve things.
>>
>
I will update the README with "Usage".

My destination was different than the source. I was executing the tool from
a different folder.


>
> Rémy
>

Re: Migration tool usage

[Rémy Maucherat]

On Thu, Feb 6, 2020 at 10:13 AM Mark Thomas  wrote:

> > but it fails with NPE:
>
> It is expecting a full path to the destination. And you probably want a
> different file for the destination as well.
>

I assumed too much from the getParentFile API, so it's fixed now.


>
> There is lots of scope to improve both the handling and documentation of
> input parameters. It is a Tomcat utility rather than a personal project
> now so feel free to dive and and improve things.
>

Rémy

[tomcat-jakartaee-migration] branch master updated: Fix getParentFile use

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 3bf999d  Fix getParentFile use
3bf999d is described below

commit 3bf999de4418294b96b68d17cee641b486ad39bf
Author: remm 
AuthorDate: Thu Feb 6 10:16:34 2020 +0100

Fix getParentFile use
---
 src/main/java/org/apache/tomcat/jakartaee/Migration.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java 
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index 9870a82..04e073a 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -83,7 +83,7 @@ public class Migration {
 }
 } else {
 // Single file
-File parentDestination = destination.getParentFile();
+File parentDestination = 
destination.getAbsoluteFile().getParentFile();
 if (parentDestination.exists() || parentDestination.mkdirs()) {
 result = result && migrateFile(source, destination);
 } else {


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Migration tool usage

[Mark Thomas]

On 06/02/2020 08:58, Martin Grigorov wrote:
> Hi,
> 
> I have a question
> about https://github.com/apache/tomcat-jakartaee-migration
> 
>  tool:

I've changed to subject line to reflect this.

> How is it supposed to be used ?
> It's README does not explain this.
> 
> I've
> found 
> https://github.com/apache/tomcat-jakartaee-migration/blob/master/src/main/scripts/migrate.sh
>  and
> from it I've figured:
> 
> java -cp target/jakartaee-migration-0.0.2-SNAPSHOT-shaded.jar
> org.apache.tomcat.jakartaee.Migration
> ~/devel/apache-tomcat-10.0.0.0-M1/webapps/we.war we.war
> 
> but it fails with NPE:

It is expecting a full path to the destination. And you probably want a
different file for the destination as well.

There is lots of scope to improve both the handling and documentation of
input parameters. It is a Tomcat utility rather than a personal project
now so feel free to dive and and improve things.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 10.0.0.0-M1

[Martin Grigorov]

Hi,

I have a question about https://github.com/apache/tomcat-jakartaee-migration

tool:
How is it supposed to be used ?
It's README does not explain this.

I've found
https://github.com/apache/tomcat-jakartaee-migration/blob/master/src/main/scripts/migrate.sh
and
from it I've figured:

java -cp target/jakartaee-migration-0.0.2-SNAPSHOT-shaded.jar
org.apache.tomcat.jakartaee.Migration
~/devel/apache-tomcat-10.0.0.0-M1/webapps/we.war we.war

but it fails with NPE:

Feb 06, 2020 10:56:35 AM org.apache.tomcat.jakartaee.Migration execute
INFO: Performing migration from source
[/home/martin/devel/apache-tomcat-10.0.0.0-M1/webapps/we.war] to
destination [/home/martin/git/apache/tomcat-jakartaee-migration/we.war]
Exception in thread "main" java.lang.NullPointerException
at org.apache.tomcat.jakartaee.Migration.execute(Migration.java:87)
at org.apache.tomcat.jakartaee.Migration.main(Migration.java:198)

Martin


On Wed, Feb 5, 2020 at 9:22 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 10.0.0.0-M1 release is now available for
> voting. This is the first release of 10.0.0.x and is based on 9.0.31.
>
> The major changes compared to 9.0.31  are:
>
> - Complete the javax to jakarta package rename
>
> - Remove duplication of configuration between HTTP/1.1 and HTTP/2.
>   HTTP/2 will now inherit values from HTTP/1.1.
>
> - Remove deprecated code
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat10/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.0.0-M1/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1244/
> The tag is:
> https://github.com/apache/tomcat/tree/10.0.0.0-M1
> 9797ba13e0e554c3b8e990f2dc4f846d2bdccf6d
>
> The proposed 10.0.0.0-M1 release is:
> [ ] Broken - do not release
> [ ] Alpha  - go ahead and release as 10.0.0.0-M1
>
> I opted to only include alpha here as there are still some potentially
> significant changes on the TOMCAT-NEXT list.
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>