Re: [tomcat-native] 01/02: Minimum OpenSSl version is 3.0.0 is keylog callback is always available

2022-06-01 Thread Rémy Maucherat 
On Tue, May 31, 2022 at 8:02 PM Mark Thomas  wrote:
>
> On 31/05/2022 17:59, Rémy Maucherat wrote:
> > On Tue, May 31, 2022 at 6:48 PM Mark Thomas  wrote:
>
> 
>
> >> On that topic, I originally made the decision to keep LibreSSL support
> >> when I thought that 10.1.x would required Tomcat Native 2.0.x. The plan
> >> has since shifted and 10.1.x will ship with Tomcat Native 2.0.x but will
> >> still be able to use (a sufficiently recent) Tomcat Native 1.2.x. With
> >> that in mind, do we want to keep LibreSSL support in Tomcat Native 2.0.x?
> >
> > If tomcat-native 2.0 is fully aligned with what the Panama code does
> > (so no LibreSSL), it would be better for a future transition to it.
> > OTOH, it would force supporting 1.2 for (much) longer.
>
> Hmm. Tricky.
>
> If we assume that we need to support Tomcat Native 1.x until EOL of
> 9.0.x (due to the o.a.t.u.jni package) the we will be supporting 1.x for
> (best guess) until 2028 or so.
>
> OpenSSL 1.1.1 is EOL 2023-09-11 so there is a 4/5 year gap there.
> However, various distributions are committed to supporting OpenSSL 1.1.1
> for much longer.
>
> Looking at the various timescales, I think we should be helpful to the
> downstream distributions where we can but they are going to have to take
> on some of the maintenance work for their LTS distributions once OpenSSL
> 1.1.1 reaches EOL.
>
> So that starts to look like 1.3.x (built with OpenSSL 3.0.x) around the
> middle of next year. That should be good to Sept 2026. Not sure what
> we'd for the last few years of 9.0.x. 1.4.x built on whatever the new
> OpenSSL LTS is?
>
> Then what do we do with LibreSSL? Maintain support in the 1.x branch?
>
> Given the direction of travel (towards Panama and using OpenSSL
> directly) how much effort do we want to put into LibreSSL support?
>
> Do we want to announce an early EOL for the deprecated parts of the
> o.a.t.u.jni package with a view to removing them during the lifetime of
> 8.5.x and 9.0.x? That would simplify planning (Tomcat Native 1.2.x would
> EOL at the same time). But it would be highly unusual for us to do that
> and could cause breakage with a point release.
>
> What about LibreSSL? Are we looking towards a panama module for LibreSSL
> and then some glue code so you can swap between panama modules for
> different TLS native libraries?
>
> Lots of questions there. Nothing jumps out at me as the "obvious" plan.
> Thoughts?

Technically right now, the Panama code works with OpenSSL 1.1.1 (but
not 1.1.0), since that's what I was using on my Fedora 35 (Fedora 36
now uses OpenSSL 3.0). OTOH, by the time this code is supported, 3.0
(or more) seems like a more realistic target as we're not going to say
that it supports EOLed versions.

I believe it is possible to support 1.1.1 in tomcat-native 2.0, since
all the useful new init and TLS 1.3 capabilities are in place. I'm not
sure LibreSSL has these init changes which is why it's a problem to
support it with Panama (it's pretty verbose and error prone, also the
calls might well go away in OpenSSL eventually since they are not used
anymore).

Rémy

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

[tomcat] branch 10.0.x updated: Fix IDE warnings

2022-06-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new fd4d8e377a Fix IDE warnings
fd4d8e377a is described below

commit fd4d8e377ae00ff9ab579429e4cd8e058e60a753
Author: Mark Thomas 
AuthorDate: Wed Jun 1 09:12:36 2022 +0100

Fix IDE warnings
---
 java/org/apache/catalina/core/AprLifecycleListener.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java 
b/java/org/apache/catalina/core/AprLifecycleListener.java
index ea7b421a37..795454cc60 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -184,6 +184,7 @@ public class AprLifecycleListener implements 
LifecycleListener {
 fipsModeActive = false;
 }
 
+@SuppressWarnings("deprecation")
 private static void init()
 {
 int major = 0;


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

[tomcat] branch 9.0.x updated: Fix IDE warnings

2022-06-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new a15b566343 Fix IDE warnings
a15b566343 is described below

commit a15b566343813fe042121fa3d1e04689165580cd
Author: Mark Thomas 
AuthorDate: Wed Jun 1 09:12:36 2022 +0100

Fix IDE warnings
---
 java/org/apache/catalina/core/AprLifecycleListener.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java 
b/java/org/apache/catalina/core/AprLifecycleListener.java
index f8656c37f4..719b83f9f9 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -184,6 +184,7 @@ public class AprLifecycleListener implements 
LifecycleListener {
 fipsModeActive = false;
 }
 
+@SuppressWarnings("deprecation")
 private static void init()
 {
 int major = 0;


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

[tomcat-native] branch main updated: Update ignore file

2022-06-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new d97b08ad6 Update ignore file
d97b08ad6 is described below

commit d97b08ad6436e457a4b6c0141e1695aefc037b79
Author: Mark Thomas 
AuthorDate: Wed Jun 1 11:47:00 2022 +0100

Update ignore file
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 323ada616..58107b33f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
 /native/config.status
 /native/configure
 /native/libtcnative-1.la
+/native/libtcnative-2.la
 /native/tcnative.pc
 /native/tcnative.spec
 


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

[tomcat-native] branch 1.2.x updated: Update ignore file

2022-06-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/1.2.x by this push:
 new 80bab9e87 Update ignore file
80bab9e87 is described below

commit 80bab9e876c3088eb71f102581a23e496cc1218e
Author: Mark Thomas 
AuthorDate: Wed Jun 1 11:47:00 2022 +0100

Update ignore file
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 323ada616..58107b33f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
 /native/config.status
 /native/configure
 /native/libtcnative-1.la
+/native/libtcnative-2.la
 /native/tcnative.pc
 /native/tcnative.spec
 


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

[tomcat-native] branch main updated: Map the OpenSSL 3.x FIPS behaviour to the 1.x API

2022-06-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 101eda32b Map the OpenSSL 3.x FIPS behaviour to the 1.x API
101eda32b is described below

commit 101eda32be49559cc75622cb15fbfd128e02572a
Author: Mark Thomas 
AuthorDate: Wed Jun 1 12:36:18 2022 +0100

Map the OpenSSL 3.x FIPS behaviour to the 1.x API
---
 native/BUILDING   | 49 +--
 native/include/ssl_private.h  |  1 +
 native/src/ssl.c  | 44 ++-
 xdocs/miscellaneous/changelog.xml |  4 
 4 files changed, 34 insertions(+), 64 deletions(-)

diff --git a/native/BUILDING b/native/BUILDING
index 7059e8de7..9bf7cc6e9 100644
--- a/native/BUILDING
+++ b/native/BUILDING
@@ -148,48 +148,11 @@ Windows
Note: Use ENABLE_OCSP=1 to create OCSP enabled builds
 
 
-Windows with FIPS
-=
+FIPS
+
 
-The steps are broadly the same as the non-FIPS build with the following 
additions and changes.
+No additional build steps are required. Configure OpenSSL to use the FIPS
+certified provider as the default provider as described in the OpenSSL
+documentation:
 
-Note: The build process has only been verified with 64-bit Windows. The process
-  for 32-bit Windows should be very similar.
-
-1. Build the FIPS object module
-
-   This step should be completed immediately before building OpenSSL.
-   
-   Unpack the openssl-fips-2.0.x.tar.gz distribution into 
native\srclib\openssl-fips
-   The tar.gz contains symbolic links. Ensure you unpack the archive with a 
tool
-   that replaces these with the linked file or manually replace the symbolic
-   links with associated the linked file before continuing.
-   
-   > c:\cmsc\setenv.bat /x64
-   > set FIPSDIR=%cd%\lib-x64
-   > ms\do_fips
-
-2. Modify the OpenSSL build configuration
-
-   Add 'fips' to the OpenSSL build configuration
-   
-   > perl Configure VC-WIN64A fips
-   
-3. Test the OpenSSL build
-
-   This step should be completed immediately after building OpenSSL.
-   
-   > SET OPENSSL_FIPS=1
-   > openssl md5 openssl.exe
-   
-   This should fail since MD5 is disabled in FIPS mode.
-   
-   > SET OPENSSL_FIPS=
-   > openssl md5 openssl.exe
-   
-   This should work.
-
-4. Modify the tc-native build configuration
-
-   > c:\cmsc\setenv.bat /x64
-   > nmake -f NMAKEMakefile WITH_APR=srclib\apr\WINXP_X64_LIB_RELEASE 
WITH_OPENSSL=srclib\openssl\release-x64 WITH_FIPS=srclib\openssl-fips\lib-x64 
APR_DECLARE_STATIC=1
+  https://www.openssl.org/docs/man3.0/man7/fips_module.html
diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h
index be0c7d563..3a14ce01f 100644
--- a/native/include/ssl_private.h
+++ b/native/include/ssl_private.h
@@ -46,6 +46,7 @@
 #include 
 #include 
 #include 
+#include 
 /* Avoid tripping over an engine build installed globally and detected
  * when the user points at an explicit non-engine flavor of OpenSSL
  */
diff --git a/native/src/ssl.c b/native/src/ssl.c
index d6f19ef44..9fe4d9980 100644
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -913,13 +913,29 @@ TCN_IMPLEMENT_CALL(void, SSL, randSet)(TCN_STDARGS, 
jstring file)
 TCN_IMPLEMENT_CALL(jint, SSL, fipsModeGet)(TCN_STDARGS)
 {
 UNREFERENCED(o);
-#ifdef OPENSSL_FIPS
-return FIPS_mode();
-#else
-/* FIPS is unavailable */
-tcn_ThrowException(e, "FIPS was not available to tcnative at build time. 
You will need to re-build tcnative against an OpenSSL with FIPS.");
 
+#if defined(LIBRESSL_VERSION_NUMBER)
+/* LibreSSL doesn't support FIPS */
 return 0;
+#else
+EVP_MD  *md;
+const OSSL_PROVIDER *provider;
+const char  *name;
+
+// Maps the OpenSSL 3. x onwards behaviour to theOpenSSL 1.x API
+
+// Checks that FIPS is the default provider
+md = EVP_MD_fetch(NULL, "SHA-512", NULL);
+provider = EVP_MD_get0_provider(md);
+name = OSSL_PROVIDER_get0_name(provider);
+// Clean up
+EVP_MD_free(md);
+
+if (strcmp("fips", name)) {
+return 0;
+} else {
+   return 1;
+}
 #endif
 }
 
@@ -928,22 +944,8 @@ TCN_IMPLEMENT_CALL(jint, SSL, fipsModeSet)(TCN_STDARGS, 
jint mode)
 int r = 0;
 UNREFERENCED(o);
 
-#ifdef OPENSSL_FIPS
-if(1 != (r = (jint)FIPS_mode_set((int)mode))) {
-  /* arrange to get a human-readable error message */
-  unsigned long err = SSL_ERR_get();
-  char msg[256];
-
-  /* ERR_load_crypto_strings() already called in initialize() */
-
-  ERR_error_string_n(err, msg, 256);
-
-  tcn_ThrowException(e, msg);
-}
-#else
-/* FIPS is unavailable */
-tcn_ThrowException(e, "FIPS was not available to tcnative at build time. 
You will need to re-build tcnative against an OpenSSL with FIPS.");
-#endif
+/* This method should never be called when using Tomcat

[Bug 66101] New: Initial integration of tomcat into OSS-Fuzz

2022-06-01 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=66101

Bug ID: 66101
   Summary: Initial integration of tomcat into OSS-Fuzz
   Product: Tomcat 10
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Examples
  Assignee: dev@tomcat.apache.org
  Reporter: patrice.sala...@code-intelligence.com
  Target Milestone: --

Hi all,

I have prepared the initial integration
https://github.com/CodeIntelligenceTesting/oss-fuzz/commit/bf7c594227c2af140dc3ca7c349b165c1396b1bf
of tomcat into google oss-fuzz (https://github.com/google/oss-fuzz). This will
enable continuous fuzzing of this project, which will be conducted by Google.
Bugs that will be found by fuzzing will be reported to you. After the initial
integration of this project into oss-fuzz, I will continue to add additional
fuzz tests to improve the code coverage over time.

The integration requires a primary contact, someone to deal with the bug
reports submitted by oss-fuzz. The email address needs to belong to an
established project committer and be associated with a Google account as per
here
(https://google.github.io/oss-fuzz/getting-started/accepting-new-projects/).
When a bug is found, you will receive an email that will provide you with
access to ClusterFuzz, crash reports, and fuzzer statistics. More than 1 person
can be included. Please let me know who I should include, if anyone.

Jazzer (https://github.com/CodeIntelligenceTesting/jazzer) is used for fuzzing
Java applications. Jazzer is a coverage-guided, in-process fuzzer for the JVM
platform developed by Code Intelligence. It is based on libFuzzer and brings
many of its instrumentation-powered mutation features to the JVM. Jazzer has
already found several bugs in JVM applications: Jazzer Findings
(https://github.com/CodeIntelligenceTesting/jazzer#findings)

Please let me know if you have any questions regarding fuzzing or the oss-fuzz
integration.

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

[Bug 66101] Initial integration of tomcat into OSS-Fuzz

2022-06-01 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=66101

--- Comment #1 from Mark Thomas  ---
I'll set up a Google account for the Tomcat security team's address.

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

[Bug 66101] Initial integration of tomcat into OSS-Fuzz

2022-06-01 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=66101

--- Comment #2 from PatriceS  ---
(In reply to Mark Thomas from comment #1)
> I'll set up a Google account for the Tomcat security team's address.

Perfect, thank you.

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

[Bug 66101] Initial integration of tomcat into OSS-Fuzz

2022-06-01 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=66101

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #3 from Mark Thomas  ---
Done. Please use:
secur...@tomcat.apache.org

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

[tomcat-native] branch 1.2.x updated: Map the OpenSSL 3.x FIPS behaviour to the 1.x API

2022-06-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/1.2.x by this push:
 new 375eb456f Map the OpenSSL 3.x FIPS behaviour to the 1.x API
375eb456f is described below

commit 375eb456fff6bd9fe9b08feac450e6a430ee3abd
Author: Mark Thomas 
AuthorDate: Wed Jun 1 15:57:25 2022 +0100

Map the OpenSSL 3.x FIPS behaviour to the 1.x API
---
 native/include/ssl_private.h  |  3 +++
 native/src/ssl.c  | 22 ++
 xdocs/miscellaneous/changelog.xml |  5 +
 3 files changed, 30 insertions(+)

diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h
index f6b2840a8..f01fc2190 100644
--- a/native/include/ssl_private.h
+++ b/native/include/ssl_private.h
@@ -46,6 +46,9 @@
 #include 
 #include 
 #include 
+#if (OPENSSL_VERSION_NUMBER > 0x2FFFL)
+#include 
+#endif
 /* Avoid tripping over an engine build installed globally and detected
  * when the user points at an explicit non-engine flavor of OpenSSL
  */
diff --git a/native/src/ssl.c b/native/src/ssl.c
index 6d248550f..c44ef0f79 100644
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -929,6 +929,25 @@ TCN_IMPLEMENT_CALL(jint, SSL, fipsModeGet)(TCN_STDARGS)
 UNREFERENCED(o);
 #ifdef OPENSSL_FIPS
 return FIPS_mode();
+#elif (OPENSSL_VERSION_NUMBER > 0x2FFFL)
+EVP_MD  *md;
+const OSSL_PROVIDER *provider;
+const char  *name;
+
+// Maps the OpenSSL 3. x onwards behaviour to theOpenSSL 1.x API
+
+// Checks that FIPS is the default provider
+md = EVP_MD_fetch(NULL, "SHA-512", NULL);
+provider = EVP_MD_get0_provider(md);
+name = OSSL_PROVIDER_get0_name(provider);
+// Clean up
+EVP_MD_free(md);
+
+if (strcmp("fips", name)) {
+return 0;
+} else {
+   return 1;
+}
 #else
 /* FIPS is unavailable */
 tcn_ThrowException(e, "FIPS was not available to tcnative at build time. 
You will need to re-build tcnative against an OpenSSL with FIPS.");
@@ -954,6 +973,9 @@ TCN_IMPLEMENT_CALL(jint, SSL, fipsModeSet)(TCN_STDARGS, 
jint mode)
 
   tcn_ThrowException(e, msg);
 }
+#elif (OPENSSL_VERSION_NUMBER > 0x2FFFL)
+/* This method should never be called when using OpenSSL 3.x onwards */
+tcn_ThrowException(e, "fipsModeSet is not supported in OpenSSL 3.x 
onwards.");
 #else
 /* FIPS is unavailable */
 tcn_ThrowException(e, "FIPS was not available to tcnative at build time. 
You will need to re-build tcnative against an OpenSSL with FIPS.");
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 59ab613bc..4ad8aa595 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -40,6 +40,11 @@
   Refactor library initialization so it is compatible with Tomcat 10.1.x
   onwards where a number of Java classes have been removed. (markt)
 
+
+  Map the OpenSSL 3.x FIPS behaviour to the OpenSSL 1.x API to allow 
clients
+  to determine if the FIPS provider is being used when Tomcat Native is
+  compiled against OpenSSL 3.x. (markt)
+
   
 
 


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

Re: Tomcat Native 2.0 Update

2022-06-01 Thread Mark Thomas 

On 31/05/2022 09:33, Rémy Maucherat wrote:

On Tue, May 31, 2022 at 9:46 AM Mark Thomas  wrote:


On 30/05/2022 20:05, Rémy Maucherat wrote:

On Mon, May 30, 2022 at 6:49 PM Mark Thomas  wrote:


Hi all,

I have made some progress. I have a trimmed down Tomcat Native 2.0 built
with OpenSSL 3.0 working locally with Tomcat 10.1.x. I also have it
working with the OpenSSL 3 FIPS provider.

I have also been thinking about Tomcat Native 1.2.x and 2.0.x
interoperability.

Since Native 2.0 is mostly (apart from one new FIPS method) a subset of
Native 1.2 it should be relatively easy for 10.1.x to work with Native
2.0.x or 1.2.x.

Allowing Native 1.2.x use with Tomcat 10.1.x should make it easier on
downstream distributions as it removes the need for them to update to
APR 1.7.x and OpenSSL 3.0.x

Getting 10.0.x and earlier working with Native 2.0.x is a little
trickier although it doable if the limits are:
- No APR/Native connector
- No application usage of o.a.t.u.jni (as most of the native code is
 removed)

Enabling Native 2.0.x use with Tomcat 10.0.x and earlier opens up the
possibility of OpenSSL FIPS that doesn't depend on an unsupported
version of OpenSSL.

I am currently thinking along the following lines:

- release Tomcat Native 1.2.34 that includes:
 - refactoring the caching of the FileInfo and Sockaddr classes so
   that are only cached if used
 - any additional refactoring to allow Native 1.2.x to be used in
   Tomcat 10.1.x with all the deprecated code removed

- make Tomcat Native 1.2.34 the minimum required Tomcat Native version
 for Tomcat 10.1.x

- release Tomcat Native 2.0.0

- make Tomcat Native 2.0.0 the minimum recommended Tomcat Native
 version for Tomcat 10.1.x

- updates as required to Tomcat Native 1.2.x, 2.0.x and Tomcat
 <=10.0.x to allow Tomcat Native 2.0.x to be used (reasonably) safely
 with Tomcat <=10.0.x

My plan is to do most of this work locally to make sure I haven't missed
anything and then start committing and releasing in the order above.


Sounds great. Any subtask for me or do you prefer doing it alone ?


Thanks for the offer of help.

I have a lot of the above ready locally already and everything is
inter-related making it hard to extract independent sub-tasks. With all
the inter-dependencies I might miss something so if you could keep that
in mind when reviewing my commits that would be helpful.

The tasks below, particularly the first and third, are largely
independent. If you have time to look at either of those that would be
great. I'll try and commit the bulk of the initial changes for Tomcat
Native 2.0.x today.


Ok !

About the first item, I don't recall any deprecated call being used
for the OpenSSL 3.0 code path when I converted to Panama, but I will
review again.


I have completed my updates to Native for now.

I have a couple of commits for Tomcat (all versions) that will need to 
wait for the Tomcat Native 1.2.34 release since they depend on changes 
since 1.2.33. I plan to work on a Native release during June.


When I compile 2.0.x with OpenSSL 3.x I get a bunch of warnings about 
using deprecated OpenSSL API.



About LibreSSL, it is not a good target for the Panama code. First
reason is without ifdef then it makes things more complex. Second
reason is possible use of extra APIs that would be only in OpenSSL
(for example if they ever add the promised high level API for QUIC
support).


ACK.

The further LibreSSL and OpenSSL diverge, the harder it is going to be 
to support both.


Mark

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

[tomcat] 01/04: Remove extra empty line

2022-06-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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

commit da3377d218d9e780bac73013462a6becb7813adb
Author: Mark Thomas 
AuthorDate: Wed Jun 1 19:33:44 2022 +0100

Remove extra empty line
---
 java/jakarta/el/LocalStrings_ru.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/jakarta/el/LocalStrings_ru.properties 
b/java/jakarta/el/LocalStrings_ru.properties
index f57ed37a76..8d703a6fe9 100644
--- a/java/jakarta/el/LocalStrings_ru.properties
+++ b/java/jakarta/el/LocalStrings_ru.properties
@@ -50,4 +50,3 @@ staticFieldELResolver.notWritable=Запись в поле static (в 
данно
 
 util.method.ambiguous=Не удалось однозначно найти метод: {0}.{1}({2})
 util.method.notfound=Метод не найден: {0}.{1}({2})
-


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

[tomcat] branch main updated (e60f080415 -> 876031b2de)

2022-06-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


from e60f080415 Tomcat Native 2.x onwards will require SSL
 new da3377d218 Remove extra empty line
 new 08ca083412 Improvements to French translations (remm)
 new 0cac2262ba Improvements to Japanese translations by Shirayuking and 
tak7iji
 new 876031b2de Improvements to Chinese translations contributed by 
Dingzi2012

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


Summary of changes:
 java/jakarta/el/LocalStrings_ru.properties |  1 -
 java/org/apache/catalina/core/LocalStrings_fr.properties   |  1 +
 java/org/apache/catalina/core/LocalStrings_ja.properties   |  1 +
 .../apache/catalina/ha/deploy/LocalStrings_ja.properties   |  2 +-
 .../catalina/ha/session/LocalStrings_zh_CN.properties  |  2 +-
 .../apache/catalina/realm/LocalStrings_zh_CN.properties|  2 +-
 .../apache/catalina/session/LocalStrings_zh_CN.properties  |  2 +-
 .../org/apache/catalina/startup/LocalStrings_ja.properties |  6 +++---
 java/org/apache/coyote/LocalStrings_zh_CN.properties   |  2 +-
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties |  4 ++--
 java/org/apache/naming/factory/LocalStrings_fr.properties  |  6 ++
 java/org/apache/naming/factory/LocalStrings_ja.properties  |  6 ++
 .../apache/tomcat/util/compat/LocalStrings_ja.properties   |  6 +++---
 webapps/docs/changelog.xml | 14 ++
 14 files changed, 41 insertions(+), 14 deletions(-)


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

[tomcat] 04/04: Improvements to Chinese translations contributed by Dingzi2012

2022-06-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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

commit 876031b2de9e2cfba604443911a6c51e3a7775df
Author: Mark Thomas 
AuthorDate: Wed Jun 1 19:43:03 2022 +0100

Improvements to Chinese translations contributed by Dingzi2012
---
 java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties | 2 +-
 java/org/apache/catalina/realm/LocalStrings_zh_CN.properties  | 2 +-
 java/org/apache/catalina/session/LocalStrings_zh_CN.properties| 2 +-
 java/org/apache/coyote/LocalStrings_zh_CN.properties  | 2 +-
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties| 4 ++--
 webapps/docs/changelog.xml| 3 +++
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
index 4047b828c7..655251bc6c 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
@@ -22,7 +22,7 @@ clusterSessionListener.noManager=上下文管理器不存在：[{0}]
 
 deltaManager.createMessage.access=管理器[{0}]：创建会话为会话[{1}]存取消息
 deltaManager.createMessage.accessChangePrimary=管理器{0}：为会话{1}创建更改主节点消息。
-deltaManager.createMessage.allSessionData=管理器[{0}]发送了所有会话数据。
+deltaManager.createMessage.allSessionData=管理器[{0}]将发送所有会话数据。
 deltaManager.createMessage.allSessionTransferred=管理器[{0}]发送了所有传输的会话数据
 deltaManager.createMessage.delta=管理器[{0}] )：为会话[{1}]创建增量请求消息
 deltaManager.createMessage.expire=管理器[{0}] (：为会话[{1}]创建会话过期消息
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index 52dc891bec..407936e98b 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
@@ -55,7 +55,7 @@ jaasRealm.failedLogin=由于登录失败，用户名 [{0}] 无法授权
 jaasRealm.loginContextCreated=为用户名创建的JAAS 登陆上下文[{0}]
 jaasRealm.loginException=登录异常，认证用户名  [{0}]
 jaasRealm.notPrincipal=类[{0}]未添加，因为它未实现java.security.Principal
-jaasRealm.rolePrincipalAdd=正在将角色主体[{0}]添加到此用户主体的角色
+jaasRealm.rolePrincipalAdd=已经将角色主体[{0}]添加到此用户主体的角色
 jaasRealm.rolePrincipalFailure=找不到有效的角色主体。
 jaasRealm.unexpectedError=意外错误
 jaasRealm.userPrincipalFailure=未发现有效的用户Principal
diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
index 0b31b7c7d5..115526cf38 100644
--- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
@@ -22,7 +22,7 @@ dataSourceStore.commitSQLException=关闭前提交连接的SQLException
 dataSourceStore.loading=正在从数据库[{1}]加载会话[{0}]
 dataSourceStore.missingDataSource=没有可用的数据源
 dataSourceStore.missingDataSourceName=没有给出有效的 JNDI 名称。
-dataSourceStore.removing=正在删除数据库{1}上的会话{0}]
+dataSourceStore.removing=已经删除数据库 [{1}] 上的会话 [{0}]
 dataSourceStore.saving=保存Session [{0}] 到数据库 [{1}]
 dataSourceStore.wrongDataSource=无法打开 JNDI 数据源 [{0}]
 
diff --git a/java/org/apache/coyote/LocalStrings_zh_CN.properties 
b/java/org/apache/coyote/LocalStrings_zh_CN.properties
index 12901d167a..ddcff70091 100644
--- a/java/org/apache/coyote/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/LocalStrings_zh_CN.properties
@@ -39,7 +39,7 @@ abstractProtocol.mbeanDeregistrationFailed=无法从MBean服务器[{1}]中注销
 abstractProtocol.processorRegisterError=注册请求处理器错误
 abstractProtocol.processorUnregisterError=注销请求处理器错误
 abstractProtocol.waitingProcessor.add=添加处理器[{0}]到等待队列
-abstractProtocol.waitingProcessor.remove=从等待的处理器中移除处理器[{0}]
+abstractProtocol.waitingProcessor.remove=将从等待的处理器中移除处理器[{0}]
 
 abstractProtocolHandler.asyncTimeoutError=错误的处理异步超时
 abstractProtocolHandler.destroy=正在摧毁协议处理器 [{0}]
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties 
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 7ee13f998f..af9bb0adc9 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -106,11 +106,11 @@ stream.inputBuffer.signal=读线程在等待时，数据被添加到inBuffer中
 stream.inputBuffer.swallowUnread=先前读取到输入流缓冲区吞入了[{0}]个字节
 stream.notWritable=连接{0}，流{1}，此流不可写
 
stream.outputBuffer.flush.debug=连接{0}，流{1}，用缓冲区在位置{2}刷新输出，writeInProgress[{3}]并关闭了[{4}]
-stream.recycle=连接[{0}]，流[{1}]已回收
+stream.recycle=连接[{0}]，流[{1}]将被回收
 stream.reprioritisation.debug=连接[{0}]，流[{1}]，独占[{2}]，父[{3}]，权重[{4}]
 stream.reset.fail=连接[{0}]，流[{1}]，重置流失败
 stream.reset.receive=连接{0}，流{1}，由于{2}而收到重置
-stream.reset.send=连接{0}，流{1}，由于{2}重置发送
+stream.reset.send=连接[{0}]，流[{1}]，由于[{2}]将重置发送
 stream.trailerHeader.noEndOfStream=连接[{0}]，流[{1}]，尾部标头不包括流结束标志
 stream.writeTimeout=等待客户端增加流控制窗口以允许写入流数据的超时
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 97e136

[tomcat] 02/04: Improvements to French translations (remm)

2022-06-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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

commit 08ca083412c902fa5c7576df287284149e10a2f6
Author: Mark Thomas 
AuthorDate: Wed Jun 1 19:36:52 2022 +0100

Improvements to French translations (remm)
---
 java/org/apache/catalina/core/LocalStrings_fr.properties  | 1 +
 java/org/apache/naming/factory/LocalStrings_fr.properties | 6 ++
 webapps/docs/changelog.xml| 7 +++
 3 files changed, 14 insertions(+)

diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 25ccf04b36..b9cf7865e4 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -121,6 +121,7 @@ containerBase.realm.stop=Erreur lors de l'arrêt de l'ancien 
royaume
 containerBase.threadedStartFailed=Un conteneur fils a échoué pendant son 
démarrage
 containerBase.threadedStopFailed=Erreur lors de l'arrêt d'un conteneur fils
 
+defaultInstanceManager.invalidAnnotation=L''annotation [{0}] est invalide
 defaultInstanceManager.invalidInjection=Annotation invalide pour l'injection 
d'une resource méthode
 defaultInstanceManager.postConstructNotFound=La méthode post construct [{0}] 
de la classe [{1}] est déclarée dans le descripteur de déploiement mais n''a 
pas été trouvée
 defaultInstanceManager.preDestroyNotFound=La méthode pre destroy [{0}] de la 
classe [{1}] est déclarée dans le descripteur de déploiement mais n''a pas été 
trouvée
diff --git a/java/org/apache/naming/factory/LocalStrings_fr.properties 
b/java/org/apache/naming/factory/LocalStrings_fr.properties
index e427e8bc0b..e3b813007f 100644
--- a/java/org/apache/naming/factory/LocalStrings_fr.properties
+++ b/java/org/apache/naming/factory/LocalStrings_fr.properties
@@ -13,6 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+beanFactory.classNotFound=Class non trouvée: [{0}]
+beanFactory.noForceString=L'option forceString a été enlevée pour renforcer la 
sécurité. A la place si la méthode set n'utilise pas une String, un type 
primitif ou l'objet équivalent, la fabrique recherchera une méthode avec le 
même nom que le set qui utilise une String et utilisera cela si une est trouvée.
+beanFactory.noSetMethod=Aucune méthode set trouvée pour la propriété [{0}]
+beanFactory.noStringConversion=La conversion en String de la propriété [{0}] 
de type [{1}] n''est pas disponible
+beanFactory.readOnlyProperty=Il n''est pas possible de modifier la propriété 
[{0}]
+
 dataSourceLinkFactory.badWrapper=Pas un enrobeur pour le type [{0}]
 
 factoryBase.factoryClassError=Impossible de charger la classe de la fabrique 
de ressources
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0cc4a826ca..aaf6a8ca88 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -218,6 +218,13 @@
   
 
   
+  
+
+  
+Improvements to French translations. (remm)
+  
+
+  
 
 
   


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

[tomcat] 03/04: Improvements to Japanese translations by Shirayuking and tak7iji

2022-06-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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

commit 0cac2262ba8ba4f007ccc7b18b8d0ed5a65c09ab
Author: Mark Thomas 
AuthorDate: Wed Jun 1 19:39:25 2022 +0100

Improvements to Japanese translations by Shirayuking and tak7iji
---
 java/org/apache/catalina/core/LocalStrings_ja.properties  | 1 +
 java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties | 2 +-
 java/org/apache/catalina/startup/LocalStrings_ja.properties   | 6 +++---
 java/org/apache/naming/factory/LocalStrings_ja.properties | 6 ++
 java/org/apache/tomcat/util/compat/LocalStrings_ja.properties | 6 +++---
 webapps/docs/changelog.xml| 4 
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties 
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index cd0e5a330e..ff7c9067b1 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -121,6 +121,7 @@ containerBase.realm.stop=古いRealmを停止できません。
 containerBase.threadedStartFailed=子コンテナーを開始できません。
 containerBase.threadedStopFailed=停止中に子コンテナが失敗しました。
 
+defaultInstanceManager.invalidAnnotation=無効なアノテーション  [{0}]
 defaultInstanceManager.invalidInjection=無効なメソッドリソースアノテーションです。
 defaultInstanceManager.postConstructNotFound=配備記述子に宣言されたクラス [{1}] の 
post-construct メソッド [{0}] が見つかりません
 defaultInstanceManager.preDestroyNotFound=配備記述子に宣言されたクラス [{1}] の pre-destroy 
メソッド [{0}] が見つかりません
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties 
b/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties
index ec81ece043..22613c1fb2 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties
@@ -15,7 +15,7 @@
 
 farmWarDeployer.alreadyDeployed=webapp [{0}]は既に配備されています。
 farmWarDeployer.deleteFail=[{0}] を削除できません。
-farmWarDeployer.deployEnd=[{0}]からの配備が完了しました。
+farmWarDeployer.deployEnd=[{0}] からの配備が完了しました。
 farmWarDeployer.fileCopyFail=[{0}] から [{1}] へコピーできません。
 farmWarDeployer.fileMessageError=ファイルメッセージ処理中のエラー
 farmWarDeployer.hostOnly=FarmWarDeployer はHostクラスタのサブエレメントとしてのみ機能します
diff --git a/java/org/apache/catalina/startup/LocalStrings_ja.properties 
b/java/org/apache/catalina/startup/LocalStrings_ja.properties
index a3af17e76d..eb2cf80ac8 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ja.properties
@@ -113,11 +113,11 @@ hostConfig.deploy.error=Webアプリケーションディレクトリ[{0}]の配
 hostConfig.deployDescriptor=配備記述子 [{0}] を配備します
 hostConfig.deployDescriptor.blocked=コンテキストパス [{0}] 
を持つWebアプリケーションは、アプリケーションのセキュアな配備に必要な設定が含まれている可能性がありますが、このホストのdeployXML設定によって処理が妨げられる配備記述子
 [{1}] が含まれていたため配備されていません。このアプリケーションを配備するには、[{2}] に適切な記述子を作成する必要があります。
 hostConfig.deployDescriptor.error=配備記述子 [{0}] を配備中のエラーです
-hostConfig.deployDescriptor.finished=配備記述子 [{0}] の展開が [{1}] msで終了しました
+hostConfig.deployDescriptor.finished=配備記述子 [{0}] の展開が [{1}] msで完了しました
 hostConfig.deployDescriptor.hiddenDir=外部のdocBaseを使用した配備記述子 [{0}] の配備は、appBaseの 
[{1}] ディレクトリが無視されることを意味します
 hostConfig.deployDescriptor.hiddenWar=配備記述子 [{0}] 
を外部のdocBaseとともに配備するとappBaseのWAR [{1}] が無視されます
 hostConfig.deployDescriptor.localDocBaseSpecified=docBase [{0}] はホストの appBase 
に含まれるため無視します。
-hostConfig.deployDescriptor.path=配備記述子 [{1}] のpath 属性に指定された [{0}] は無視されました
+hostConfig.deployDescriptor.path=配備記述子 [{1}] の path 属性に指定された [{0}] は無視されました
 hostConfig.deployDescriptor.threaded.error=配備記述子のマルチスレッド配備の完了待機中のエラー
 hostConfig.deployDir=Webアプリケーションディレクトリ [{0}] を配備します
 hostConfig.deployDir.error=Webアプリケーションディレクトリ [{0}] を配備中のエラー
@@ -126,7 +126,7 @@ hostConfig.deployDir.threaded.error=ディレクトリのマルチスレッド
 完了待機中のエラー
 hostConfig.deployWar=Webアプリケーションアーカイブ [{0}] を配備します
 hostConfig.deployWar.error=Webアプリケーションアーカイブ [{0}] を配備中のエラー
-hostConfig.deployWar.finished=Web アプリケーションアーカイブ [{0}] の配備は [{1}] ms で完了しました。
+hostConfig.deployWar.finished=Web アプリケーションアーカイブ [{0}] の配備は [{1}] ms で完了しました
 hostConfig.deployWar.hiddenDir=WAR 
[{1}]が優先され、unpackWARsがfalseであるため、ディレクトリ[{0}]は無視されます。
 hostConfig.deployWar.threaded.error=WARファイルのマルチスレッド配備の完了待機中のエラー
 hostConfig.deploying=発見されたWebアプリケーションの配備
diff --git a/java/org/apache/naming/factory/LocalStrings_ja.properties 
b/java/org/apache/naming/factory/LocalStrings_ja.properties
index 1e7435dc25..4700aefbb9 100644
--- a/java/org/apache/naming/factory/LocalStrings_ja.properties
+++ b/java/org/apache/naming/factory/LocalStrings_ja.properties
@@ -13,6 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+beanFactory.classNotFound=クラスが見つかりません: [{0}]
+beanFactory.noForceString=forceStringオプションは、セキュリティ強化策として削除されました。 
代わりに、setterメソッドがString、プリミティブ、またはプリミティブラッパーを使用しない場合、ファクトリは、setterと同じ名前でStringを受け入れるメソッドを探し、見つかった場合はそれを使用します。
+beanFa

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

2022-06-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


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

commit 03c1b83a52b0f8cfa759435ae9c239aaee1f2001
Author: Mark Thomas 
AuthorDate: Wed Jun 1 19:49:51 2022 +0100

Back-port translation updates
---
 java/org/apache/catalina/core/LocalStrings_fr.properties   |  1 +
 java/org/apache/catalina/core/LocalStrings_ja.properties   |  1 +
 .../apache/catalina/ha/deploy/LocalStrings_ja.properties   |  2 +-
 .../catalina/ha/session/LocalStrings_zh_CN.properties  |  2 +-
 .../apache/catalina/realm/LocalStrings_zh_CN.properties|  2 +-
 .../apache/catalina/session/LocalStrings_zh_CN.properties  |  2 +-
 .../org/apache/catalina/startup/LocalStrings_ja.properties |  6 +++---
 java/org/apache/coyote/LocalStrings_zh_CN.properties   |  2 +-
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties |  4 ++--
 java/org/apache/naming/factory/LocalStrings_fr.properties  |  6 ++
 java/org/apache/naming/factory/LocalStrings_ja.properties  |  6 ++
 .../apache/tomcat/util/compat/LocalStrings_ja.properties   |  6 +++---
 webapps/docs/changelog.xml | 14 ++
 13 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 5f1b810723..28e23cccf5 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -122,6 +122,7 @@ containerBase.realm.stop=Erreur lors de l'arrêt de l'ancien 
royaume
 containerBase.threadedStartFailed=Un conteneur fils a échoué pendant son 
démarrage
 containerBase.threadedStopFailed=Erreur lors de l'arrêt d'un conteneur fils
 
+defaultInstanceManager.invalidAnnotation=L''annotation [{0}] est invalide
 defaultInstanceManager.invalidInjection=Annotation invalide pour l'injection 
d'une resource méthode
 defaultInstanceManager.postConstructNotFound=La méthode post construct [{0}] 
de la classe [{1}] est déclarée dans le descripteur de déploiement mais n''a 
pas été trouvée
 defaultInstanceManager.preDestroyNotFound=La méthode pre destroy [{0}] de la 
classe [{1}] est déclarée dans le descripteur de déploiement mais n''a pas été 
trouvée
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties 
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index a5ab410fe5..c42c7ff456 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -122,6 +122,7 @@ containerBase.realm.stop=古いRealmを停止できません。
 containerBase.threadedStartFailed=子コンテナーを開始できません。
 containerBase.threadedStopFailed=停止中に子コンテナが失敗しました。
 
+defaultInstanceManager.invalidAnnotation=無効なアノテーション  [{0}]
 defaultInstanceManager.invalidInjection=無効なメソッドリソースアノテーションです。
 defaultInstanceManager.postConstructNotFound=配備記述子に宣言されたクラス [{1}] の 
post-construct メソッド [{0}] が見つかりません
 defaultInstanceManager.preDestroyNotFound=配備記述子に宣言されたクラス [{1}] の pre-destroy 
メソッド [{0}] が見つかりません
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties 
b/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties
index ec81ece043..22613c1fb2 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties
@@ -15,7 +15,7 @@
 
 farmWarDeployer.alreadyDeployed=webapp [{0}]は既に配備されています。
 farmWarDeployer.deleteFail=[{0}] を削除できません。
-farmWarDeployer.deployEnd=[{0}]からの配備が完了しました。
+farmWarDeployer.deployEnd=[{0}] からの配備が完了しました。
 farmWarDeployer.fileCopyFail=[{0}] から [{1}] へコピーできません。
 farmWarDeployer.fileMessageError=ファイルメッセージ処理中のエラー
 farmWarDeployer.hostOnly=FarmWarDeployer はHostクラスタのサブエレメントとしてのみ機能します
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
index 4047b828c7..655251bc6c 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
@@ -22,7 +22,7 @@ clusterSessionListener.noManager=上下文管理器不存在：[{0}]
 
 deltaManager.createMessage.access=管理器[{0}]：创建会话为会话[{1}]存取消息
 deltaManager.createMessage.accessChangePrimary=管理器{0}：为会话{1}创建更改主节点消息。
-deltaManager.createMessage.allSessionData=管理器[{0}]发送了所有会话数据。
+deltaManager.createMessage.allSessionData=管理器[{0}]将发送所有会话数据。
 deltaManager.createMessage.allSessionTransferred=管理器[{0}]发送了所有传输的会话数据
 deltaManager.createMessage.delta=管理器[{0}] )：为会话[{1}]创建增量请求消息
 deltaManager.createMessage.expire=管理器[{0}] (：为会话[{1}]创建会话过期消息
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index 52dc891bec..407

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

2022-06-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


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

commit 25a559deb33ae1acb81761b54bf4e5bba9ef2c60
Author: Mark Thomas 
AuthorDate: Wed Jun 1 19:52:43 2022 +0100

Back-port translation updates
---
 java/org/apache/catalina/core/LocalStrings_fr.properties   |  1 +
 java/org/apache/catalina/core/LocalStrings_ja.properties   |  1 +
 .../apache/catalina/ha/deploy/LocalStrings_ja.properties   |  2 +-
 .../catalina/ha/session/LocalStrings_zh_CN.properties  |  2 +-
 .../apache/catalina/realm/LocalStrings_zh_CN.properties|  2 +-
 .../org/apache/catalina/startup/LocalStrings_ja.properties |  6 +++---
 java/org/apache/coyote/LocalStrings_zh_CN.properties   |  2 +-
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties |  4 ++--
 java/org/apache/naming/factory/LocalStrings_fr.properties  |  6 ++
 java/org/apache/naming/factory/LocalStrings_ja.properties  |  6 ++
 .../apache/tomcat/util/compat/LocalStrings_ja.properties   |  6 +++---
 webapps/docs/changelog.xml | 14 ++
 12 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index cecb84955d..efbc6bc3af 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -123,6 +123,7 @@ containerBase.realm.stop=Erreur lors de l'arrêt de l'ancien 
royaume
 containerBase.threadedStartFailed=Un conteneur fils a échoué pendant son 
démarrage
 containerBase.threadedStopFailed=Erreur lors de l'arrêt d'un conteneur fils
 
+defaultInstanceManager.invalidAnnotation=L''annotation [{0}] est invalide
 defaultInstanceManager.invalidInjection=Annotation invalide pour l'injection 
d'une resource méthode
 defaultInstanceManager.postConstructNotFound=La méthode post construct [{0}] 
de la classe [{1}] est déclarée dans le descripteur de déploiement mais n''a 
pas été trouvée
 defaultInstanceManager.preDestroyNotFound=La méthode pre destroy [{0}] de la 
classe [{1}] est déclarée dans le descripteur de déploiement mais n''a pas été 
trouvée
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties 
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 5ff50387e3..03587a4cb7 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -123,6 +123,7 @@ containerBase.realm.stop=古いRealmを停止できません。
 containerBase.threadedStartFailed=子コンテナーを開始できません。
 containerBase.threadedStopFailed=停止中に子コンテナが失敗しました。
 
+defaultInstanceManager.invalidAnnotation=無効なアノテーション  [{0}]
 defaultInstanceManager.invalidInjection=無効なメソッドリソースアノテーションです。
 defaultInstanceManager.postConstructNotFound=配備記述子に宣言されたクラス [{1}] の 
post-construct メソッド [{0}] が見つかりません
 defaultInstanceManager.preDestroyNotFound=配備記述子に宣言されたクラス [{1}] の pre-destroy 
メソッド [{0}] が見つかりません
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties 
b/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties
index ec81ece043..22613c1fb2 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties
@@ -15,7 +15,7 @@
 
 farmWarDeployer.alreadyDeployed=webapp [{0}]は既に配備されています。
 farmWarDeployer.deleteFail=[{0}] を削除できません。
-farmWarDeployer.deployEnd=[{0}]からの配備が完了しました。
+farmWarDeployer.deployEnd=[{0}] からの配備が完了しました。
 farmWarDeployer.fileCopyFail=[{0}] から [{1}] へコピーできません。
 farmWarDeployer.fileMessageError=ファイルメッセージ処理中のエラー
 farmWarDeployer.hostOnly=FarmWarDeployer はHostクラスタのサブエレメントとしてのみ機能します
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
index 4047b828c7..655251bc6c 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
@@ -22,7 +22,7 @@ clusterSessionListener.noManager=上下文管理器不存在：[{0}]
 
 deltaManager.createMessage.access=管理器[{0}]：创建会话为会话[{1}]存取消息
 deltaManager.createMessage.accessChangePrimary=管理器{0}：为会话{1}创建更改主节点消息。
-deltaManager.createMessage.allSessionData=管理器[{0}]发送了所有会话数据。
+deltaManager.createMessage.allSessionData=管理器[{0}]将发送所有会话数据。
 deltaManager.createMessage.allSessionTransferred=管理器[{0}]发送了所有传输的会话数据
 deltaManager.createMessage.delta=管理器[{0}] )：为会话[{1}]创建增量请求消息
 deltaManager.createMessage.expire=管理器[{0}] (：为会话[{1}]创建会话过期消息
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index e23550f008..0fecadde15 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN

[tomcat] branch 8.5.x updated (aca389d2ed -> c62cda20b4)

2022-06-01 Thread 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 aca389d2ed Fix IDE warnings
 new 37ab4f9395 Correct order
 new c62cda20b4 Back-port translation updates

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


Summary of changes:
 java/org/apache/catalina/core/LocalStrings_fr.properties   |  1 +
 java/org/apache/catalina/core/LocalStrings_ja.properties   |  1 +
 .../apache/catalina/ha/deploy/LocalStrings_ja.properties   |  2 +-
 .../catalina/ha/session/LocalStrings_zh_CN.properties  |  2 +-
 .../apache/catalina/realm/LocalStrings_zh_CN.properties|  2 +-
 .../org/apache/catalina/startup/LocalStrings_ja.properties |  4 ++--
 java/org/apache/coyote/LocalStrings_zh_CN.properties   |  2 +-
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties |  4 ++--
 java/org/apache/naming/factory/LocalStrings_fr.properties  |  6 ++
 java/org/apache/naming/factory/LocalStrings_ja.properties  |  6 ++
 java/org/apache/tomcat/util/compat/LocalStrings.properties |  4 ++--
 webapps/docs/changelog.xml | 14 ++
 12 files changed, 38 insertions(+), 10 deletions(-)


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

[tomcat] 01/02: Correct order

2022-06-01 Thread 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 37ab4f9395dfdab011fb879795cb5a8c63e28017
Author: Mark Thomas 
AuthorDate: Wed Jun 1 19:53:53 2022 +0100

Correct order
---
 java/org/apache/tomcat/util/compat/LocalStrings.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/util/compat/LocalStrings.properties 
b/java/org/apache/tomcat/util/compat/LocalStrings.properties
index 262b81554f..e8cdea670e 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings.properties
@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+jre19Compat.javaPre19=Class not found so assuming code is running on a 
pre-Java 19 JVM
+
 jre8Compat.javaPre8=Class not found so assuming code is running on a pre-Java 
8 JVM
 jre8Compat.unexpected=Failed to create references to Java 8 classes and methods
 
-jre19Compat.javaPre19=Class not found so assuming code is running on a 
pre-Java 19 JVM
-
 jre9Compat.invalidModuleUri=The module URI provided [{0}] could not be 
converted to a URL for the JarScanner to process
 jre9Compat.javaPre9=Class not found so assuming code is running on a pre-Java 
9 JVM
 jre9Compat.unexpected=Failed to create references to Java 9 classes and methods


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

[tomcat] 02/02: Back-port translation updates

2022-06-01 Thread 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 c62cda20b476ee1d37a9053ff35b83cbcaa4733c
Author: Mark Thomas 
AuthorDate: Wed Jun 1 19:54:26 2022 +0100

Back-port translation updates
---
 java/org/apache/catalina/core/LocalStrings_fr.properties   |  1 +
 java/org/apache/catalina/core/LocalStrings_ja.properties   |  1 +
 .../apache/catalina/ha/deploy/LocalStrings_ja.properties   |  2 +-
 .../catalina/ha/session/LocalStrings_zh_CN.properties  |  2 +-
 .../apache/catalina/realm/LocalStrings_zh_CN.properties|  2 +-
 .../org/apache/catalina/startup/LocalStrings_ja.properties |  4 ++--
 java/org/apache/coyote/LocalStrings_zh_CN.properties   |  2 +-
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties |  4 ++--
 java/org/apache/naming/factory/LocalStrings_fr.properties  |  6 ++
 java/org/apache/naming/factory/LocalStrings_ja.properties  |  6 ++
 webapps/docs/changelog.xml | 14 ++
 11 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 0682e265f8..2b93332ecf 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -124,6 +124,7 @@ containerBase.realm.stop=Erreur lors de l'arrêt de l'ancien 
royaume
 containerBase.threadedStartFailed=Un conteneur fils a échoué pendant son 
démarrage
 containerBase.threadedStopFailed=Erreur lors de l'arrêt d'un conteneur fils
 
+defaultInstanceManager.invalidAnnotation=L''annotation [{0}] est invalide
 defaultInstanceManager.invalidInjection=Annotation invalide pour l'injection 
d'une resource méthode
 defaultInstanceManager.postConstructNotFound=La méthode post construct [{0}] 
de la classe [{1}] est déclarée dans le descripteur de déploiement mais n''a 
pas été trouvée
 defaultInstanceManager.preDestroyNotFound=La méthode pre destroy [{0}] de la 
classe [{1}] est déclarée dans le descripteur de déploiement mais n''a pas été 
trouvée
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties 
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 8c9d0c96a4..d7c1a6b737 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -124,6 +124,7 @@ containerBase.realm.stop=古いRealmを停止できません。
 containerBase.threadedStartFailed=子コンテナーを開始できません。
 containerBase.threadedStopFailed=停止中に子コンテナが失敗しました。
 
+defaultInstanceManager.invalidAnnotation=無効なアノテーション  [{0}]
 defaultInstanceManager.invalidInjection=無効なメソッドリソースアノテーションです。
 defaultInstanceManager.postConstructNotFound=配備記述子に宣言されたクラス [{1}] の 
post-construct メソッド [{0}] が見つかりません
 defaultInstanceManager.preDestroyNotFound=配備記述子に宣言されたクラス [{1}] の pre-destroy 
メソッド [{0}] が見つかりません
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties 
b/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties
index 5e52936257..b88687dfad 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties
@@ -15,7 +15,7 @@
 
 farmWarDeployer.alreadyDeployed=webapp [{0}]は既に配備されています。
 farmWarDeployer.deleteFail=[{0}] を削除できません。
-farmWarDeployer.deployEnd=[{0}]からの配備が完了しました。
+farmWarDeployer.deployEnd=[{0}] からの配備が完了しました。
 farmWarDeployer.fileCopyFail=[{0}] から [{1}] へコピーできません。
 farmWarDeployer.hostOnly=FarmWarDeployer はHostクラスタのサブエレメントとしてのみ機能します
 farmWarDeployer.hostParentEngine=FarmWarDeployer は親 [{0}] が Engine 
のインスタンスでなければ機能しません。
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
index 4047b828c7..655251bc6c 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
@@ -22,7 +22,7 @@ clusterSessionListener.noManager=上下文管理器不存在：[{0}]
 
 deltaManager.createMessage.access=管理器[{0}]：创建会话为会话[{1}]存取消息
 deltaManager.createMessage.accessChangePrimary=管理器{0}：为会话{1}创建更改主节点消息。
-deltaManager.createMessage.allSessionData=管理器[{0}]发送了所有会话数据。
+deltaManager.createMessage.allSessionData=管理器[{0}]将发送所有会话数据。
 deltaManager.createMessage.allSessionTransferred=管理器[{0}]发送了所有传输的会话数据
 deltaManager.createMessage.delta=管理器[{0}] )：为会话[{1}]创建增量请求消息
 deltaManager.createMessage.expire=管理器[{0}] (：为会话[{1}]创建会话过期消息
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index bb387544a3..822e410d06 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
@@ -44,7 +44,7 @@ jaasRealm.credentialExpired=由于凭据过期，用户名[{0}]未通过身份
 jaasRealm.failedLogin=由于登录失败，用户名 [{0}] 无法

[tomcat] branch main updated: Jakarta Servlet 6.0 specification is final

2022-06-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new a704da4e05 Jakarta Servlet 6.0 specification is final
a704da4e05 is described below

commit a704da4e05b057bcdb30c75cb65781a4fde821bf
Author: Mark Thomas 
AuthorDate: Wed Jun 1 19:59:48 2022 +0100

Jakarta Servlet 6.0 specification is final
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 2a67d5346f..4e594e16a9 100644
--- a/build.xml
+++ b/build.xml
@@ -56,7 +56,7 @@
 
   
   
-  
+  
   
   
   


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

Re: [tomcat] branch main updated: Jakarta Servlet 6.0 specification is final

2022-06-01 Thread Mark Thomas 

On 01/06/2022 19:59, ma...@apache.org wrote:

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

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


The following commit(s) were added to refs/heads/main by this push:
  new a704da4e05 Jakarta Servlet 6.0 specification is final
a704da4e05 is described below

commit a704da4e05b057bcdb30c75cb65781a4fde821bf
Author: Mark Thomas 
AuthorDate: Wed Jun 1 19:59:48 2022 +0100

 Jakarta Servlet 6.0 specification is final


This is the last of the Jakarta specifications that Tomcat implements to 
go final.


Tomcat's implementation of all these specifications is also complete.

The next 10.1.x release vote will therefore be for a beta release rather 
than an alpha release.


Mark


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

Re: [tomcat] branch main updated: Jakarta Servlet 6.0 specification is final

2022-06-01 Thread Rémy Maucherat 
On Wed, Jun 1, 2022 at 9:04 PM Mark Thomas  wrote:
>
> On 01/06/2022 19:59, ma...@apache.org wrote:
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > markt pushed a commit to branch main
> > in repository https://gitbox.apache.org/repos/asf/tomcat.git
> >
> >
> > The following commit(s) were added to refs/heads/main by this push:
> >   new a704da4e05 Jakarta Servlet 6.0 specification is final
> > a704da4e05 is described below
> >
> > commit a704da4e05b057bcdb30c75cb65781a4fde821bf
> > Author: Mark Thomas 
> > AuthorDate: Wed Jun 1 19:59:48 2022 +0100
> >
> >  Jakarta Servlet 6.0 specification is final
>
> This is the last of the Jakarta specifications that Tomcat implements to
> go final.
>
> Tomcat's implementation of all these specifications is also complete.
>
> The next 10.1.x release vote will therefore be for a beta release rather
> than an alpha release.

Congratulations on the milestone :)

Rémy

> 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