Re: Tomcat Connectors - time for 1.2.24

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 2/11/20 9:39 AM, Mark Thomas wrote:
> The Tomcat Connectors (mod_jk, ISAPI DLL) are probably over due a 
> release so I plan to start this process later this week.

Shall we add a warning parallel to the recent one(s) added to the AJP
connectors[1]? I wouldn't advocate a failure like we have in Tomcat,
but perhaps a WARN message if there is no "secret" defined and maybe
add a configuration option to disable the warning?

- -chris

https://gitbox.apache.org/repos/asf?p=tomcat.git;a=commit;h=a41145cc0c56
4a7f5feff9ac4263a46ba8c0f4e7
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl5C1Y8ACgkQHPApP6U8
pFg9qw/7B6SycRpj5cP/PxnpEThz07hlFQtjZfHjVE95FU8zG5cau1+iL2xwrcIQ
WesSYobq9vfu3t5wGZ1r/lkmYD7wzNS64EkLJAdoggamJG6CnKqGPrCT5NodA4iM
dNxACiq+2DrvpYc+eAVJMCJbep0L9LkX/cD7aMOycD91U49Q3xQs9Nd1CJi+h4OF
sz9NxcJhj6YKTOGbdEJS/MG7aSrphkFlzgl6nSJO0JgjYJH4f5FctCatBpIiF2O2
amsNccdOiDRpiWxWSDvGhytEYf61Iow0LHKmRkPz+4GaYNmmxCcyvveoyhO6bM3/
ZZSe1c8dFC2GvyK7yiRGMrY4o8mNbrJ1R4sB8e71n0nv4LC1dCZmXp/m2wy5klsl
6b1L20tB6EE+DnHSMb9DQBmqtaEy4nblGbDzCxkXfC3zCuI+5qGTubVtQRGjm88F
2ymUUoMbzXVZophKaOhNxAsh32XEmSjCNXFX4IUTxUQByJ/8xjDsSyQouq1t0W+u
60HM0GQs6GNFVp5tC5L2EQQw+x5Ff4X6EGX9Jw7oOYeOuOgf9cUqjkxE/1OtGXqs
BgUQDbGoZNb9qho3WZl4UWcF3bgOVEAwNF8Om3Dgd73b5jc2yi5R2Rjb4dtXkt4A
k9vOYrIXUe5eus7RefIyzkuTOegkQgQ2kXC9ElGM4ldtsBA1toA=
=iz4Y
-END PGP SIGNATURE-

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

Re: UTF-8 properties files and BOMs

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 2/11/20 9:47 AM, Mark Thomas wrote:
> On 11/02/2020 14:26, Christopher Schultz wrote:
> 

>> This appears to be a bug in (at least old versions of) Java
>> and/or native2ascii. I've got local installations of Java 8, 11
>> (Adopt), 11 (Oracle), and 13 (OpenJDK), and only Java 8 has a
>> "native2ascii" binary present. I see ant's  task
>> has its own implementation, but it's probably very simple, just
>> like the native2ascii program itself. Java's Reader classes
>> incorrectly interpret the BOM as an actual character instead of
>> an ignorable UTF-8 control sequence.
> 
> But the chances of us being able to "fix" the Ant implementation
> are considerably higher :).

Fair enough. ant handles this completely, so I'm happy to file a bug
against it. It would, unfortunately, cause an incompatibility between
 and Java's (legacy) native2ascii program. The ant team
might reject the request. I guess that's no worse than the current
situation :)

>> Ensuring that the first line of the file is a comment or a blank
>> line fixes things:
>> 
>> # BOM first.property=foo second.property=bar
>> 
>> becomes:
>> 
>> \ufeff# BOM first.property=foo second.property=bar
> 
> Does the BOM end up creating an additional property in this case?

Probably, but who cares? Code is unlikely to do:

bundle.getProperty([UTf-8 bom])

And get confused by what comes out.

>>> Overall, I guess I am -0 on adding BOMs.
>> 
>> Okay. This is a fairly recent change to Tomcat, and frankly, we
>> (a) don't get a huge number of outside contributions which
>> include changes to the localized properties files (except for the
>> translation-only contributions, which have been great!) and (b)
>> often ignore the non-English translations in the first place
>> because we are lazy.
>> 
>> I think maybe this can stay on the back-burner until we see if we
>> end up with any problems.
> 
> Sounds reasonable to me. It looks like we have options if we need
> them but with a few minor issues to research / iron out first if we
> go that way.
> 
>> Does/can "checkstyle" check for valid UTF-8 byte sequences in 
>> .properties files? I think that may be a helpful check to add if
>> it's not already in there.
> 
> Don't know. +1 if such a thing exists.

I know nothing about Checkstyle, so I'll defer to anyone who does know
how to configure it to do these things :)

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

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl5C07kACgkQHPApP6U8
pFjsZhAAoyo8KeqHqs1ZakdexBQJ8g1YHuGKC87SG3Guw/GoMFTjsyU9sWPyAnBP
wvizChhnWD3WaWKrEI+Tp4D35v/L1ORuwquDYIqRgxras+xvjnyzWDFfrYPA1WkF
RQ5Ns4A8f/lkPAb+4Y2xKN8wLnWY/zmJ5GmJ0fibyORqlAfANgUp16hHaT4bDRDM
AqPWbODT5YBhpTRurTqejJeXGJLfBFdxbH+liZdQ8uYeaYNSEV23YPXxVq5upgMD
daZxkusaacu6Uz1F0w/6uAJJ65xo+qzeANYmJ0Hn+jfrWwtgspTPOfPct9VSpuJ7
YnBcllm8vvshjGYB/83Q/IaWdKQvJ+BhHwLatuS5gz7EaM4V3ibZiwXDyPOMEoek
XeV983OgLw7IONEjhLXqKyooqywSpy9v0gU+GmRHh7fk453gFzBm3I7FF7FtZotw
XE8OyOmyjUuw48v+NcjR0fAQ+wzgBYRlVItICY1s/OMr2dDAWcDB1jG2nlSdf2TV
HGHqZrgvtOF+/v5wGCpZAdnjeU8qqOmk/m+SJwK76nfz11e79MMCkDBjiVypet6E
/LRbGzgjoZn3lAsApaLTKbp0kVaLEJlZ2Xg/DuzBCZWyvrGTiEEVC7Hr2aMsjsQq
v4NHfogOMz5zcxyJ8nxGNTK5JHBXNp//kg9SWWUCFvf7UJRDFWg=
=svCv
-END PGP SIGNATURE-

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

[Bug 64051] mod_jk set_session_cookie not sending new cookie after node failover for sticky session

[bugzilla]

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

--- Comment #18 from Mark Thomas  ---
Correct 1.2.47 onwards.

-- 
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: Tomcat Connectors - time for 1.2.47

[Martin Knoblauch]

No Problem - I was just worried wrt. my sanity :-) Actually, you made the
same in BZ#64051

Cheers
Martin


On Tue, Feb 11, 2020 at 4:52 PM Mark Thomas  wrote:

> On 11/02/2020 15:50, Martin Knoblauch wrote:
> > Hi,
> >
> >  confused - 1.2.24 ???
>
> Sorry, 1.2.47
>
> (I was looking at Tomcat Native)
>
> Mark
>
>
> >
> > Cheers
> > Martin
> >
> > On Tue, Feb 11, 2020 at 3:39 PM Mark Thomas  > > wrote:
> >
> > Hi all,
> >
> > The Tomcat Connectors (mod_jk, ISAPI DLL) are probably over due a
> > release so I plan to start this process later this week.
> >
> > Mark
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > 
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> > 
> >
> >
> >
> > --
> > --
> > Martin Knoblauch
> > email: k n o b i AT knobisoft DOT de
> > www: http://www.knobisoft.de
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

-- 
--
Martin Knoblauch
email: k n o b i AT knobisoft DOT de
www: http://www.knobisoft.de

Re: Tomcat Connectors - time for 1.2.47

[Mark Thomas]

On 11/02/2020 15:50, Martin Knoblauch wrote:
> Hi,
> 
>  confused - 1.2.24 ???

Sorry, 1.2.47

(I was looking at Tomcat Native)

Mark


> 
> Cheers
> Martin
> 
> On Tue, Feb 11, 2020 at 3:39 PM Mark Thomas  > wrote:
> 
> Hi all,
> 
> The Tomcat Connectors (mod_jk, ISAPI DLL) are probably over due a
> release so I plan to start this process later this week.
> 
> Mark
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> 
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 
> 
> 
> 
> -- 
> --
> Martin Knoblauch
> email: k n o b i AT knobisoft DOT de
> www: http://www.knobisoft.de


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

Re: Tomcat Connectors - time for 1.2.24

[Martin Knoblauch]

Hi,

 confused - 1.2.24 ???

Cheers
Martin

On Tue, Feb 11, 2020 at 3:39 PM Mark Thomas  wrote:

> Hi all,
>
> The Tomcat Connectors (mod_jk, ISAPI DLL) are probably over due a
> release so I plan to start this process later this week.
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

-- 
--
Martin Knoblauch
email: k n o b i AT knobisoft DOT de
www: http://www.knobisoft.de

Re: Report issues with Jakarta EE migration tool

[Mark Thomas]

On 11/02/2020 15:29, Martin Grigorov wrote:
> 
> 
> On Tue, Feb 11, 2020, 17:12 Mark Thomas  > wrote:
> 
> On 11/02/2020 14:49, Martin Grigorov wrote:
> > Hi,
> >
> > What is the proper place to report issues
> > with https://github.com/apache/tomcat-jakartaee-migration ?
> > Since it is under `apache` org there is no 'Issues' tab.
> > Bugzilla ?!
> 
> We don't have anywhere yet.
> 
> GitHub issues is an option. As is Jira and Bugzilla.
> 
> This could be an opportunity to experiment with GitHUb issues if we
> want.
> 
> 
> For this we need to ask Infra team.

Well, yes and no given that I am on the infra team...

If we want to try it I can enable it.


 > Don't you want to do something like:
> 
> destEntry.setMethod(jarEntry.getMethod);
> 
> 
> If the method is STORED then we also need to set the size and the CRC.
> And those are more complicated to get. 

Ah. I didn't see anything about that being required in the Javadoc for
setMethod().

Looking at the source for ZipOutputStream it looks like we need 1 of
compressed size, size or CRC. Of those, I would have thought the size
was the easiest as we should be able to count the bytes written.

Mark

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

Re: Report issues with Jakarta EE migration tool

[Martin Grigorov]

On Tue, Feb 11, 2020, 17:12 Mark Thomas  wrote:

> On 11/02/2020 14:49, Martin Grigorov wrote:
> > Hi,
> >
> > What is the proper place to report issues
> > with https://github.com/apache/tomcat-jakartaee-migration ?
> > Since it is under `apache` org there is no 'Issues' tab.
> > Bugzilla ?!
>
> We don't have anywhere yet.
>
> GitHub issues is an option. As is Jira and Bugzilla.
>
> This could be an opportunity to experiment with GitHUb issues if we want.
>

For this we need to ask Infra team.


> > I've faced an issue with Spring Boot jars.
> > Once migrated trying to use it fails with:
>
> 
>
> > Caused by: java.lang.IllegalStateException: Unable to open nested entry
> > 'BOOT-INF/lib/spring-boot-starter-web-2.2.4.RELEASE.jar'. It has been
> > compressed and nested jar files must be stored without compression.
> > Please check the mechanism used to create your executable jar file
>
> Of course. That is a trick Spring Boot uses to provide better
> performance for nested JAR files.
>
> > i.e. it needs to use `destEntry.setMethod(ZipEntry.STORED);` (for jars
> > nested in /BOOT-INF/lib/**.jar)
> > in org.apache.tomcat.jakartaee.Migration#migrateArchive()
> > I am reworking it to return a Result object instead of a boolean
> > (isSuccess) that will contain: the
> > isSuccess boolean, the accumulated size and CRC for all entries in the
> > nested jar.
> >
> > If I am on the wrong track please share your ideas!
>
> The CRCs are always going to be different because the content has changed.
>
> The accumulated sizes are going to change for the same reason.
>
> In terms of being able to tell compressed / vs uncompressed I'm not sure
> you'll see enough difference (given that a JAR is already compressed
> with probably the exact same algorithm) to tell them apart.
>
> Don't you want to do something like:
>
> destEntry.setMethod(jarEntry.getMethod);
>

If the method is STORED then we also need to set the size and the CRC. And
those are more complicated to get.


> around line 119 of Migration.java ?
>
> Mark
>
>
> >
> > To reproduce it one can create a new application
> > at https://start.spring.io/, package it, migrate it and try to run it.
> >
> > Martin
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: Report issues with Jakarta EE migration tool

[Martin Grigorov]

On Tue, Feb 11, 2020, 17:06 Rémy Maucherat  wrote:

> On Tue, Feb 11, 2020 at 3:50 PM Martin Grigorov 
> wrote:
>
>> Hi,
>>
>> What is the proper place to report issues with
>> https://github.com/apache/tomcat-jakartaee-migration ?
>> Since it is under `apache` org there is no 'Issues' tab.
>> Bugzilla ?!
>>
>> I've faced an issue with Spring Boot jars.
>> Once migrated trying to use it fails with:
>>
>>
>> Exception in thread "main" java.lang.IllegalStateException: Failed to get
>> nested archive for entry
>> BOOT-INF/lib/spring-boot-starter-web-2.2.4.RELEASE.jar
>> at
>> org.springframework.boot.loader.archive.JarFileArchive.getNestedArchive(JarFileArchive.java:113)
>> at
>> org.springframework.boot.loader.archive.JarFileArchive.getNestedArchives(JarFileArchive.java:87)
>> at
>> org.springframework.boot.loader.ExecutableArchiveLauncher.getClassPathArchives(ExecutableArchiveLauncher.java:69)
>> at org.springframework.boot.loader.Launcher.launch(Launcher.java:50)
>> at org.springframework.boot.loader.JarLauncher.main(JarLauncher.java:52)
>> Caused by: java.io.IOException: Unable to open nested jar file
>> 'BOOT-INF/lib/spring-boot-starter-web-2.2.4.RELEASE.jar'
>> at
>> org.springframework.boot.loader.jar.JarFile.getNestedJarFile(JarFile.java:261)
>> at
>> org.springframework.boot.loader.jar.JarFile.getNestedJarFile(JarFile.java:247)
>> at
>> org.springframework.boot.loader.archive.JarFileArchive.getNestedArchive(JarFileArchive.java:109)
>> ... 4 more
>> Caused by: java.lang.IllegalStateException: Unable to open nested entry
>> 'BOOT-INF/lib/spring-boot-starter-web-2.2.4.RELEASE.jar'. It has been
>> compressed and nested jar files must be stored without compression. Please
>> check the mechanism used to create your executable jar file
>> at
>> org.springframework.boot.loader.jar.JarFile.createJarFileFromFileEntry(JarFile.java:287)
>> at
>> org.springframework.boot.loader.jar.JarFile.createJarFileFromEntry(JarFile.java:269)
>> at
>> org.springframework.boot.loader.jar.JarFile.getNestedJarFile(JarFile.java:258)
>> ... 6 more
>>
>>
>> i.e. it needs to use `destEntry.setMethod(ZipEntry.STORED);` (for jars
>> nested in /BOOT-INF/lib/**.jar)
>> in org.apache.tomcat.jakartaee.Migration#migrateArchive()
>> I am reworking it to return a Result object instead of a boolean
>> (isSuccess) that will contain: the
>> isSuccess boolean, the accumulated size and CRC for all entries in the
>> nested jar.
>>
>> If I am on the wrong track please share your ideas!
>>
>> To reproduce it one can create a new application at
>> https://start.spring.io/, package it, migrate it and try to run it.
>>
>
> Ok, so I guess use of this tool got a bit experimental very quickly ;)
>

Right!
I'm pushing it to the limits! :-)

>
> The purpose of the tool is to run Java EE (web)apps on *Tomcat* 10+ (or
> another *compliant* EE 9 server I suppose). It seems you are trying to
> convert something like "Spring boot with an embedded app", which isn't the
> goal of the tool at the moment. If it works, great, but it's a bit hard to
> promise support for everything. So ... Does it work ?
>

I use tomcat-embed-*.jars from master, i.e. 10.x, but you are right that
the idea looks crazy :-)


> Rémy
>
>
>>
>> Martin
>>
>

Re: Report issues with Jakarta EE migration tool

[Mark Thomas]

On 11/02/2020 14:49, Martin Grigorov wrote:
> Hi,
> 
> What is the proper place to report issues
> with https://github.com/apache/tomcat-jakartaee-migration ?
> Since it is under `apache` org there is no 'Issues' tab.
> Bugzilla ?!

We don't have anywhere yet.

GitHub issues is an option. As is Jira and Bugzilla.

This could be an opportunity to experiment with GitHUb issues if we want.

> I've faced an issue with Spring Boot jars.
> Once migrated trying to use it fails with:



> Caused by: java.lang.IllegalStateException: Unable to open nested entry
> 'BOOT-INF/lib/spring-boot-starter-web-2.2.4.RELEASE.jar'. It has been
> compressed and nested jar files must be stored without compression.
> Please check the mechanism used to create your executable jar file

Of course. That is a trick Spring Boot uses to provide better
performance for nested JAR files.

> i.e. it needs to use `destEntry.setMethod(ZipEntry.STORED);` (for jars
> nested in /BOOT-INF/lib/**.jar)
> in org.apache.tomcat.jakartaee.Migration#migrateArchive() 
> I am reworking it to return a Result object instead of a boolean
> (isSuccess) that will contain: the 
> isSuccess boolean, the accumulated size and CRC for all entries in the
> nested jar.
> 
> If I am on the wrong track please share your ideas!

The CRCs are always going to be different because the content has changed.

The accumulated sizes are going to change for the same reason.

In terms of being able to tell compressed / vs uncompressed I'm not sure
you'll see enough difference (given that a JAR is already compressed
with probably the exact same algorithm) to tell them apart.

Don't you want to do something like:

destEntry.setMethod(jarEntry.getMethod);

around line 119 of Migration.java ?

Mark

 
> 
> To reproduce it one can create a new application
> at https://start.spring.io/, package it, migrate it and try to run it.
> 
> Martin 


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

Re: Report issues with Jakarta EE migration tool

[Rémy Maucherat]

On Tue, Feb 11, 2020 at 3:50 PM Martin Grigorov 
wrote:

> Hi,
>
> What is the proper place to report issues with
> https://github.com/apache/tomcat-jakartaee-migration ?
> Since it is under `apache` org there is no 'Issues' tab.
> Bugzilla ?!
>
> I've faced an issue with Spring Boot jars.
> Once migrated trying to use it fails with:
>
>
> Exception in thread "main" java.lang.IllegalStateException: Failed to get
> nested archive for entry
> BOOT-INF/lib/spring-boot-starter-web-2.2.4.RELEASE.jar
> at
> org.springframework.boot.loader.archive.JarFileArchive.getNestedArchive(JarFileArchive.java:113)
> at
> org.springframework.boot.loader.archive.JarFileArchive.getNestedArchives(JarFileArchive.java:87)
> at
> org.springframework.boot.loader.ExecutableArchiveLauncher.getClassPathArchives(ExecutableArchiveLauncher.java:69)
> at org.springframework.boot.loader.Launcher.launch(Launcher.java:50)
> at org.springframework.boot.loader.JarLauncher.main(JarLauncher.java:52)
> Caused by: java.io.IOException: Unable to open nested jar file
> 'BOOT-INF/lib/spring-boot-starter-web-2.2.4.RELEASE.jar'
> at
> org.springframework.boot.loader.jar.JarFile.getNestedJarFile(JarFile.java:261)
> at
> org.springframework.boot.loader.jar.JarFile.getNestedJarFile(JarFile.java:247)
> at
> org.springframework.boot.loader.archive.JarFileArchive.getNestedArchive(JarFileArchive.java:109)
> ... 4 more
> Caused by: java.lang.IllegalStateException: Unable to open nested entry
> 'BOOT-INF/lib/spring-boot-starter-web-2.2.4.RELEASE.jar'. It has been
> compressed and nested jar files must be stored without compression. Please
> check the mechanism used to create your executable jar file
> at
> org.springframework.boot.loader.jar.JarFile.createJarFileFromFileEntry(JarFile.java:287)
> at
> org.springframework.boot.loader.jar.JarFile.createJarFileFromEntry(JarFile.java:269)
> at
> org.springframework.boot.loader.jar.JarFile.getNestedJarFile(JarFile.java:258)
> ... 6 more
>
>
> i.e. it needs to use `destEntry.setMethod(ZipEntry.STORED);` (for jars
> nested in /BOOT-INF/lib/**.jar)
> in org.apache.tomcat.jakartaee.Migration#migrateArchive()
> I am reworking it to return a Result object instead of a boolean
> (isSuccess) that will contain: the
> isSuccess boolean, the accumulated size and CRC for all entries in the
> nested jar.
>
> If I am on the wrong track please share your ideas!
>
> To reproduce it one can create a new application at
> https://start.spring.io/, package it, migrate it and try to run it.
>

Ok, so I guess use of this tool got a bit experimental very quickly ;)

The purpose of the tool is to run Java EE (web)apps on *Tomcat* 10+ (or
another *compliant* EE 9 server I suppose). It seems you are trying to
convert something like "Spring boot with an embedded app", which isn't the
goal of the tool at the moment. If it works, great, but it's a bit hard to
promise support for everything. So ... Does it work ?

Rémy


>
> Martin
>

Re: Tomcat Connectors - time for 1.2.24

[Martin Grigorov]

Hi,

On Tue, Feb 11, 2020 at 4:39 PM Mark Thomas  wrote:

> Hi all,
>
> The Tomcat Connectors (mod_jk, ISAPI DLL) are probably over due a
> release so I plan to start this process later this week.
>
>
I guess most of you have noticed but I've added .travis.yml to it and now
it runs builds on ARM64 for mod_jk:
https://travis-ci.org/apache/tomcat-connectors/builds
Also we use it successfully on our arm64 machines.
Not sure whether this is deserves a note in the release notes.

Martin


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

Report issues with Jakarta EE migration tool

[Martin Grigorov]

Hi,

What is the proper place to report issues with
https://github.com/apache/tomcat-jakartaee-migration ?
Since it is under `apache` org there is no 'Issues' tab.
Bugzilla ?!

I've faced an issue with Spring Boot jars.
Once migrated trying to use it fails with:


Exception in thread "main" java.lang.IllegalStateException: Failed to get
nested archive for entry
BOOT-INF/lib/spring-boot-starter-web-2.2.4.RELEASE.jar
at
org.springframework.boot.loader.archive.JarFileArchive.getNestedArchive(JarFileArchive.java:113)
at
org.springframework.boot.loader.archive.JarFileArchive.getNestedArchives(JarFileArchive.java:87)
at
org.springframework.boot.loader.ExecutableArchiveLauncher.getClassPathArchives(ExecutableArchiveLauncher.java:69)
at org.springframework.boot.loader.Launcher.launch(Launcher.java:50)
at org.springframework.boot.loader.JarLauncher.main(JarLauncher.java:52)
Caused by: java.io.IOException: Unable to open nested jar file
'BOOT-INF/lib/spring-boot-starter-web-2.2.4.RELEASE.jar'
at
org.springframework.boot.loader.jar.JarFile.getNestedJarFile(JarFile.java:261)
at
org.springframework.boot.loader.jar.JarFile.getNestedJarFile(JarFile.java:247)
at
org.springframework.boot.loader.archive.JarFileArchive.getNestedArchive(JarFileArchive.java:109)
... 4 more
Caused by: java.lang.IllegalStateException: Unable to open nested entry
'BOOT-INF/lib/spring-boot-starter-web-2.2.4.RELEASE.jar'. It has been
compressed and nested jar files must be stored without compression. Please
check the mechanism used to create your executable jar file
at
org.springframework.boot.loader.jar.JarFile.createJarFileFromFileEntry(JarFile.java:287)
at
org.springframework.boot.loader.jar.JarFile.createJarFileFromEntry(JarFile.java:269)
at
org.springframework.boot.loader.jar.JarFile.getNestedJarFile(JarFile.java:258)
... 6 more


i.e. it needs to use `destEntry.setMethod(ZipEntry.STORED);` (for jars
nested in /BOOT-INF/lib/**.jar)
in org.apache.tomcat.jakartaee.Migration#migrateArchive()
I am reworking it to return a Result object instead of a boolean
(isSuccess) that will contain: the
isSuccess boolean, the accumulated size and CRC for all entries in the
nested jar.

If I am on the wrong track please share your ideas!

To reproduce it one can create a new application at https://start.spring.io/,
package it, migrate it and try to run it.

Martin

Re: UTF-8 properties files and BOMs

[Mark Thomas]

On 11/02/2020 14:26, Christopher Schultz wrote:



>> The thing that bugged me was having to manually switch properties
>> files to UTF-8 to view them "properly". You mail motivated me to
>> track down where I can change that in Eclipse:
> 
>> Window->Preferences->General->Content Types
> 
>> and I have changed Java properties files to use UTF-8. So that is
>> my personal niggle fixed. Thanks for the motivation.
> 
> Yes, this *will* fix things, but:
> 
> 1. It's a global setting, so it can't be set on a per-project basis.
> That means you have to be willing to convert ALL your properties files
> across ALL your projects to UTF-8. That may be okay for some people,
> but not all.

Fair point.

> 2. This is a guess: Tomcat's ide-eclipse ant target can't set that
> setting for the Tomcat project(s) because it's a global setting.
> Therefore, anyone using Eclipse as an IDE will have to manually set
> their content-type in order to NOT damage any of the files we ship.

I'm not sure about actual damage. I've see Eclipse manipulate UTF-8
files while configured to use ISO-8859-1 without issue. But maybe that
is actually git doing UTF-8 manipulation.

>> I was concerned that adding a BOM would cause problems when
>> reading property files. I've seen reports of that with Java in the
>> past. A quick test suggests that the issue is no longer present
>> with latest Java 8.
> 
> I actually had another problem after I implemented all of this: any
> property file without a blank and/or comment line at the top ended up
> with a mangled and unusable *first* property key. A file like this:
> 
> first.property=foo
> second.property=bar
> 
> Would end up line this after a trip through "native2ascii -encoding
> UTF-8":
> 
> \ufefffirst.property=foo
> second.property=bar

That is similar to the problems I recall with earlier versions of Java.

> native2ascii stupidly interprets the UTF-8 BOM as an actual character,
> and encodes it in the output.
> 
> This appears to be a bug in (at least old versions of) Java and/or
> native2ascii. I've got local installations of Java 8, 11 (Adopt), 11
> (Oracle), and 13 (OpenJDK), and only Java 8 has a "native2ascii"
> binary present. I see ant's  task has its own
> implementation, but it's probably very simple, just like the
> native2ascii program itself. Java's Reader classes incorrectly
> interpret the BOM as an actual character instead of an ignorable UTF-8
> control sequence.

But the chances of us being able to "fix" the Ant implementation are
considerably higher :).

> Ensuring that the first line of the file is a comment or a blank line
> fixes things:
> 
> # BOM
> first.property=foo
> second.property=bar
> 
> becomes:
> 
> \ufeff# BOM
> first.property=foo
> second.property=bar

Does the BOM end up creating an additional property in this case?

>> Overall, I guess I am -0 on adding BOMs.
> 
> Okay. This is a fairly recent change to Tomcat, and frankly, we (a)
> don't get a huge number of outside contributions which include changes
> to the localized properties files (except for the translation-only
> contributions, which have been great!) and (b) often ignore the
> non-English translations in the first place because we are lazy.
> 
> I think maybe this can stay on the back-burner until we see if we end
> up with any problems.

Sounds reasonable to me. It looks like we have options if we need them
but with a few minor issues to research / iron out first if we go that way.

> Does/can "checkstyle" check for valid UTF-8 byte sequences in
> .properties files? I think that may be a helpful check to add if it's
> not already in there.

Don't know. +1 if such a thing exists.

Mark

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

Tomcat Connectors - time for 1.2.24

[Mark Thomas]

Hi all,

The Tomcat Connectors (mod_jk, ISAPI DLL) are probably over due a
release so I plan to start this process later this week.

Mark

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

buildbot failure in on tomcat-85-trunk

[buildbot]

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] 085cd272221fdae5c8d65777bba4ef35f773c32b
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

Re: UTF-8 properties files and BOMs

[Martin Grigorov]

On Tue, Feb 11, 2020 at 4:27 PM Christopher Schultz <
ch...@christopherschultz.net> wrote:

> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> On 2/11/20 2:37 AM, Martin Grigorov wrote:
> > I guess you use Java 8. Newer versions of Java try UTF-8 first and
> > then fallback to ISO-8859-1:
> https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/P
> ropertyResourceBundle.html
> 
> Correct, I am using Java 8:
>
> $ java -version
> 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)
>
> This is the version that Debian 9 provides. I could install a a higher
> patch-version but would it help?
>
> On 2/11/20 6:38 AM, Mark Thomas wrote:
> > On 10/02/2020 20:58, Christopher Schultz wrote:
> >> All,
> >>
> >> I've recently begun making a change to my application's resource
> >> bundles, converting them into UTF-8 for readability and
> >> converting them to ISO-8859-1 during my build process to make
> >> ResourceBundle happy.
> >>
> >> I have everything working, except that Eclipse still thinks that
> >> my files ought to be ISO-8859-1 and ruins them when I load them.
> >> Sometimes, it's very obvious and that's not a problem: a
> >> developer will see that and fix it before continuing. But some
> >> files are only *slightly* broken by this and someone might make a
> >> mistake.
> >
> > I don't think we have seen this with Tomcat. Or have we (since we
> > switched to UTF-8)?
> >
> > The thing that bugged me was having to manually switch properties
> > files to UTF-8 to view them "properly". You mail motivated me to
> > track down where I can change that in Eclipse:
> >
> > Window->Preferences->General->Content Types
> >
> > and I have changed Java properties files to use UTF-8. So that is
> > my personal niggle fixed. Thanks for the motivation.
>
> Yes, this *will* fix things, but:
>
> 1. It's a global setting, so it can't be set on a per-project basis.
> That means you have to be willing to convert ALL your properties files
> across ALL your projects to UTF-8. That may be okay for some people,
> but not all.
>
> 2. This is a guess: Tomcat's ide-eclipse ant target can't set that
> setting for the Tomcat project(s) because it's a global setting.
> Therefore, anyone using Eclipse as an IDE will have to manually set
> their content-type in order to NOT damage any of the files we ship.
>
> >> NOTE: We don't keep Eclipse settings in revision-control, so I
> >> can't modify everyone's Eclipse configuration. We are using svn
> >> and svn:mime-type is correctly set for these files; Eclipse just
> >> ignores tha t.
> >
> > I've seen that too. While I found it rather annoying, it wasn't
> > annoying enough to try and find a fix as that looked like it would
> > require patching Eclipse and/or the svn plug-in.
> >
> >> Anyway, I found that adding a UTF-8 BOM to the beginning of the
> >> file fixes that issue and Eclipse does the right thing.
> >
> > Ah. So Eclipse *is* doing content scanning. Interesting.
>
> Well, it's not really *content* scanning. But a BOM is the official
> way to tell the difference between a UTF-8 encoded file and one that
> just happens to have a whole bunch of valid UTF-8 byte sequences
> through (most of) the file.
>
> >> As a sanity check. I looked at how Tomcat's files are laid-out
> >> and I don't see any BOMs.
> >
> > Correct. The only files in the code base that should have BOMs at
> > the moment are the ones in the test web application (under
> > bug49nnn) for testing the default Servlet's handling of files with
> > BOMs.
> >
> >> Should we add BOMs? Is there any reason NOT to use a BOM? These
> >> are file types that are officially supposed to be ISO-8859-1 but
> >> everyone wants to handle them differently, so I think adding BOMs
> >> might be a good idea so that editors are always informed of
> >> exactly what's happenin g.
> >>
> >> WDYT?
> >
> > I was concerned that adding a BOM would cause problems when
> > reading property files. I've seen reports of that with Java in the
> > past. A quick test suggests that the issue is no longer present
> > with latest Java 8.
>
> I actually had another problem after I implemented all of this: any
> property file without a blank and/or comment line at the top ended up
> with a mangled and unusable *first* property key. A file like this:
>
> first.property=foo
> second.property=bar
>
> Would end up line this after a trip through "native2ascii -encoding
> UTF-8":
>
> \ufefffirst.property=foo
> second.property=bar
>
> native2ascii stupidly interprets the UTF-8 BOM as an actual character,
> and encodes it in the output.
>
> This appears to be a bug in (at least old versions of) Java and/or
> native2ascii. I've got local installations of Java 8, 11 (Adopt), 11
> (Oracle), and 13 (OpenJDK), and only Java 8 has a "native2ascii"
> binary 

svn commit: r38000 - /dev/tomcat/tomcat-8/v8.5.51/ /release/tomcat/tomcat-8/v8.5.51/

[markt]

Author: markt
Date: Tue Feb 11 14:27:35 2020
New Revision: 38000

Log:
Release Apache Tomcat 8.5.51

Added:
release/tomcat/tomcat-8/v8.5.51/
  - copied from r37999, dev/tomcat/tomcat-8/v8.5.51/
Removed:
dev/tomcat/tomcat-8/v8.5.51/


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

Nexus: Promotion Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.7.0_80; Windows 8.1 6.3)""userId" = "markt""ip" = "109.149.198.114"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/tomcat/tomcat-i18n-de/8.5.51/tomcat-i18n-de-8.5.51.jar(SHA1: f9918b6f7539b8b2939902c37483dd2d6ddde29d)/org/apache/tomcat/tomcat-i18n-de/8.5.51/tomcat-i18n-de-8.5.51.jar.asc(SHA1: df6d7812024c7bd6fc64695866f409fd3831)/org/apache/tomcat/tomcat-i18n-de/8.5.51/tomcat-i18n-de-8.5.51.pom.asc(SHA1: 811fb9c74b41d9ea4cbba92d2f2c42ec3df79216)/org/apache/tomcat/tomcat-i18n-de/8.5.51/tomcat-i18n-de-8.5.51.pom(SHA1: 63a6276dd7ef194d8c382296f14799d64a67181a)/org/apache/tomcat/tomcat-jni/8.5.51/tomcat-jni-8.5.51-sources.jar.asc(SHA1: 9ccc57cbaae3ba742822aed697b39d0b0af8f9c3)/org/apache/tomcat/tomcat-jni/8.5.51/tomcat-jni-8.5.51-sources.jar(SHA1: 6f85638cd487f1770b0189675e9073c091ba7444)/org/apache/tomcat/tomcat-jni/8.5.51/tomcat-jni-8.5.51.jar.asc(SHA1: 708705549a1acd8b218f18afc18f8283867bd532)/org/apache/tomcat/tomcat-jni/8.5.51/tomcat-jni-8.5.51.pom.asc(SHA1: 0dcdd430608cfea35a9dc256f83fb12ab08b7031)/org/apache/tomcat/tomcat-jni/8.5.51/tomcat-jni-8.5.51.pom(SHA1: 97fd618a0da710a0d154958221a6ebf3214c4535)/org/apache/tomcat/tomcat-jni/8.5.51/tomcat-jni-8.5.51.jar(SHA1: cc974d052aa09963184f7b99339bcd1d0c8c2b1c)/org/apache/tomcat/tomcat-juli/8.5.51/tomcat-juli-8.5.51-sources.jar.asc(SHA1: 819a3d4955a6c2df99583bacac1e137a83bf58a6)/org/apache/tomcat/tomcat-juli/8.5.51/tomcat-juli-8.5.51.pom(SHA1: 10e3fe8b19d415ebfe14a3aa693094a6b1b51e42)/org/apache/tomcat/tomcat-juli/8.5.51/tomcat-juli-8.5.51-sources.jar(SHA1: 5d4d7f77c14051df3a9bafee8b9e5e099066f2f6)/org/apache/tomcat/tomcat-juli/8.5.51/tomcat-juli-8.5.51.pom.asc(SHA1: fc63c797a974dad51a61a5809ff21794da8914ee)/org/apache/tomcat/tomcat-juli/8.5.51/tomcat-juli-8.5.51.jar.asc(SHA1: 6cacc7a475aaf2b646d76feeec8eb54bbdf602f9)/org/apache/tomcat/tomcat-juli/8.5.51/tomcat-juli-8.5.51.jar(SHA1: 5e5b0b43f98aed549ef63d2a1df43c779e1e2b00)/org/apache/tomcat/tomcat-util/8.5.51/tomcat-util-8.5.51-sources.jar.asc(SHA1: 9b9085619c17ef93e6ed3cfa1552abf0bb162ed9)/org/apache/tomcat/tomcat-util/8.5.51/tomcat-util-8.5.51-sources.jar(SHA1: c0340520f7b56dc31b731b4c3479e6e0ac804833)/org/apache/tomcat/tomcat-util/8.5.51/tomcat-util-8.5.51.jar.asc(SHA1: 79b43621a3252bd8a93d612b43a8498c77ca4943)/org/apache/tomcat/tomcat-util/8.5.51/tomcat-util-8.5.51.pom(SHA1: bb7b96b65848a928d878a7d67a52186f1df0e8dd)/org/apache/tomcat/tomcat-util/8.5.51/tomcat-util-8.5.51.jar(SHA1: 792130d4e1ea979dbbf8aa16ddd5b4d35dd8a2b3)/org/apache/tomcat/tomcat-util/8.5.51/tomcat-util-8.5.51.pom.asc(SHA1: 6f343a86c4ebd3a8318621351b226a80788857e3)/org/apache/tomcat/tomcat-catalina/8.5.51/tomcat-catalina-8.5.51.pom.asc(SHA1: faf74e3e8d5157888cc777b6848a4e0ef155c884)/org/apache/tomcat/tomcat-catalina/8.5.51/tomcat-catalina-8.5.51-sources.jar(SHA1: d7cfe8b7963926267fee411e2ed6d245e57b1db4)/org/apache/tomcat/tomcat-catalina/8.5.51/tomcat-catalina-8.5.51.jar.asc(SHA1: 516dccdd16aca63a47af17c9b7dde8c17b5a01c2)/org/apache/tomcat/tomcat-catalina/8.5.51/tomcat-catalina-8.5.51-sources.jar.asc(SHA1: e5efa21567339439b4fdae4d0ea82704caba6d9c)/org/apache/tomcat/tomcat-catalina/8.5.51/tomcat-catalina-8.5.51.jar(SHA1: 1fbd9f4958a0e7a05b1d7231b5c1bfae4fe1a1ab)/org/apache/tomcat/tomcat-catalina/8.5.51/tomcat-catalina-8.5.51.pom(SHA1: 54a6f71963d4415f73f6ff43acf47efc2de9ac01)/org/apache/tomcat/tomcat-catalina-ws/8.5.51/tomcat-catalina-ws-8.5.51.jar(SHA1: 6e98158dd34e86741292b85bb049952752742df4)/org/apache/tomcat/tomcat-catalina-ws/8.5.51/tomcat-catalina-ws-8.5.51-sources.jar.asc(SHA1: 1a7e03ac7b27230562b16e0e854ca8f725daff2c)/org/apache/tomcat/tomcat-catalina-ws/8.5.51/tomcat-catalina-ws-8.5.51.pom(SHA1: 0a8a99ee0152babed53c16acf2280c5e954db3d2)/org/apache/tomcat/tomcat-catalina-ws/8.5.51/tomcat-catalina-ws-8.5.51.jar.asc(SHA1: 97c45748436617ec386e116ad16f7b0458167c30)/org/apache/tomcat/tomcat-catalina-ws/8.5.51/tomcat-catalina-ws-8.5.51-sources.jar(SHA1: aea87541a1e0071341e51fc2acf401277a58b0e6)/org/apache/tomcat/tomcat-catalina-ws/8.5.51/tomcat-catalina-ws-8.5.51.pom.asc(SHA1: 9725cda34a97b73a2808182ed7b67acc0f16f5ec)/org/apache/tomcat/tomcat-i18n-fr/8.5.51/tomcat-i18n-fr-8.5.51.pom.asc(SHA1: 076ddbf37d441d4504c90612f8aebcc1571fdcef)/org/apache/tomcat/tomcat-i18n-fr/8.5.51/tomcat-i18n-fr-8.5.51.jar(SHA1: b0f3b1f888cd0174ce4e05b3413d610867267dee)/org/apache/tomcat/tomcat-i18n-fr/8.5.51/tomcat-i18n-fr-8.5.51.pom(SHA1: d93114828d516f6a2521783a49dae91da30984ca)/org/apache/tomcat/tomcat-i18n-fr/8.5.51/tomcat-i18n-fr-8.5.51.jar.asc(SHA1: 7d9b1af75b44b559dc169e1ebf3e7886a250f1a6)/org/apache/tomcat/tomcat-jdbc/8.5.51/tomcat-jdbc-8.5.51.pom(SHA1: da81cfde22a4da62cc2527aed0f794daa3fe1941)/org/apache/tomcat/tomcat-jdbc/8.5.51/tomcat-jdbc-8.5.51-sources.jar.asc(SHA1: a16443194a2a52ccfa5dba9ebc69c38e45f18344)/org/apache/tomcat/tomcat-jdbc/8.5.51/tomcat-jdbc-8.5.51.jar.asc(SHA1: 

[RESULT][VOTE] Release Apache Tomcat 8.5.51

[Mark Thomas]

The following votes were cast:

Binding:
+1: mgrigorov, remm, schultz, markt, kfujino

No other votes were cast. The vote therefore passes.

Thanks to everyone who contributed to the 8.5.51 release.

Mark

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

Re: UTF-8 properties files and BOMs

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 2/11/20 2:37 AM, Martin Grigorov wrote:
> I guess you use Java 8. Newer versions of Java try UTF-8 first and
> then fallback to ISO-8859-1:
https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/P
ropertyResourceBundle.html
Correct, I am using Java 8:

$ java -version
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)

This is the version that Debian 9 provides. I could install a a higher
patch-version but would it help?

On 2/11/20 6:38 AM, Mark Thomas wrote:
> On 10/02/2020 20:58, Christopher Schultz wrote:
>> All,
>> 
>> I've recently begun making a change to my application's resource 
>> bundles, converting them into UTF-8 for readability and
>> converting them to ISO-8859-1 during my build process to make
>> ResourceBundle happy.
>> 
>> I have everything working, except that Eclipse still thinks that
>> my files ought to be ISO-8859-1 and ruins them when I load them. 
>> Sometimes, it's very obvious and that's not a problem: a
>> developer will see that and fix it before continuing. But some
>> files are only *slightly* broken by this and someone might make a
>> mistake.
> 
> I don't think we have seen this with Tomcat. Or have we (since we 
> switched to UTF-8)?
> 
> The thing that bugged me was having to manually switch properties
> files to UTF-8 to view them "properly". You mail motivated me to
> track down where I can change that in Eclipse:
> 
> Window->Preferences->General->Content Types
> 
> and I have changed Java properties files to use UTF-8. So that is
> my personal niggle fixed. Thanks for the motivation.

Yes, this *will* fix things, but:

1. It's a global setting, so it can't be set on a per-project basis.
That means you have to be willing to convert ALL your properties files
across ALL your projects to UTF-8. That may be okay for some people,
but not all.

2. This is a guess: Tomcat's ide-eclipse ant target can't set that
setting for the Tomcat project(s) because it's a global setting.
Therefore, anyone using Eclipse as an IDE will have to manually set
their content-type in order to NOT damage any of the files we ship.

>> NOTE: We don't keep Eclipse settings in revision-control, so I
>> can't modify everyone's Eclipse configuration. We are using svn
>> and svn:mime-type is correctly set for these files; Eclipse just
>> ignores tha t.
> 
> I've seen that too. While I found it rather annoying, it wasn't
> annoying enough to try and find a fix as that looked like it would
> require patching Eclipse and/or the svn plug-in.
> 
>> Anyway, I found that adding a UTF-8 BOM to the beginning of the
>> file fixes that issue and Eclipse does the right thing.
> 
> Ah. So Eclipse *is* doing content scanning. Interesting.

Well, it's not really *content* scanning. But a BOM is the official
way to tell the difference between a UTF-8 encoded file and one that
just happens to have a whole bunch of valid UTF-8 byte sequences
through (most of) the file.

>> As a sanity check. I looked at how Tomcat's files are laid-out
>> and I don't see any BOMs.
> 
> Correct. The only files in the code base that should have BOMs at
> the moment are the ones in the test web application (under
> bug49nnn) for testing the default Servlet's handling of files with
> BOMs.
> 
>> Should we add BOMs? Is there any reason NOT to use a BOM? These
>> are file types that are officially supposed to be ISO-8859-1 but
>> everyone wants to handle them differently, so I think adding BOMs
>> might be a good idea so that editors are always informed of
>> exactly what's happenin g.
>> 
>> WDYT?
> 
> I was concerned that adding a BOM would cause problems when
> reading property files. I've seen reports of that with Java in the
> past. A quick test suggests that the issue is no longer present
> with latest Java 8.

I actually had another problem after I implemented all of this: any
property file without a blank and/or comment line at the top ended up
with a mangled and unusable *first* property key. A file like this:

first.property=foo
second.property=bar

Would end up line this after a trip through "native2ascii -encoding
UTF-8":

\ufefffirst.property=foo
second.property=bar

native2ascii stupidly interprets the UTF-8 BOM as an actual character,
and encodes it in the output.

This appears to be a bug in (at least old versions of) Java and/or
native2ascii. I've got local installations of Java 8, 11 (Adopt), 11
(Oracle), and 13 (OpenJDK), and only Java 8 has a "native2ascii"
binary present. I see ant's  task has its own
implementation, but it's probably very simple, just like the
native2ascii program itself. Java's Reader classes incorrectly
interpret the BOM as an actual character instead of an ignorable UTF-8
control sequence.

I can confirm that Java 13 still seems to have this problem: running
ant's  under Java 13 still corrupts the first line of
the file.

Ensuring that 

svn commit: r37999 - /release/tomcat/tomcat-connectors/native/1.2.21/

[markt]

Author: markt
Date: Tue Feb 11 14:24:10 2020
New Revision: 37999

Log:
Drop tomcat-native 1.2.21 from mirrors

Removed:
release/tomcat/tomcat-connectors/native/1.2.21/


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

svn commit: r37998 - /dev/tomcat/tomcat-9/v9.0.31/ /release/tomcat/tomcat-9/v9.0.31/

[markt]

Author: markt
Date: Tue Feb 11 14:22:51 2020
New Revision: 37998

Log:
Release Apache Tomcat 9.0.31

Added:
release/tomcat/tomcat-9/v9.0.31/
  - copied from r37997, dev/tomcat/tomcat-9/v9.0.31/
Removed:
dev/tomcat/tomcat-9/v9.0.31/


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

Nexus: Promotion Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_232; Windows 10 10.0)""userId" = "markt""ip" = "109.149.198.114"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/tomcat/tomcat-i18n-de/9.0.31/tomcat-i18n-de-9.0.31.pom(SHA1: cd9d11aa85c9779941a5f1cd32835dfdd354ed0d)/org/apache/tomcat/tomcat-i18n-de/9.0.31/tomcat-i18n-de-9.0.31.jar.asc(SHA1: 3625045132f23eeb177d655706d0e058aad9a1f3)/org/apache/tomcat/tomcat-i18n-de/9.0.31/tomcat-i18n-de-9.0.31.pom.asc(SHA1: 6baa55410345e5109bcb771cd3e0bf1a0a96f0c6)/org/apache/tomcat/tomcat-i18n-de/9.0.31/tomcat-i18n-de-9.0.31.jar(SHA1: f6a9c92ff3d81fe766b4360e805167de19128500)/org/apache/tomcat/tomcat-jni/9.0.31/tomcat-jni-9.0.31.pom(SHA1: 1f3b3796e4319cab579bef4df43d5770dee4d0e4)/org/apache/tomcat/tomcat-jni/9.0.31/tomcat-jni-9.0.31.jar.asc(SHA1: 2ed4413d4f92d06c778d216ba2206369c8b2)/org/apache/tomcat/tomcat-jni/9.0.31/tomcat-jni-9.0.31.pom.asc(SHA1: f763e6d7a9ec5adbe5d57ba41f5fe0ba5e00885f)/org/apache/tomcat/tomcat-jni/9.0.31/tomcat-jni-9.0.31-sources.jar(SHA1: 63f7b3856ecb75b375747a8acdab7ef3d6502836)/org/apache/tomcat/tomcat-jni/9.0.31/tomcat-jni-9.0.31-sources.jar.asc(SHA1: c9fd03ddc4c9a22edf7685d459e04aeaedbcf5b3)/org/apache/tomcat/tomcat-jni/9.0.31/tomcat-jni-9.0.31.jar(SHA1: 4492f243ce4d099f814e35cc1f2883ca871de6ea)/org/apache/tomcat/tomcat-juli/9.0.31/tomcat-juli-9.0.31-sources.jar(SHA1: c1682f4fa5ce5c5c27e3ca81e243c6a5258053fc)/org/apache/tomcat/tomcat-juli/9.0.31/tomcat-juli-9.0.31.jar.asc(SHA1: 188cbb4516c811dc565187ca03c1c5e24a2b381f)/org/apache/tomcat/tomcat-juli/9.0.31/tomcat-juli-9.0.31.pom(SHA1: beed872ae35164754612f0eea2a96a723a6714e6)/org/apache/tomcat/tomcat-juli/9.0.31/tomcat-juli-9.0.31-sources.jar.asc(SHA1: 73de45c7519d86cf4d507dbabf0ceeea30b71b4b)/org/apache/tomcat/tomcat-juli/9.0.31/tomcat-juli-9.0.31.jar(SHA1: d6e741b265bfeb25d2af93e68cd568629263179a)/org/apache/tomcat/tomcat-juli/9.0.31/tomcat-juli-9.0.31.pom.asc(SHA1: 2524686701f1b0df75505322f7e7dab7fab8c828)/org/apache/tomcat/tomcat-util/9.0.31/tomcat-util-9.0.31.jar.asc(SHA1: bfe4e0619cb4030ec95c85e6fd0fe955b9b07f41)/org/apache/tomcat/tomcat-util/9.0.31/tomcat-util-9.0.31.pom(SHA1: 1d455ff693027f02834632dbbb4fd933589683d5)/org/apache/tomcat/tomcat-util/9.0.31/tomcat-util-9.0.31.pom.asc(SHA1: f13e9ed57d9b34492a019308d054c6f322afa1d8)/org/apache/tomcat/tomcat-util/9.0.31/tomcat-util-9.0.31-sources.jar(SHA1: b3deece44e59db015b10c28e0a6bd3d7a1b87cf7)/org/apache/tomcat/tomcat-util/9.0.31/tomcat-util-9.0.31-sources.jar.asc(SHA1: aced991ca4c73d74c745f5660951225fe59cd26b)/org/apache/tomcat/tomcat-util/9.0.31/tomcat-util-9.0.31.jar(SHA1: 36b1393ca0fb7f933c2a69124c8fb0e278c4d7dd)/org/apache/tomcat/tomcat-catalina/9.0.31/tomcat-catalina-9.0.31.jar(SHA1: d13dccd55a83c30f139d0540925625207ed35347)/org/apache/tomcat/tomcat-catalina/9.0.31/tomcat-catalina-9.0.31-sources.jar.asc(SHA1: 4451a49a990e5d7591eaba611ad966abe037b7e7)/org/apache/tomcat/tomcat-catalina/9.0.31/tomcat-catalina-9.0.31.pom(SHA1: 743f895fb3dcd9839e0c2f572b11afce75a26742)/org/apache/tomcat/tomcat-catalina/9.0.31/tomcat-catalina-9.0.31.pom.asc(SHA1: 75b2461103a582657c70130c638eb6450d6a603d)/org/apache/tomcat/tomcat-catalina/9.0.31/tomcat-catalina-9.0.31.jar.asc(SHA1: de0be9db701b39ab4492cf568beabd17070b2805)/org/apache/tomcat/tomcat-catalina/9.0.31/tomcat-catalina-9.0.31-sources.jar(SHA1: e103ad696a434ab438c99fa0af7b9f2d2a39a9e7)/org/apache/tomcat/tomcat-i18n-fr/9.0.31/tomcat-i18n-fr-9.0.31.pom(SHA1: 802fc17417ed0c0f5103894469c9788319e8968c)/org/apache/tomcat/tomcat-i18n-fr/9.0.31/tomcat-i18n-fr-9.0.31.jar(SHA1: 0c54a4c84bbc16f52e23a37092f4a54b147d0eae)/org/apache/tomcat/tomcat-i18n-fr/9.0.31/tomcat-i18n-fr-9.0.31.pom.asc(SHA1: 01347e0787c7e630851ff8c114b6612d979ed2a8)/org/apache/tomcat/tomcat-i18n-fr/9.0.31/tomcat-i18n-fr-9.0.31.jar.asc(SHA1: 9cd6b9a1ff1e005fd4ae9376bb7bb642bf02248c)/org/apache/tomcat/tomcat-i18n-cs/9.0.31/tomcat-i18n-cs-9.0.31.pom(SHA1: 8da6a768b8637b51429982d887349babb529ca8b)/org/apache/tomcat/tomcat-i18n-cs/9.0.31/tomcat-i18n-cs-9.0.31.pom.asc(SHA1: 157688dbf07f875ae66d2677e2567b4c406d0b4d)/org/apache/tomcat/tomcat-i18n-cs/9.0.31/tomcat-i18n-cs-9.0.31.jar.asc(SHA1: 405be548b8f7aecf30713e56f301e83f240fcd1c)/org/apache/tomcat/tomcat-i18n-cs/9.0.31/tomcat-i18n-cs-9.0.31.jar(SHA1: e1f4723fbfdecf60fd6e62f7563e9a032bd2a382)/org/apache/tomcat/tomcat-jdbc/9.0.31/tomcat-jdbc-9.0.31-sources.jar(SHA1: 3bbe52460d2a50d066e9ec9aa8fcc5997da692c8)/org/apache/tomcat/tomcat-jdbc/9.0.31/tomcat-jdbc-9.0.31.jar(SHA1: 28129623d8097e3e787f5866f20c2a78236a56b4)/org/apache/tomcat/tomcat-jdbc/9.0.31/tomcat-jdbc-9.0.31.pom.asc(SHA1: 18a8b178be7ff98326ef7b413004be7399037a12)/org/apache/tomcat/tomcat-jdbc/9.0.31/tomcat-jdbc-9.0.31.pom(SHA1: a6dbf75d72ce22157ca3756542fc9754418b4dfd)/org/apache/tomcat/tomcat-jdbc/9.0.31/tomcat-jdbc-9.0.31.jar.asc(SHA1: 

[RESULT][VOTE] Release Apache Tomcat 9.0.31

[Mark Thomas]

The following votes were cast:

Binding:
+1: mgrigorov, remm, markt, kfujino

No other votes were cast. The vote therefore passes.

Thank you to everyone who contributed to this release.

Mark




On 05/02/2020 21:27, 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
> [ ] Stable - go ahead and release as 9.0.31
> 
> -
> 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: Numbering schemes for future releases

[Mark Thomas]

Thanks to everyone that has expressed an opinion so far. If you have a
view and you wish to express it, now is the time to do so.

I've read through all the responses to date and my reading of those
responses is:

- A has strong support but also one strongly against
- B has low support and several against
- C has moderate support but several concerns about Jakarta EE 10 timing
- D has moderate to strong support

Option E was also proposed but did collect wider support

The strong objection to A suggested either B or a variation on C/D as
acceptable alternatives.

The 10.0.0.0-M1 vote has been running for 3+ working days and this
thread for 1+ working days.

As previously stated, I'm happy to *briefly* delay the first Tomcat 10
milestone but I really don't want to delay more than a few days. Of
course, if the PMC members feel I am rushing this release unnecessarily
then there is always the option to vote against the release.

Given all of the above, I propose to do the following:

- Cancel the 10.0.0.0-M1 release vote
- Give this thread until 10.00 UTC 13-Feb-2020 (just over 72 hours from
  when it started) to collect additional views
- Assuming (and it is a big assumption) that additional views expressed
  are broadly consistent with the views expressed to date, tag 10.0.0-M1
  and start a release vote.
- If the additional views expressed are not broadly consistent with the
  views expressed to date (or people change their minds) then we'll have
  to assess where we are at the end of 72 hours and figure out a plan to
  move forward at that point.

This approach rules out options A, B & E but leaves us free to choose
between C, D or a variation at a later point when we can make that
choice with a better idea of Jakarta EE 9 adoption rates, Jakarta EE 10
plans, etc.

Mark



On 10/02/2020 09:47, Mark Thomas wrote:
> Hi,
> 
> I thought it would be useful to re-open the discussion on this. If there
> is a better plan that the one we currently have I'd like to try and find it.
> 
> I'm happy to hold off on the current 10.0.0.0-M1 release for a few days
> to give us time look for a better numbering scheme and so we have the
> opportunity to pull the 10.0.0.0-M1 release if necessary.
> 
> I have tried to express the various options I have seen proposed in a
> similar way so we can compare them. If I have missed one or you think of
> a different one then please post it.
> 
> Option A: The current plan:
> Jakarta EE 9:  10.0.0.x
> Jakarta EE 10: 10.0.x   (x>=1)
> Jakarta EE 11: 11.0.x
> Java EE 8: 9.y.x(where y == major Tomcat version)
> 
> 
> Option B: Continue with existing numbering
> Jakarta EE 9:  10.0.x
> Jakarta EE 10: 11.0.x
> Jakarta EE 11: 12.0.x
> Java EE 8: 9.y.x(where y == major Tomcat version)
> 
> 
> Option C: No stable Jakarta EE 9 release
> Jakarta EE 9:  10.0.0-Mx
> Jakarta EE 10: 10.0.x
> Jakarta EE 11: 11.0.x
> Java EE 8: 9.y.x(where y == major Tomcat version)
> 
> 
> Option D:
> Jakarta EE 9:  10.0.x
> Jakarta EE 10: 10.1.x
> Jakarta EE 11: 11.0.x
> Java EE 8: 9.y.x(where y == major Tomcat version)
> 
> 
> My own thoughts:
> 
> I don't like option B because the off-by-one issue between Jakarta EE
> and Tomcat. It is manageable at the moment but I worry that it will
> cause confusion once we have the 9.y.x branch.
> 
> I don't like option C because I think we need a stable, supported,
> passing the TCK Jakarta EE 9 release. Also, Jakarta EE 10 is meant to
> follow shortly after Jakarta EE 9 but what if it doesn't?
> 
> For me, the choice is between A and D. If Jakarta EE 10 is very soon
> after Jakarta EE 9 then I think option A is better. However, D isn't
> that far behind and as soon as Jakarta EE 10 doesn't follow shortly
> after Jakarta EE 9 I think D begins to look better. As I think about it,
> the EOL decision we make for Jakarta EE 9 support depends a lot on how
> quickly Jakarta EE 10 follows and I think D gives us more flexibility.
> Finally, D is more consistent with how we have done things in the past
> (4.1.x, 5.5.x, 8.5.x etc)
> 
> Thoughts?
> 
> Mark
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

[tomcat] branch 7.0.x updated (a78ab55 -> 981b50c)

[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 a78ab55  Prep for next version
 new fa58775  Remove duplicate mapping
 new 981b50c  Align MIME type mappings for embedded with those in 
conf/web.xml

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:
 conf/web.xml   |4 -
 .../catalina/startup/LocalStrings.properties   |1 +
 .../catalina/startup/MimeTypeMappings.properties   | 1025 
 java/org/apache/catalina/startup/Tomcat.java   |  216 +
 java/org/apache/tomcat/buildutil/Utils.java|   62 ++
 .../apache/tomcat/buildutil/translate/Import.java  |   32 +-
 .../catalina/startup/TestTomcatNoServer.java   |   91 ++
 webapps/docs/changelog.xml |9 +
 8 files changed, 1221 insertions(+), 219 deletions(-)
 create mode 100644 java/org/apache/catalina/startup/MimeTypeMappings.properties
 create mode 100644 java/org/apache/tomcat/buildutil/Utils.java
 create mode 100644 test/org/apache/catalina/startup/TestTomcatNoServer.java


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

[tomcat] 01/02: Remove duplicate mapping

[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 fa587753d13125573118cfd6bad46dce6088b857
Author: Mark Thomas 
AuthorDate: Tue Feb 11 11:44:38 2020 +

Remove duplicate mapping

Tomcat processes extension mappings in a case insensitive manner
---
 conf/web.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/conf/web.xml b/conf/web.xml
index c2e44d9..a24d10f 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -4636,10 +4636,6 @@
 application/x-compress
 
 
-Z
-application/x-compress
-
-
 z1
 application/x-zmachine
 


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

[tomcat] 02/02: Align MIME type mappings for embedded with those in conf/web.xml

[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 981b50c2bc44b3ae4130e846627c3761a36b6848
Author: Mark Thomas 
AuthorDate: Wed Dec 4 18:03:36 2019 +

Align MIME type mappings for embedded with those in conf/web.xml

Switch Tomcat embedded to loading MIME type mappings from a property
file generated from the default web.xml so the MIME type mappings are
consistent regardless of how Tomcat is started.
Add a test case to check that the two remain in sync.
---
 .../catalina/startup/LocalStrings.properties   |1 +
 .../catalina/startup/MimeTypeMappings.properties   | 1025 
 java/org/apache/catalina/startup/Tomcat.java   |  216 +
 java/org/apache/tomcat/buildutil/Utils.java|   62 ++
 .../apache/tomcat/buildutil/translate/Import.java  |   32 +-
 .../catalina/startup/TestTomcatNoServer.java   |   91 ++
 webapps/docs/changelog.xml |9 +
 7 files changed, 1221 insertions(+), 215 deletions(-)

diff --git a/java/org/apache/catalina/startup/LocalStrings.properties 
b/java/org/apache/catalina/startup/LocalStrings.properties
index 7e26451..ad59161 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -153,6 +153,7 @@ tomcat.addWebapp.conflictChild=Unable to deploy WAR at 
[{0}] to context path [{1
 tomcat.addWebapp.conflictFile=Unable to deploy WAR at [{0}] to context path 
[{1}] because of existing file [{2}]
 tomcat.baseDirMakeFail=Unable to create the directory [{0}] to use as the base 
directory
 tomcat.baseDirNotDir=The location [{0}] specified for the base directory is 
not a directory
+tomcat.defaultMimeTypeMappingsFail=Unable to load the default MIME types
 
 userConfig.database=Exception loading user database
 userConfig.deploy=Deploying web application for user [{0}]
diff --git a/java/org/apache/catalina/startup/MimeTypeMappings.properties 
b/java/org/apache/catalina/startup/MimeTypeMappings.properties
new file mode 100644
index 000..a043c5b
--- /dev/null
+++ b/java/org/apache/catalina/startup/MimeTypeMappings.properties
@@ -0,0 +1,1025 @@
+# 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.
+
+123=application/vnd.lotus-1-2-3
+3dml=text/vnd.in3d.3dml
+3ds=image/x-3ds
+3g2=video/3gpp2
+3gp=video/3gpp
+7z=application/x-7z-compressed
+aab=application/x-authorware-bin
+aac=audio/x-aac
+aam=application/x-authorware-map
+aas=application/x-authorware-seg
+abs=audio/x-mpeg
+abw=application/x-abiword
+ac=application/pkix-attr-cert
+acc=application/vnd.americandynamics.acc
+ace=application/x-ace-compressed
+acu=application/vnd.acucobol
+acutc=application/vnd.acucorp
+adp=audio/adpcm
+aep=application/vnd.audiograph
+afm=application/x-font-type1
+afp=application/vnd.ibm.modcap
+ahead=application/vnd.ahead.space
+ai=application/postscript
+aif=audio/x-aiff
+aifc=audio/x-aiff
+aiff=audio/x-aiff
+aim=application/x-aim
+air=application/vnd.adobe.air-application-installer-package+zip
+ait=application/vnd.dvb.ait
+ami=application/vnd.amiga.ami
+anx=application/annodex
+apk=application/vnd.android.package-archive
+appcache=text/cache-manifest
+application=application/x-ms-application
+apr=application/vnd.lotus-approach
+arc=application/x-freearc
+art=image/x-jg
+asc=application/pgp-signature
+asf=video/x-ms-asf
+asm=text/x-asm
+aso=application/vnd.accpac.simply.aso
+asx=video/x-ms-asf
+atc=application/vnd.acucorp
+atom=application/atom+xml
+atomcat=application/atomcat+xml
+atomsvc=application/atomsvc+xml
+atx=application/vnd.antix.game-component
+au=audio/basic
+avi=video/x-msvideo
+avx=video/x-rad-screenplay
+aw=application/applixware
+axa=audio/annodex
+axv=video/annodex
+azf=application/vnd.airzip.filesecure.azf
+azs=application/vnd.airzip.filesecure.azs
+azw=application/vnd.amazon.ebook
+bat=application/x-msdownload
+bcpio=application/x-bcpio
+bdf=application/x-font-bdf
+bdm=application/vnd.syncml.dm+wbxml
+bed=application/vnd.realvnc.bed
+bh2=application/vnd.fujitsu.oasysprs
+bin=application/octet-stream
+blb=application/x-blorb
+blorb=application/x-blorb
+bmi=application/vnd.bmi

[tomcat] branch 8.5.x updated (38a2f4e -> 085cd27)

[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 38a2f4e  Fix rare test failure.
 new 05a550a  Remove duplicate mapping
 new 085cd27  Align MIME type mappings for embedded with those in 
conf/web.xml

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:
 conf/web.xml   |4 -
 .../catalina/startup/LocalStrings.properties   |1 +
 .../catalina/startup/MimeTypeMappings.properties   | 1025 
 java/org/apache/catalina/startup/Tomcat.java   |  206 +---
 java/org/apache/tomcat/buildutil/Utils.java|   59 ++
 .../apache/tomcat/buildutil/translate/Import.java  |   32 +-
 .../catalina/startup/TestTomcatNoServer.java   |   92 ++
 webapps/docs/changelog.xml |5 +
 8 files changed, 1205 insertions(+), 219 deletions(-)
 create mode 100644 java/org/apache/catalina/startup/MimeTypeMappings.properties
 create mode 100644 java/org/apache/tomcat/buildutil/Utils.java
 create mode 100644 test/org/apache/catalina/startup/TestTomcatNoServer.java


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

[tomcat] 02/02: Align MIME type mappings for embedded with those in conf/web.xml

[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 085cd272221fdae5c8d65777bba4ef35f773c32b
Author: Mark Thomas 
AuthorDate: Wed Dec 4 18:03:36 2019 +

Align MIME type mappings for embedded with those in conf/web.xml

Switch Tomcat embedded to loading MIME type mappings from a property
file generated from the default web.xml so the MIME type mappings are
consistent regardless of how Tomcat is started.
Add a test case to check that the two remain in sync.
---
 .../catalina/startup/LocalStrings.properties   |1 +
 .../catalina/startup/MimeTypeMappings.properties   | 1025 
 java/org/apache/catalina/startup/Tomcat.java   |  206 +---
 java/org/apache/tomcat/buildutil/Utils.java|   59 ++
 .../apache/tomcat/buildutil/translate/Import.java  |   32 +-
 .../catalina/startup/TestTomcatNoServer.java   |   92 ++
 webapps/docs/changelog.xml |5 +
 7 files changed, 1205 insertions(+), 215 deletions(-)

diff --git a/java/org/apache/catalina/startup/LocalStrings.properties 
b/java/org/apache/catalina/startup/LocalStrings.properties
index 0b93147..5daf876 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -134,6 +134,7 @@ tomcat.addWebapp.conflictChild=Unable to deploy WAR at 
[{0}] to context path [{1
 tomcat.addWebapp.conflictFile=Unable to deploy WAR at [{0}] to context path 
[{1}] because of existing file [{2}]
 tomcat.baseDirMakeFail=Unable to create the directory [{0}] to use as the base 
directory
 tomcat.baseDirNotDir=The location [{0}] specified for the base directory is 
not a directory
+tomcat.defaultMimeTypeMappingsFail=Unable to load the default MIME types
 tomcat.homeDirMakeFail=Unable to create the directory [{0}] to use as the home 
directory
 
 userConfig.database=Exception loading user database
diff --git a/java/org/apache/catalina/startup/MimeTypeMappings.properties 
b/java/org/apache/catalina/startup/MimeTypeMappings.properties
new file mode 100644
index 000..a043c5b
--- /dev/null
+++ b/java/org/apache/catalina/startup/MimeTypeMappings.properties
@@ -0,0 +1,1025 @@
+# 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.
+
+123=application/vnd.lotus-1-2-3
+3dml=text/vnd.in3d.3dml
+3ds=image/x-3ds
+3g2=video/3gpp2
+3gp=video/3gpp
+7z=application/x-7z-compressed
+aab=application/x-authorware-bin
+aac=audio/x-aac
+aam=application/x-authorware-map
+aas=application/x-authorware-seg
+abs=audio/x-mpeg
+abw=application/x-abiword
+ac=application/pkix-attr-cert
+acc=application/vnd.americandynamics.acc
+ace=application/x-ace-compressed
+acu=application/vnd.acucobol
+acutc=application/vnd.acucorp
+adp=audio/adpcm
+aep=application/vnd.audiograph
+afm=application/x-font-type1
+afp=application/vnd.ibm.modcap
+ahead=application/vnd.ahead.space
+ai=application/postscript
+aif=audio/x-aiff
+aifc=audio/x-aiff
+aiff=audio/x-aiff
+aim=application/x-aim
+air=application/vnd.adobe.air-application-installer-package+zip
+ait=application/vnd.dvb.ait
+ami=application/vnd.amiga.ami
+anx=application/annodex
+apk=application/vnd.android.package-archive
+appcache=text/cache-manifest
+application=application/x-ms-application
+apr=application/vnd.lotus-approach
+arc=application/x-freearc
+art=image/x-jg
+asc=application/pgp-signature
+asf=video/x-ms-asf
+asm=text/x-asm
+aso=application/vnd.accpac.simply.aso
+asx=video/x-ms-asf
+atc=application/vnd.acucorp
+atom=application/atom+xml
+atomcat=application/atomcat+xml
+atomsvc=application/atomsvc+xml
+atx=application/vnd.antix.game-component
+au=audio/basic
+avi=video/x-msvideo
+avx=video/x-rad-screenplay
+aw=application/applixware
+axa=audio/annodex
+axv=video/annodex
+azf=application/vnd.airzip.filesecure.azf
+azs=application/vnd.airzip.filesecure.azs
+azw=application/vnd.amazon.ebook
+bat=application/x-msdownload
+bcpio=application/x-bcpio
+bdf=application/x-font-bdf
+bdm=application/vnd.syncml.dm+wbxml
+bed=application/vnd.realvnc.bed
+bh2=application/vnd.fujitsu.oasysprs
+bin=application/octet-stream
+blb=application/x-blorb
+blorb=application/x-blorb

[tomcat] 01/02: Remove duplicate mapping

[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 05a550a6295787a6fefb644722e69685b3d49673
Author: Mark Thomas 
AuthorDate: Tue Feb 11 11:44:38 2020 +

Remove duplicate mapping

Tomcat processes extension mappings in a case insensitive manner
---
 conf/web.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/conf/web.xml b/conf/web.xml
index 1aa1799..e8a5154 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -4652,10 +4652,6 @@
 application/x-compress
 
 
-Z
-application/x-compress
-
-
 z1
 application/x-zmachine
 


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

[tomcat] 01/02: Remove duplicate mapping

[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 ae4dfb46ad15eba98c9bd3af98676a13c4609ab4
Author: Mark Thomas 
AuthorDate: Tue Feb 11 11:44:38 2020 +

Remove duplicate mapping

Tomcat processes extension mappings in a case insensitive manner
---
 conf/web.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/conf/web.xml b/conf/web.xml
index 9c0a248..99d517d 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -4658,10 +4658,6 @@
 application/x-compress
 
 
-Z
-application/x-compress
-
-
 z1
 application/x-zmachine
 


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

[tomcat] 02/02: Align MIME type mappings for embedded with those in conf/web.xml

[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 57474259963f19466bdb5da8e22b8952e1dee604
Author: Mark Thomas 
AuthorDate: Wed Dec 4 18:03:36 2019 +

Align MIME type mappings for embedded with those in conf/web.xml

Switch Tomcat embedded to loading MIME type mappings from a property
file generated from the default web.xml so the MIME type mappings are
consistent regardless of how Tomcat is started.
Add a test case to check that the two remain in sync.
---
 .../catalina/startup/LocalStrings.properties   |1 +
 .../catalina/startup/MimeTypeMappings.properties   | 1025 
 java/org/apache/catalina/startup/Tomcat.java   |  206 +---
 java/org/apache/tomcat/buildutil/Utils.java|   59 ++
 .../apache/tomcat/buildutil/translate/Import.java  |   32 +-
 .../catalina/startup/TestTomcatNoServer.java   |   92 ++
 webapps/docs/changelog.xml |5 +
 7 files changed, 1205 insertions(+), 215 deletions(-)

diff --git a/java/org/apache/catalina/startup/LocalStrings.properties 
b/java/org/apache/catalina/startup/LocalStrings.properties
index 93d094a..c857b48 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -149,6 +149,7 @@ tomcat.addWebapp.conflictChild=Unable to deploy WAR at 
[{0}] to context path [{1
 tomcat.addWebapp.conflictFile=Unable to deploy WAR at [{0}] to context path 
[{1}] because of existing file [{2}]
 tomcat.baseDirMakeFail=Unable to create the directory [{0}] to use as the base 
directory
 tomcat.baseDirNotDir=The location [{0}] specified for the base directory is 
not a directory
+tomcat.defaultMimeTypeMappingsFail=Unable to load the default MIME types
 tomcat.homeDirMakeFail=Unable to create the directory [{0}] to use as the home 
directory
 tomcat.invalidCommandLine=Invalid command line arguments [{0}]
 tomcat.noContextClass=Failed to instantiate context class [{0}] for host [{1}] 
and url [{2}]
diff --git a/java/org/apache/catalina/startup/MimeTypeMappings.properties 
b/java/org/apache/catalina/startup/MimeTypeMappings.properties
new file mode 100644
index 000..a043c5b
--- /dev/null
+++ b/java/org/apache/catalina/startup/MimeTypeMappings.properties
@@ -0,0 +1,1025 @@
+# 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.
+
+123=application/vnd.lotus-1-2-3
+3dml=text/vnd.in3d.3dml
+3ds=image/x-3ds
+3g2=video/3gpp2
+3gp=video/3gpp
+7z=application/x-7z-compressed
+aab=application/x-authorware-bin
+aac=audio/x-aac
+aam=application/x-authorware-map
+aas=application/x-authorware-seg
+abs=audio/x-mpeg
+abw=application/x-abiword
+ac=application/pkix-attr-cert
+acc=application/vnd.americandynamics.acc
+ace=application/x-ace-compressed
+acu=application/vnd.acucobol
+acutc=application/vnd.acucorp
+adp=audio/adpcm
+aep=application/vnd.audiograph
+afm=application/x-font-type1
+afp=application/vnd.ibm.modcap
+ahead=application/vnd.ahead.space
+ai=application/postscript
+aif=audio/x-aiff
+aifc=audio/x-aiff
+aiff=audio/x-aiff
+aim=application/x-aim
+air=application/vnd.adobe.air-application-installer-package+zip
+ait=application/vnd.dvb.ait
+ami=application/vnd.amiga.ami
+anx=application/annodex
+apk=application/vnd.android.package-archive
+appcache=text/cache-manifest
+application=application/x-ms-application
+apr=application/vnd.lotus-approach
+arc=application/x-freearc
+art=image/x-jg
+asc=application/pgp-signature
+asf=video/x-ms-asf
+asm=text/x-asm
+aso=application/vnd.accpac.simply.aso
+asx=video/x-ms-asf
+atc=application/vnd.acucorp
+atom=application/atom+xml
+atomcat=application/atomcat+xml
+atomsvc=application/atomsvc+xml
+atx=application/vnd.antix.game-component
+au=audio/basic
+avi=video/x-msvideo
+avx=video/x-rad-screenplay
+aw=application/applixware
+axa=audio/annodex
+axv=video/annodex
+azf=application/vnd.airzip.filesecure.azf
+azs=application/vnd.airzip.filesecure.azs
+azw=application/vnd.amazon.ebook
+bat=application/x-msdownload
+bcpio=application/x-bcpio
+bdf=application/x-font-bdf
+bdm=application/vnd.syncml.dm+wbxml
+bed=application/vnd.realvnc.bed

[tomcat] branch 9.0.x updated (fe45e13 -> 5747425)

[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 fe45e13  Fix rare test failure.
 new ae4dfb4  Remove duplicate mapping
 new 5747425  Align MIME type mappings for embedded with those in 
conf/web.xml

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:
 conf/web.xml   |4 -
 .../catalina/startup/LocalStrings.properties   |1 +
 .../catalina/startup/MimeTypeMappings.properties   | 1025 
 java/org/apache/catalina/startup/Tomcat.java   |  206 +---
 java/org/apache/tomcat/buildutil/Utils.java|   59 ++
 .../apache/tomcat/buildutil/translate/Import.java  |   32 +-
 .../catalina/startup/TestTomcatNoServer.java   |   92 ++
 webapps/docs/changelog.xml |5 +
 8 files changed, 1205 insertions(+), 219 deletions(-)
 create mode 100644 java/org/apache/catalina/startup/MimeTypeMappings.properties
 create mode 100644 java/org/apache/tomcat/buildutil/Utils.java
 create mode 100644 test/org/apache/catalina/startup/TestTomcatNoServer.java


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

[tomcat] 02/02: Align MIME type mappings for embedded with those in conf/web.xml

[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 31be526af7bbf558b73264211d260c0398f264f6
Author: Mark Thomas 
AuthorDate: Wed Dec 4 18:03:36 2019 +

Align MIME type mappings for embedded with those in conf/web.xml

Switch Tomcat embedded to loading MIME type mappings from a property
file generated from the default web.xml so the MIME type mappings are
consistent regardless of how Tomcat is started.
Add the code to generate the properties file and a test case to check
that the two remain in sync.
---
 .../catalina/startup/LocalStrings.properties   |1 +
 .../catalina/startup/MimeTypeMappings.properties   | 1025 
 java/org/apache/catalina/startup/Tomcat.java   |  206 +---
 .../apache/tomcat/buildutil/MimeTypeMappings.java  |   73 ++
 java/org/apache/tomcat/buildutil/Utils.java|   59 ++
 .../apache/tomcat/buildutil/translate/Import.java  |   32 +-
 .../catalina/startup/TestTomcatNoServer.java   |   92 ++
 webapps/docs/changelog.xml |5 +
 8 files changed, 1278 insertions(+), 215 deletions(-)

diff --git a/java/org/apache/catalina/startup/LocalStrings.properties 
b/java/org/apache/catalina/startup/LocalStrings.properties
index 93d094a..c857b48 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -149,6 +149,7 @@ tomcat.addWebapp.conflictChild=Unable to deploy WAR at 
[{0}] to context path [{1
 tomcat.addWebapp.conflictFile=Unable to deploy WAR at [{0}] to context path 
[{1}] because of existing file [{2}]
 tomcat.baseDirMakeFail=Unable to create the directory [{0}] to use as the base 
directory
 tomcat.baseDirNotDir=The location [{0}] specified for the base directory is 
not a directory
+tomcat.defaultMimeTypeMappingsFail=Unable to load the default MIME types
 tomcat.homeDirMakeFail=Unable to create the directory [{0}] to use as the home 
directory
 tomcat.invalidCommandLine=Invalid command line arguments [{0}]
 tomcat.noContextClass=Failed to instantiate context class [{0}] for host [{1}] 
and url [{2}]
diff --git a/java/org/apache/catalina/startup/MimeTypeMappings.properties 
b/java/org/apache/catalina/startup/MimeTypeMappings.properties
new file mode 100644
index 000..a043c5b
--- /dev/null
+++ b/java/org/apache/catalina/startup/MimeTypeMappings.properties
@@ -0,0 +1,1025 @@
+# 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.
+
+123=application/vnd.lotus-1-2-3
+3dml=text/vnd.in3d.3dml
+3ds=image/x-3ds
+3g2=video/3gpp2
+3gp=video/3gpp
+7z=application/x-7z-compressed
+aab=application/x-authorware-bin
+aac=audio/x-aac
+aam=application/x-authorware-map
+aas=application/x-authorware-seg
+abs=audio/x-mpeg
+abw=application/x-abiword
+ac=application/pkix-attr-cert
+acc=application/vnd.americandynamics.acc
+ace=application/x-ace-compressed
+acu=application/vnd.acucobol
+acutc=application/vnd.acucorp
+adp=audio/adpcm
+aep=application/vnd.audiograph
+afm=application/x-font-type1
+afp=application/vnd.ibm.modcap
+ahead=application/vnd.ahead.space
+ai=application/postscript
+aif=audio/x-aiff
+aifc=audio/x-aiff
+aiff=audio/x-aiff
+aim=application/x-aim
+air=application/vnd.adobe.air-application-installer-package+zip
+ait=application/vnd.dvb.ait
+ami=application/vnd.amiga.ami
+anx=application/annodex
+apk=application/vnd.android.package-archive
+appcache=text/cache-manifest
+application=application/x-ms-application
+apr=application/vnd.lotus-approach
+arc=application/x-freearc
+art=image/x-jg
+asc=application/pgp-signature
+asf=video/x-ms-asf
+asm=text/x-asm
+aso=application/vnd.accpac.simply.aso
+asx=video/x-ms-asf
+atc=application/vnd.acucorp
+atom=application/atom+xml
+atomcat=application/atomcat+xml
+atomsvc=application/atomsvc+xml
+atx=application/vnd.antix.game-component
+au=audio/basic
+avi=video/x-msvideo
+avx=video/x-rad-screenplay
+aw=application/applixware
+axa=audio/annodex
+axv=video/annodex
+azf=application/vnd.airzip.filesecure.azf
+azs=application/vnd.airzip.filesecure.azs
+azw=application/vnd.amazon.ebook
+bat=application/x-msdownload
+bcpio=application/x-bcpio

[tomcat] branch master updated (ccab309 -> 31be526)

[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 ccab309  Fix rare test failure.
 new abf546e  Remove duplicate mapping
 new 31be526  Align MIME type mappings for embedded with those in 
conf/web.xml

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:
 conf/web.xml   |4 -
 .../catalina/startup/LocalStrings.properties   |1 +
 .../catalina/startup/MimeTypeMappings.properties   | 1025 
 java/org/apache/catalina/startup/Tomcat.java   |  206 +---
 .../apache/tomcat/buildutil/MimeTypeMappings.java  |   73 ++
 java/org/apache/tomcat/buildutil/Utils.java|   59 ++
 .../apache/tomcat/buildutil/translate/Import.java  |   32 +-
 .../catalina/startup/TestTomcatNoServer.java   |   92 ++
 webapps/docs/changelog.xml |5 +
 9 files changed, 1278 insertions(+), 219 deletions(-)
 create mode 100644 java/org/apache/catalina/startup/MimeTypeMappings.properties
 create mode 100644 java/org/apache/tomcat/buildutil/MimeTypeMappings.java
 create mode 100644 java/org/apache/tomcat/buildutil/Utils.java
 create mode 100644 test/org/apache/catalina/startup/TestTomcatNoServer.java


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

[tomcat] 01/02: Remove duplicate mapping

[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 abf546ef087f589ea2386cd2374a3b417f72ee18
Author: Mark Thomas 
AuthorDate: Tue Feb 11 11:44:38 2020 +

Remove duplicate mapping

Tomcat processes extension mappings in a case insensitive manner
---
 conf/web.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/conf/web.xml b/conf/web.xml
index cce6b8f..2d08297 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -4663,10 +4663,6 @@
 application/x-compress
 
 
-Z
-application/x-compress
-
-
 z1
 application/x-zmachine
 


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

Re: UTF-8 properties files and BOMs

[Mark Thomas]

On 10/02/2020 20:58, Christopher Schultz wrote:
> All,
> 
> I've recently begun making a change to my application's resource
> bundles, converting them into UTF-8 for readability and converting
> them to ISO-8859-1 during my build process to make ResourceBundle happy.
> 
> I have everything working, except that Eclipse still thinks that my
> files ought to be ISO-8859-1 and ruins them when I load them.
> Sometimes, it's very obvious and that's not a problem: a developer
> will see that and fix it before continuing. But some files are only
> *slightly* broken by this and someone might make a mistake.

I don't think we have seen this with Tomcat. Or have we (since we
switched to UTF-8)?

The thing that bugged me was having to manually switch properties files
to UTF-8 to view them "properly". You mail motivated me to track down
where I can change that in Eclipse:

Window->Preferences->General->Content Types

and I have changed Java properties files to use UTF-8. So that is my
personal niggle fixed. Thanks for the motivation.

> NOTE: We don't keep Eclipse settings in revision-control, so I can't
> modify everyone's Eclipse configuration. We are using svn and
> svn:mime-type is correctly set for these files; Eclipse just ignores tha
> t.

I've seen that too. While I found it rather annoying, it wasn't annoying
enough to try and find a fix as that looked like it would require
patching Eclipse and/or the svn plug-in.

> Anyway, I found that adding a UTF-8 BOM to the beginning of the file
> fixes that issue and Eclipse does the right thing.

Ah. So Eclipse *is* doing content scanning. Interesting.

> As a sanity check. I looked at how Tomcat's files are laid-out and I
> don't see any BOMs.

Correct. The only files in the code base that should have BOMs at the
moment are the ones in the test web application (under bug49nnn) for
testing the default Servlet's handling of files with BOMs.

> Should we add BOMs? Is there any reason NOT to use a BOM? These are
> file types that are officially supposed to be ISO-8859-1 but everyone
> wants to handle them differently, so I think adding BOMs might be a
> good idea so that editors are always informed of exactly what's happenin
> g.
> 
> WDYT?

I was concerned that adding a BOM would cause problems when reading
property files. I've seen reports of that with Java in the past. A quick
test suggests that the issue is no longer present with latest Java 8.

With the use of POEditor and the import/export scripts we have, it would
be unusual for someone to be editing any of the property files where
UTF-8 vs ISO-8859-1 matters. Thinking about it a little more, there
would be a need to do this to edit non-English strings in the older
branches where the key doesn't exist in the latest code. That strikes me
as a fairly rare use case.

My other worry is that some editors will fail to handle the BOM
correctly and we'll end up causing more issues than we solve. I've
little basis for that worry other than (possibly out of date) experience.

Overall, I guess I am -0 on adding BOMs.

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

[Keiichi Fujino]

2020年2月6日(木) 7:49 Mark Thomas :

> 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
>
> +1


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

-- 
Keiichi.Fujino

Re: [VOTE] Release Apache Tomcat 9.0.31

[Keiichi Fujino]

2020年2月6日(木) 6:27 Mark Thomas :

> 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
>
> +1

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

-- 
Keiichi.Fujino

Re: [VOTE] Release Apache Tomcat 10.0.0.0-M1

[Keiichi Fujino]

2020年2月6日(木) 4: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.
>
> 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
>
 +1


> 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
>
>

-- 
Keiichi.Fujino

[CONF] Apache Tomcat > Tomcat Versions

[Violeta Georgieva Georgieva (Confluence)]

Title: Message Title



 
 
 
There's 1 new edit on this page 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Tomcat Versions 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Violeta Georgieva Georgieva edited this page 
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Here's what changed: 
 
 
 
 
 
 
 
 
 
 
 ... The "Process" field in the following tables documents what development model is accepted by that project, either Review-Then-Commit or Commit-Then-Review. For RTC model the changes are first proposed in the STATUS.txt file in the root of the project and have to gain at least 3 "+1" votes before being applied. The project members have agreed on several exceptions from the RTC rule (documented below). Tomcat 9.0.x 
 
 
 
 
 
 
 
 
  Spec versions:   
  Servlet 4.0, JSP 2.3, EL 3.0, WebSocket 1.1, JASPIC 1.1   
 
 
  Stable:   
  Yes   
 
 
  Enhancements:   
  Yes   
 
 
  Bug Fixes:   
  Yes   
 
 
  Security Fixes:   
  Yes   
 
 
  Releases:   
  Yes   
 
 
  Release Manager:   
  Mark Thomas (markt)   
 
 
  Process:   
  CTR   
 
 
  Listed on download pages:   
  Yes   
 
 
 
 Tomcat 8.5.x 
 
 
 
 
  Spec versions:   
  Servlet 3.1, JSP 2.3, EL 3.0, WebSocket 1.1, JASPIC 1.1   
 
 
  Stable:   
  Yes   
 
 
  Enhancements:   
  Yes   
 
 
  Bug Fixes:   
  Yes   
 
 
  Security Fixes:   
  Yes   
 
 
  Releases:   
  Yes   
 
 
  Release Manager:   
  Mark Thomas (markt)   
 
 
  Process:   
  CTR   
 
 
  Listed on download pages:   
  Yes   
 
 
 
 Tomcat 8.0.x 
 
 
 
 
 
 
 
 
  Spec versions:   
  Servlet 3.1, JSP 2.3, EL 3.0, WebSocket 1.1   
 
 
  Stable:   
  Yes   
 
 
  Enhancements:   
 
 
 
Yes 
 
 
 
  Highly unlikely   
 
 
  Bug Fixes:   
 
 
 
Yes 
 
 
 
  Highly unlikely   
 
 
  Security Fixes:   
 
 
 
Yes 
 
 
 
  Highly unlikely   
 
 
  Releases:   
 
 
 
Yes 
 
 
 
  Highly unlikely   
 
 
  Release Manager:   
  Violeta Georgieva (violetagg)   
 
 
  Process:   
  CTR   
 
 
  Listed on download pages:   
 
 
 
Yes 
 
 
 
  No   
 
 
 
 Tomcat 7.0.x 
 
 
 
 
 
 
 
 
  Spec versions:   
  Servlet 3.0, JSP 2.2, EL 2.2, WebSocket 1.1   
 
 
  Stable:   
  Yes   
 
 
  Enhancements:   
  Yes   
 
 
  Bug Fixes:   
  Yes   
 
 
  Security Fixes:   
  Yes   
 
 
  Releases:   
  Yes   
 
 
  Release Manager:   
  Violeta Georgieva (violetagg)   
 
 
  Process:   
  CTR   
 
 
  Listed on download pages:   
  Yes   
 
 
 
 Tomcat 6.0.x 
 
 
 
 
 
 
 
 
  Spec versions:   
  Servlet 2.5, JSP 2.1   
 
 
  Stable:   
  Yes   
 
 
  Enhancements:   
  Highly unlikely   
 
 
  Bug Fixes:   
  Highly unlikely   
 
 
  Security Fixes:   
  Highly unlikely   
 
 
  Releases:   
  Highly unlikely   
 
 
  Release Manager:   
  Violeta Georgieva (violetagg)   
 
 
  Process:   
  CTR   
 
 
  Listed on download pages:   
  No   
 
 
 
 Tomcat 5.5.x 
 
 
 
 
  Spec versions:   
  Servlet 2.4, JSP 2.0   
 
 
  Stable:   
  Yes   
 
 
  Enhancements:   
  Highly unlikely   
 
 
  Bug Fixes:   
  Highly unlikely   
 
 
  Security Fixes:   
  Highly unlikely   
 
 
  Releases:   
  Highly unlikely   
 
 
  Release Manager:   
  Filip Hanik (fhanik)   
 
 
  Process:   
  CTR   
 
 
  Listed on download pages:   
  No   
 
 
 
 Tomcat 4.1.x 
 
 
 
 
  Spec versions:   
  Servlet 2.3, JSP 1.2   
 
 
  Stable:   
  Yes   
 
 
  Enhancements:   
  Highly unlikely   
 
 
  Bug Fixes:   
  Highly unlikely   
 
 
  Security Fixes:   
  Highly unlikely   
 
 
  Releases:   
  Highly unlikely   
 
 
  Release Manager:   
  Mark Thomas (markt)   
 
 
  Process:   
  CTR   
 
 
  Listed on download pages:   
  No   
 
 
 
 Tomcat 3.3.x 
 
 
 
 
  Spec versions:   
  Servlet 2.2, JSP 1.1   
 
 
  Stable:   
  Yes   
 
 
  Enhancements:   
  Highly unlikely   
 
 
  Bug Fixes:   
  Highly unlikely   
 
 
  Security Fixes:   
  Highly unlikely   
 
 
  Releases:   
  Highly unlikely   
 
 
  Release Manager:   
  Bill Barker (billbarker)   
 
 
  Process:   
  CTR   
 
 
  Listed on download pages:   
  No   
 
 
 
 Unsupported versions The following versions are no longer supported. The source is still available from SVN and both source and binary downloads are available from the archives. ...  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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: Prep for next version

[violetagg]

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

violetagg 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 a78ab55  Prep for next version
a78ab55 is described below

commit a78ab55b23eff873f62e0c25230917a61844e9bb
Author: Violeta Georgieva 
AuthorDate: Tue Feb 11 10:56:48 2020 +0200

Prep for next version
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index d6ff7dc..0cb0654 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=7
 version.minor=0
-version.build=100
+version.build=101
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index bff356f..63047a3 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -35,7 +35,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=7.0.100
+maven.asf.release.deploy.version=7.0.101
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0d797c7..747b573 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -59,6 +59,8 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
+
+
 
   
 


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

[VOTE] Release Apache Tomcat 7.0.100

[Violeta Georgieva]

The proposed Apache Tomcat 7.0.100 release is now available for voting.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.100/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1247/
The git tag is:
https://github.com/apache/tomcat/tree/7.0.100
a1ea109bf367ad32361396348845ffd6e524d115

The proposed 7.0.100 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 7.0.100 Stable

Regards,
Violeta

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDescription:Vote Tomcat 7.0.100Deployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.7.0_80; Windows 8.1 6.3)""userId" = "violetagg""ip" = "78.83.99.114"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/7.0.100/tomcat-i18n-de-7.0.100.pom(SHA1: 0bceb09c6a57581f6d8d13a45846b9a940eac11d)/org/apache/tomcat/tomcat-i18n-de/7.0.100/tomcat-i18n-de-7.0.100.pom.asc(SHA1: c58ade19db04c6021c1fa7228be2aea5d274fa83)/org/apache/tomcat/tomcat-i18n-de/7.0.100/tomcat-i18n-de-7.0.100.jar.asc(SHA1: f768ed11bcefb6baac432674373b4d6115a53ccb)/org/apache/tomcat/tomcat-i18n-de/7.0.100/tomcat-i18n-de-7.0.100.jar(SHA1: fffa33704550da69a20c717d85c66846cdae9960)/org/apache/tomcat/tomcat-juli/7.0.100/tomcat-juli-7.0.100.jar.asc(SHA1: 06c4048213429be24bc82b576bfe3387683c2189)/org/apache/tomcat/tomcat-juli/7.0.100/tomcat-juli-7.0.100.pom(SHA1: bb2b1ea348b5f8370b1ea6315cfdc82153861849)/org/apache/tomcat/tomcat-juli/7.0.100/tomcat-juli-7.0.100.jar(SHA1: 1f25b594981bb00d113ca67d3d4e6ad0be5d1de4)/org/apache/tomcat/tomcat-juli/7.0.100/tomcat-juli-7.0.100-sources.jar.asc(SHA1: 4bd1b4f1948bbc8f5b2314f603eb434ed69bb7f8)/org/apache/tomcat/tomcat-juli/7.0.100/tomcat-juli-7.0.100-sources.jar(SHA1: 281c30ebb51327611cb2533848a2c91a71c1644f)/org/apache/tomcat/tomcat-juli/7.0.100/tomcat-juli-7.0.100.pom.asc(SHA1: dfb7bbdbafdf107836b93cbc1c1b20bc56f09496)/org/apache/tomcat/tomcat-util/7.0.100/tomcat-util-7.0.100-sources.jar.asc(SHA1: 96073d783a3bc7c299b3666874dd84c1cd1b8022)/org/apache/tomcat/tomcat-util/7.0.100/tomcat-util-7.0.100-sources.jar(SHA1: cb0da867bb09eb16485f4d8bc6c9343006680694)/org/apache/tomcat/tomcat-util/7.0.100/tomcat-util-7.0.100.pom(SHA1: 0ada8c476934d745be70e1915e4b5603807d952a)/org/apache/tomcat/tomcat-util/7.0.100/tomcat-util-7.0.100.jar.asc(SHA1: 9bed2946f35499cf9d0b0e5d1f36213889b3347b)/org/apache/tomcat/tomcat-util/7.0.100/tomcat-util-7.0.100.pom.asc(SHA1: 0a33d56205c7d2d714d2ab0a68c40747893f53bd)/org/apache/tomcat/tomcat-util/7.0.100/tomcat-util-7.0.100.jar(SHA1: b618dde85875ceadc165bb8b6ae2efa276af6df6)/org/apache/tomcat/tomcat-catalina/7.0.100/tomcat-catalina-7.0.100-sources.jar.asc(SHA1: 6db9576e15cff31a334b0d500b1383fdfc340308)/org/apache/tomcat/tomcat-catalina/7.0.100/tomcat-catalina-7.0.100.jar.asc(SHA1: bfb134110932dae85d4499c28a32b316fcc8cf40)/org/apache/tomcat/tomcat-catalina/7.0.100/tomcat-catalina-7.0.100.jar(SHA1: 74d5e3edc692ac7eacfd1e4ec313dd6466fb471c)/org/apache/tomcat/tomcat-catalina/7.0.100/tomcat-catalina-7.0.100.pom(SHA1: f11dcfa167fada23d1fe1328f1c04cd2dedc30c9)/org/apache/tomcat/tomcat-catalina/7.0.100/tomcat-catalina-7.0.100-sources.jar(SHA1: 90d2d9aca01663692dd6e568a85ff800dc9943f4)/org/apache/tomcat/tomcat-catalina/7.0.100/tomcat-catalina-7.0.100.pom.asc(SHA1: 484e5162d68f50ebdba302068c20f7aacd5bd83d)/org/apache/tomcat/tomcat-catalina-ws/7.0.100/tomcat-catalina-ws-7.0.100.jar.asc(SHA1: 069a73cc86e4eadd5cb06014a5a5fbede2243e44)/org/apache/tomcat/tomcat-catalina-ws/7.0.100/tomcat-catalina-ws-7.0.100-sources.jar.asc(SHA1: 2c02c918cb2e442264b6639d6f50eaf5daae3c17)/org/apache/tomcat/tomcat-catalina-ws/7.0.100/tomcat-catalina-ws-7.0.100.pom.asc(SHA1: 588f407457250d8a3097404d03e65d9aec30eb51)/org/apache/tomcat/tomcat-catalina-ws/7.0.100/tomcat-catalina-ws-7.0.100.pom(SHA1: b1f5df96137fa3694f0789a3a3c7d0722e61d6ee)/org/apache/tomcat/tomcat-catalina-ws/7.0.100/tomcat-catalina-ws-7.0.100.jar(SHA1: 779a6350dae8c6e8b6a2aeb72d3035c77498bd7a)/org/apache/tomcat/tomcat-catalina-ws/7.0.100/tomcat-catalina-ws-7.0.100-sources.jar(SHA1: a0e7804a46e72b670f8d9f003f02d5c0afb1f083)/org/apache/tomcat/tomcat-i18n-fr/7.0.100/tomcat-i18n-fr-7.0.100.pom.asc(SHA1: 14a92fc5967d4127eeb9f210bed4aad942ba32e3)/org/apache/tomcat/tomcat-i18n-fr/7.0.100/tomcat-i18n-fr-7.0.100.jar.asc(SHA1: f83999c8da408ec689c0e91e3cac2c31ba6b48eb)/org/apache/tomcat/tomcat-i18n-fr/7.0.100/tomcat-i18n-fr-7.0.100.jar(SHA1: d9d8559af73215049703e997820738e2e7ac1c84)/org/apache/tomcat/tomcat-i18n-fr/7.0.100/tomcat-i18n-fr-7.0.100.pom(SHA1: 2978fd2723357fedf989df34a0e74104c4e50bdd)/org/apache/tomcat/tomcat-jdbc/7.0.100/tomcat-jdbc-7.0.100.jar(SHA1: 7b5f20536826567fdbea52081cf37ea101e65656)/org/apache/tomcat/tomcat-jdbc/7.0.100/tomcat-jdbc-7.0.100-sources.jar.asc(SHA1: 06db9e3bb3d1b88ae0f920158f3ff1fe2d14541c)/org/apache/tomcat/tomcat-jdbc/7.0.100/tomcat-jdbc-7.0.100.pom(SHA1: 9d437ae195d0d33889c984dc837d9c9358032e11)/org/apache/tomcat/tomcat-jdbc/7.0.100/tomcat-jdbc-7.0.100-sources.jar(SHA1: 189f4a645f42f11bb28afbca1ca026c0c878603c)/org/apache/tomcat/tomcat-jdbc/7.0.100/tomcat-jdbc-7.0.100.pom.asc(SHA1: 537a18bfcd4ece77cd6f6baebcd6fdd873c145f9)/org/apache/tomcat/tomcat-jdbc/7.0.100/tomcat-jdbc-7.0.100.jar.asc(SHA1: b895a1dd242021335f1457f5cafc83de9a78942b)/org/apache/tomcat/embed/tomcat-embed-logging-log4j/7.0.100/tomcat-embed-logging-log4j-7.0.100.pom(SHA1: 

svn commit: r37989 [1/2] - in /dev/tomcat/tomcat-7/v7.0.100: ./ bin/ bin/embed/ bin/extras/ src/

[violetagg]

Author: violetagg
Date: Tue Feb 11 09:03:11 2020
New Revision: 37989

Log:
Stage Tomcat 7.0.100

Added:
dev/tomcat/tomcat-7/v7.0.100/
dev/tomcat/tomcat-7/v7.0.100/KEYS
dev/tomcat/tomcat-7/v7.0.100/README.html
dev/tomcat/tomcat-7/v7.0.100/RELEASE-NOTES
dev/tomcat/tomcat-7/v7.0.100/bin/
dev/tomcat/tomcat-7/v7.0.100/bin/README.html
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100-deployer.tar.gz.asc

dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100-deployer.tar.gz.sha512
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100-deployer.zip   (with 
props)
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100-deployer.zip.asc
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100-deployer.zip.sha512
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100-fulldocs.tar.gz.asc

dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100-windows-x64.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100-windows-x64.zip.asc

dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100-windows-x64.zip.sha512
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100-windows-x86.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100-windows-x86.zip.asc

dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100-windows-x86.zip.sha512
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100.exe   (with props)
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100.exe.asc
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100.exe.sha512
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100.tar.gz   (with props)
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100.tar.gz.sha512
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100.zip   (with props)
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100.zip.asc
dev/tomcat/tomcat-7/v7.0.100/bin/apache-tomcat-7.0.100.zip.sha512
dev/tomcat/tomcat-7/v7.0.100/bin/embed/
dev/tomcat/tomcat-7/v7.0.100/bin/embed/apache-tomcat-7.0.100-embed.tar.gz   
(with props)

dev/tomcat/tomcat-7/v7.0.100/bin/embed/apache-tomcat-7.0.100-embed.tar.gz.asc

dev/tomcat/tomcat-7/v7.0.100/bin/embed/apache-tomcat-7.0.100-embed.tar.gz.sha512
dev/tomcat/tomcat-7/v7.0.100/bin/embed/apache-tomcat-7.0.100-embed.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.100/bin/embed/apache-tomcat-7.0.100-embed.zip.asc

dev/tomcat/tomcat-7/v7.0.100/bin/embed/apache-tomcat-7.0.100-embed.zip.sha512
dev/tomcat/tomcat-7/v7.0.100/bin/extras/
dev/tomcat/tomcat-7/v7.0.100/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-7/v7.0.100/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-7/v7.0.100/bin/extras/catalina-jmx-remote.jar.sha512
dev/tomcat/tomcat-7/v7.0.100/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-7/v7.0.100/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-7/v7.0.100/bin/extras/catalina-ws.jar.sha512
dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli-adapters.jar   (with 
props)
dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli-adapters.jar.asc
dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli-adapters.jar.sha512
dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli.jar   (with props)
dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli.jar.asc
dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli.jar.sha512
dev/tomcat/tomcat-7/v7.0.100/src/
dev/tomcat/tomcat-7/v7.0.100/src/apache-tomcat-7.0.100-src.tar.gz   (with 
props)
dev/tomcat/tomcat-7/v7.0.100/src/apache-tomcat-7.0.100-src.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.100/src/apache-tomcat-7.0.100-src.tar.gz.sha512
dev/tomcat/tomcat-7/v7.0.100/src/apache-tomcat-7.0.100-src.zip   (with 
props)
dev/tomcat/tomcat-7/v7.0.100/src/apache-tomcat-7.0.100-src.zip.asc
dev/tomcat/tomcat-7/v7.0.100/src/apache-tomcat-7.0.100-src.zip.sha512

Added: dev/tomcat/tomcat-7/v7.0.100/KEYS
==
--- dev/tomcat/tomcat-7/v7.0.100/KEYS (added)
+++ dev/tomcat/tomcat-7/v7.0.100/KEYS Tue Feb 11 09:03:11 2020
@@ -0,0 +1,650 @@
+This file contains the PGP keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate 

svn commit: r37989 [2/2] - in /dev/tomcat/tomcat-7/v7.0.100: ./ bin/ bin/embed/ bin/extras/ src/

[violetagg]

Added: dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli-adapters.jar.sha512
==
--- dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli-adapters.jar.sha512 
(added)
+++ dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli-adapters.jar.sha512 Tue 
Feb 11 09:03:11 2020
@@ -0,0 +1 @@
+f408ff571644bc0199bb6df854dd138893de1e73c30822d5c8d5fb6d0ce5532af71217e6abae72b7869f83679952790c4f36e485540246e2baee8e96d6967abe
 *tomcat-juli-adapters.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli.jar
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli.jar
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli.jar.asc
==
--- dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli.jar.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli.jar.asc Tue Feb 11 
09:03:11 2020
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEcT2oi+UJEVNf5xb1IIsKsdYwEccFAl5CZs0ACgkQIIsKsdYw
+EcdflhAAnyT5zWCoo62WWcmizs9PqDFwrOKLGG2WbQmB8fbp6XMbpjJI4xmlcjlk
+DfHyeLU9qYpqQIC/l+aEX1sqqI6PVkuc9aADuSjQrTpCZXOTy/Vl7RmZRcookBHN
+mw3V01dH3KjlnqkE4y7tlO6RVwB61z7zZ0xELuZgCnZfyDD0Bkr+4OfwVCpJtKqc
+hVbV/SDU1JEYgecUbboAZAeqKdP9fn5heFc9GhqaucQa1Y+roUzjTS6ktGHDlLFc
+gbJRkKOiCKv0jlZWgZBu5OgVcJ9nKW2ThlCyZysJANz97QFk+UYwukN2CZWQtxhm
+ZIC0k4RrBOEOnb66BBPFg9EKX5hADqNwIWR1//RabE6ZMfQ0sjDbDupCRYtzbGyl
+yaTkS4Jq6X/0E/99W1yWQK3JE4uHrDH3TPbttgWDqXDbD4fatyITKJ5FHSjPV2rA
+5C9MG3LpwI9ChJNX27TItLSTDjK4rYxTXrw5WEBJ9r6HfkjxP5bAMmmIR8ISGbQZ
+Emr3MmsZST5SmmrwfZhOV7LaDc9RHybUAXN2jlfkgrtonj3ulAwtkgCuTXvhoPlw
+Ote3LvPZijKor+PDK+Ij6AEgMaqcT0g/izelNbgS/T5BufgbDAoHMMfNfXcziFSg
+6wdflFudgffVpT1jTmI/9iNlPVQeH+0xhL3DxVxWyX/N3a1QlKw=
+=xovc
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli.jar.sha512
==
--- dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli.jar.sha512 (added)
+++ dev/tomcat/tomcat-7/v7.0.100/bin/extras/tomcat-juli.jar.sha512 Tue Feb 11 
09:03:11 2020
@@ -0,0 +1 @@
+28c57c796234079a95b9d56453ef44b5745ea6205f0a1c47027b6246816e7977c40443c3921a702f88cd9a2c07b20eef06985c70c612b3d2c107173d07b55c45
 *tomcat-juli.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.100/src/apache-tomcat-7.0.100-src.tar.gz
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.100/src/apache-tomcat-7.0.100-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-7/v7.0.100/src/apache-tomcat-7.0.100-src.tar.gz.asc
==
--- dev/tomcat/tomcat-7/v7.0.100/src/apache-tomcat-7.0.100-src.tar.gz.asc 
(added)
+++ dev/tomcat/tomcat-7/v7.0.100/src/apache-tomcat-7.0.100-src.tar.gz.asc Tue 
Feb 11 09:03:11 2020
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEcT2oi+UJEVNf5xb1IIsKsdYwEccFAl5CaHwACgkQIIsKsdYw
+EcftABAAmd1KDHY3yOGNGGk6hmqd1bfvXNb6mjIwSR9lvdXivbRBbUrYFt+TbmGT
+dXVuReMM0kQ5sqsNR9k1P+F6XvdAPGkovVvpBKBQpUJljmFFPu/epctl+KM2oS5a
+AY3jxruv1RCOGLcL7f+IcLa/9syFzrtf3Az4pgiSk1V3pZp3i+JoPdgxJ27gT8Fj
+QD5z2LUFrdaa1gMqqmPDwF6+KNm44IW6JryuDjhtHS2dGd5LH3m3ykGiLmr0Eo9j
+0kZwh8ADX7whe4kLPVpJoRD/VspqPe6EmsG4yA1De/undvdOCMSTwfAlZSkWCs/x
+b0D1kI6YDr/H8o/Goyl8N/U5h5+ewYJDHbXWmKtaASyT3fgAi4oEA2HNQn4cjiA+
+AdaCoB58z4qoBmnD1taAp6UzPw/8dcQL9vbGepOOtLO7+maiAcTVRxRNdL/LOUHq
+PUQQjWrh3y+XzB86F7TODgjJZw/9m6uxfrSX2trH+4HM76NJqBp3yFh6CNC/ZJBn
+Q7RsWnPzLE/CohqA/Zcbjs7bdwKhPZJ8N1NA3VlgWTwozNodSjxQN0Afo6BjLIs4
+roIPeqFZb0jdMLMrGa28B1jegJ8QuVSQoMJDsl8r2wevU1hebELXis/qZSGpmxW4
+RnEAmr31Sa1m0EO3SV9bkS9iaWeLLVmauw83s3kADXxdXCQmnW8=
+=6Bfw
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.100/src/apache-tomcat-7.0.100-src.tar.gz.sha512
==
--- dev/tomcat/tomcat-7/v7.0.100/src/apache-tomcat-7.0.100-src.tar.gz.sha512 
(added)
+++ dev/tomcat/tomcat-7/v7.0.100/src/apache-tomcat-7.0.100-src.tar.gz.sha512 
Tue Feb 11 09:03:11 2020
@@ -0,0 +1 @@
+53ef64c64263d0f25d72ed179bd7b7beed3f73cd63010988ba740ff7328b00a5ec09fe1d4575188ecacf258c891e022a0f1ae07d2957d9830a56881170bb1a57
 *apache-tomcat-7.0.100-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.100/src/apache-tomcat-7.0.100-src.zip
==
Binary file - no diff available.

Propchange: 

[tomcat] tag 7.0.100 created (now a1ea109)

[violetagg]

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

violetagg pushed a change to tag 7.0.100
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at a1ea109  (commit)
This tag includes the following new commits:

 new a1ea109  Tag 7.0.100

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



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

[tomcat] 01/01: Tag 7.0.100

[violetagg]

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

violetagg pushed a commit to tag 7.0.100
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit a1ea109bf367ad32361396348845ffd6e524d115
Author: Violeta Georgieva 
AuthorDate: Tue Feb 11 00:25:24 2020 -0800

Tag 7.0.100
---
 build.properties.default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.properties.default b/build.properties.default
index d6ff7dc..4130413 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=7
 version.minor=0
 version.build=100
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Source control flags -
 git.branch=7.0.x


-
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: checkstyle

[violetagg]

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

violetagg 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 d5dd34a  checkstyle
d5dd34a is described below

commit d5dd34aaf3c56dca57ec70667d89442d336db152
Author: Violeta Georgieva 
AuthorDate: Tue Feb 11 10:16:22 2020 +0200

checkstyle
---
 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 2a4a3c4..0d797c7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -175,7 +175,7 @@
 API. (markt)
   
   
-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