[tomcat] branch main updated: Fix typo

[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 10ecb4c7c9 Fix typo
10ecb4c7c9 is described below

commit 10ecb4c7c9eab30a68427a487e8a99cd93d7ef1a
Author: Mark Thomas 
AuthorDate: Wed Sep 14 14:39:49 2022 +0100

Fix typo
---
 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 853a97e332..b4080ba318 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -196,7 +196,7 @@
   
   
 When processing HTTP/2 requests, allow a host header and 
an
-:authority header to  be present providing the are
+:authority header to  be present providing they are
 consistent. (markt)
   
   


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

[VOTE] Release Apache Tomcat 10.0.24

[Mark Thomas]

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

Apache Tomcat 10.0.x implements Jakarta EE 9 and, as such, the primary
package for all the specification APIs has changed from javax.* to jakarta.*

Applications that run on Tomcat 9 will not run on Tomcat 10 without 
changes. Java EE applications designed for Tomcat 9 and earlier may be 
placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
automatically convert them to Jakarta EE and copy them to the webapps 
directory


The notable changes compared to 10.0.23 are:

- Add support for authenticating WebSocket clients with an HTTP forward
  proxy when establishing a connection to a WebSocket endpoint via a
  forward proxy that requires authentication. Based on a patch provided
  by Joe Mokos.

- Various fixes for edge case bugs in EL processing

- Improve host header handling for HTTP/2 requests

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://nightlies.apache.org/tomcat/tomcat-10.0.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.24/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1391

The tag is:
https://github.com/apache/tomcat/tree/10.0.24
74a5bd703f1d477548449bd400721e960cc4514c

The proposed 10.0.24 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 10.0.24 (stable)

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

Re: [VOTE] Release Apache Tomcat 10.1.0-M19

[Mark Thomas]

On 13/09/2022 18:09, Mark Thomas wrote:

The proposed Apache Tomcat 10.1.0-M19 release is now available for
voting.

Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
without changes. Java EE applications designed for Tomcat 9 and earlier 
may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat 
will automatically convert them to Jakarta EE and copy them to the 
webapps directory.


The notable changes compared to 10.1.0-M17 are:

- Add support for authenticating WebSocket clients with an HTTP forward
   proxy when establishing a connection to a WebSocket endpoint via a
   forward proxy that requires authentication. Based on a patch provided
   by Joe Mokos.

- Various fixes for edge case bugs in EL processing

- Improve host header handling for HTTP/2 requests

For full details, see the change log:
https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M19/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1389

The tag is:
https://github.com/apache/tomcat/tree/10.1.0-M19
ff0b6c231b7a1a416688346fdd299a3d6cfb5b64


The proposed 10.1.0-M19 release is:
[ ] Broken - do not release
[X] Beta - go ahead and release as 10.1.0-M19 (beta)


Unit tests pass on Windows, Linux and MacOS.

Mark

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

[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 8670a2e17f Fix typo
8670a2e17f is described below

commit 8670a2e17f2fa6299fd94867c3a6b28ddabcf133
Author: Mark Thomas 
AuthorDate: Wed Sep 14 14:39:49 2022 +0100

Fix typo
---
 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 80dba24586..a1918bf13f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -185,7 +185,7 @@
   
   
 When processing HTTP/2 requests, allow a host header and 
an
-:authority header to  be present providing the are
+:authority header to  be present providing they are
 consistent. (markt)
   
   


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

[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 5ca4efa991 Fix typo
5ca4efa991 is described below

commit 5ca4efa991153fbca152667e6d2d8fe81df001a8
Author: Mark Thomas 
AuthorDate: Wed Sep 14 14:39:49 2022 +0100

Fix typo
---
 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 09f0b9c0a3..f8a6a5e8f4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -185,7 +185,7 @@
   
   
 When processing HTTP/2 requests, allow a host header and 
an
-:authority header to  be present providing the are
+:authority header to  be present providing they are
 consistent. (markt)
   
   


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

[tomcat] branch 8.5.x updated: Fix typo

[markt]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 02336d482c Fix typo
02336d482c is described below

commit 02336d482cef9996ca461d13ce0dc48fb14db96b
Author: Mark Thomas 
AuthorDate: Wed Sep 14 14:39:49 2022 +0100

Fix typo
---
 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 e856651c6b..ed0b765611 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -327,7 +327,7 @@
   
   
 When processing HTTP/2 requests, allow a host header and 
an
-:authority header to  be present providing the are
+:authority header to  be present providing they are
 consistent. (markt)
   
   


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

[tomcat] branch main updated: Interim update towards Java 20 Panama API

[remm]

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

remm 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 b22d5b8433 Interim update towards Java 20 Panama API
b22d5b8433 is described below

commit b22d5b8433892dad8a3935f6febfc3d7c8daa5ac
Author: remm 
AuthorDate: Wed Sep 14 16:36:21 2022 +0200

Interim update towards Java 20 Panama API

Java 20 removes MemoryAddress (which was a decorated long basically) and
Addressable, and will use MemorySegment everywhere.
As a result, MemoryAddress in the state has to be replaced with a
MemorySegment. Since MemorySegment in the cleaner (or action) will be a
reference preventing GC, there's a need for another strategy. After
testing a few option, this one looks like one that looks decent and
works.
This is an interim update before the big one (when the PR for JDK trunk
happens, along with a compatible jextract - too many updates to bother
doing it manually, and still ongoing anyway), which allowed verifying
leaking using heap dumps.
---
 .../util/net/openssl/panama/OpenSSLContext.java| 25 +++--
 .../util/net/openssl/panama/OpenSSLEngine.java | 32 +-
 webapps/docs/changelog.xml |  7 +
 3 files changed, 42 insertions(+), 22 deletions(-)

diff --git 
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
 
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index ebf5bc6086..37fe09a49d 100644
--- 
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++ 
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -735,7 +735,7 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
 sslHostConfig.setEnabledProtocols(
 enabled.toArray(new String[0]));
 // Reconfigure the enabled ciphers
-sslHostConfig.setEnabledCiphers(getCiphers(state.sslCtx));
+
sslHostConfig.setEnabledCiphers(getCiphers(state.sslCtx.address()));
 }
 
 sessionContext = new OpenSSLSessionContext(this);
@@ -743,7 +743,7 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
 // this is set so always set it in case an app is configured to
 // require it
 sessionContext.setSessionIdContext(DEFAULT_SESSION_ID_CONTEXT);
-sslHostConfig.setOpenSslContext(state.sslCtx.toRawLongValue());
+
sslHostConfig.setOpenSslContext(state.sslCtx.address().toRawLongValue());
 initialized = true;
 } catch (Exception e) {
 log.warn(sm.getString("openssl.errorSSLCtxInit"), e);
@@ -753,7 +753,7 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
 
 
 public MemoryAddress getSSLContext() {
-return state.sslCtx;
+return state.sslCtx.address();
 }
 
 // DH *(*tmp_dh_callback)(SSL *ssl, int is_export, int keylength)
@@ -1373,8 +1373,9 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
 private static class ContextState implements Runnable {
 
 private final MemorySession contextMemorySession;
-private final MemoryAddress sslCtx;
-private final MemoryAddress confCtx;
+private final MemorySession stateSession = MemorySession.openShared();
+private final MemorySegment sslCtx;
+private final MemorySegment confCtx;
 private final List negotiableProtocols;
 
 private X509TrustManager x509TrustManager = null;
@@ -1383,20 +1384,26 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
 MemoryAddress confCtx, List negotiableProtocols) {
 states.put(Long.valueOf(sslCtx.toRawLongValue()), this);
 this.contextMemorySession = contextMemorySession;
-this.sslCtx = sslCtx;
-this.confCtx = confCtx;
+// Allocate another session to avoid keeping a reference through 
segments
+this.sslCtx = MemorySegment.ofAddress(sslCtx, 
ValueLayout.ADDRESS.byteSize(), stateSession);
+if (!MemoryAddress.NULL.equals(confCtx)) {
+this.confCtx = MemorySegment.ofAddress(confCtx, 
ValueLayout.ADDRESS.byteSize(), stateSession);
+} else {
+this.confCtx = null;
+}
 this.negotiableProtocols = negotiableProtocols;
 }
 
 @Override
 public void run() {
 try {
-states.remove(Long.valueOf(sslCtx.toRawLongValue()));
+states.remove(Long.valueOf(sslCtx.address().toRawLongValue

[GitHub] [tomcat-jakartaee-migration] aooohan commented on issue #34: v1.0.3 causes java.lang.IllegalArgumentException: java.io.EOFException on certain Tomcat War deployments

[GitBox]

aooohan commented on issue #34:
URL: 
https://github.com/apache/tomcat-jakartaee-migration/issues/34#issuecomment-1246998359

   Oh my goodness! It's my fault. I have fixed this bug in my local branch and 
passed the test you provided, and I have found out what is going wrong. But It 
is now late at night and I will continue to deal with this issue tomorrow.
   
   Thanks


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

tomcat-jakartaee-migration #34 issue

[Han Li]

Hi all,

I am very sorry, I made a fatal mistake when fixing tomcat-jakartaee-migration 
#29 issue, which led to #34 issue.

I have re-fixed this issue with this solution: 
https://github.com/aooohan/tomcat-jakartaee-migration/blob/e07f9cb21b36fe44ef31cc97e39e2c1657a94424/src/main/java/org/apache/tomcat/jakartaee/Migration.java#L226-L239
 

（I 'll continue optimising code tomorrow, it's late and I'm sleepy.）

I will retest it tomorrow to make sure the problem is really fixed.

But I don't know if this will affect the release tasks , like 10.1.x or other 
version.

How will we handle this situation, possibly by continuing to release 
tomcat-jakartaee-migration 1.0.4?


Best Regard

Han

[GitHub] [tomcat-jakartaee-migration] gregorkistler commented on issue #34: v1.0.3 causes java.lang.IllegalArgumentException: java.io.EOFException on certain Tomcat War deployments

[GitBox]

gregorkistler commented on issue #34:
URL: 
https://github.com/apache/tomcat-jakartaee-migration/issues/34#issuecomment-1247052094

   No worries and thanks for the quick response :)


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[tomcat] branch 10.0.x updated: Refactor to avoid use of Hashtable. No functional change.

[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 316967a15e Refactor to avoid use of Hashtable. No functional change.
316967a15e is described below

commit 316967a15e4a109b07218d79dd794056cc96e45e
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:18:47 2022 +0100

Refactor to avoid use of Hashtable. No functional change.
---
 webapps/examples/WEB-INF/classes/cal/Entries.java   |  7 ---
 webapps/examples/WEB-INF/classes/cal/TableBean.java | 19 ++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/webapps/examples/WEB-INF/classes/cal/Entries.java 
b/webapps/examples/WEB-INF/classes/cal/Entries.java
index f34f957a2f..5c6cd49888 100644
--- a/webapps/examples/WEB-INF/classes/cal/Entries.java
+++ b/webapps/examples/WEB-INF/classes/cal/Entries.java
@@ -16,19 +16,20 @@
  */
 package cal;
 
-import java.util.Hashtable;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import jakarta.servlet.http.HttpServletRequest;
 
 public class Entries {
 
-private final Hashtable entries;
+private final Map entries;
 private static final String[] time = { "8am", "9am", "10am", "11am",
 "12pm", "1pm", "2pm", "3pm", "4pm", "5pm", "6pm", "7pm", "8pm" };
 public static final int rows = 12;
 
 public Entries() {
-entries = new Hashtable<>(rows);
+entries = new ConcurrentHashMap<>(rows);
 for (int i = 0; i < rows; i++) {
 entries.put(time[i], new Entry(time[i]));
 }
diff --git a/webapps/examples/WEB-INF/classes/cal/TableBean.java 
b/webapps/examples/WEB-INF/classes/cal/TableBean.java
index 6e855e11bf..e7821257cf 100644
--- a/webapps/examples/WEB-INF/classes/cal/TableBean.java
+++ b/webapps/examples/WEB-INF/classes/cal/TableBean.java
@@ -16,22 +16,23 @@
  */
 package cal;
 
-import java.util.Hashtable;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import jakarta.servlet.http.HttpServletRequest;
 
 public class TableBean {
 
-final Hashtable table;
-final JspCalendar JspCal;
-Entries entries;
-String date;
-String name = null;
-String email = null;
-boolean processError = false;
+private final Map table;
+private final JspCalendar JspCal;
+private Entries entries;
+private String date;
+private String name = null;
+private String email = null;
+private boolean processError = false;
 
 public TableBean() {
-this.table = new Hashtable<>(10);
+this.table = new ConcurrentHashMap<>(10);
 this.JspCal = new JspCalendar();
 this.date = JspCal.getCurrentDate();
 }


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

[tomcat] branch main updated: Refactor to avoid use of Hashtable. No functional change.

[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 04657ab7f2 Refactor to avoid use of Hashtable. No functional change.
04657ab7f2 is described below

commit 04657ab7f215401f5afdefcc9a266862e1e48c87
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:18:47 2022 +0100

Refactor to avoid use of Hashtable. No functional change.
---
 webapps/examples/WEB-INF/classes/cal/Entries.java   |  7 ---
 webapps/examples/WEB-INF/classes/cal/TableBean.java | 19 ++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/webapps/examples/WEB-INF/classes/cal/Entries.java 
b/webapps/examples/WEB-INF/classes/cal/Entries.java
index f34f957a2f..5c6cd49888 100644
--- a/webapps/examples/WEB-INF/classes/cal/Entries.java
+++ b/webapps/examples/WEB-INF/classes/cal/Entries.java
@@ -16,19 +16,20 @@
  */
 package cal;
 
-import java.util.Hashtable;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import jakarta.servlet.http.HttpServletRequest;
 
 public class Entries {
 
-private final Hashtable entries;
+private final Map entries;
 private static final String[] time = { "8am", "9am", "10am", "11am",
 "12pm", "1pm", "2pm", "3pm", "4pm", "5pm", "6pm", "7pm", "8pm" };
 public static final int rows = 12;
 
 public Entries() {
-entries = new Hashtable<>(rows);
+entries = new ConcurrentHashMap<>(rows);
 for (int i = 0; i < rows; i++) {
 entries.put(time[i], new Entry(time[i]));
 }
diff --git a/webapps/examples/WEB-INF/classes/cal/TableBean.java 
b/webapps/examples/WEB-INF/classes/cal/TableBean.java
index 6e855e11bf..e7821257cf 100644
--- a/webapps/examples/WEB-INF/classes/cal/TableBean.java
+++ b/webapps/examples/WEB-INF/classes/cal/TableBean.java
@@ -16,22 +16,23 @@
  */
 package cal;
 
-import java.util.Hashtable;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import jakarta.servlet.http.HttpServletRequest;
 
 public class TableBean {
 
-final Hashtable table;
-final JspCalendar JspCal;
-Entries entries;
-String date;
-String name = null;
-String email = null;
-boolean processError = false;
+private final Map table;
+private final JspCalendar JspCal;
+private Entries entries;
+private String date;
+private String name = null;
+private String email = null;
+private boolean processError = false;
 
 public TableBean() {
-this.table = new Hashtable<>(10);
+this.table = new ConcurrentHashMap<>(10);
 this.JspCal = new JspCalendar();
 this.date = JspCal.getCurrentDate();
 }


-
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: Refactor to avoid use of Hashtable. No functional change.

[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 0a3110006f Refactor to avoid use of Hashtable. No functional change.
0a3110006f is described below

commit 0a3110006f469fe2beb99c3a96599e2cf3b2bab7
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:18:47 2022 +0100

Refactor to avoid use of Hashtable. No functional change.
---
 webapps/examples/WEB-INF/classes/cal/Entries.java   |  7 ---
 webapps/examples/WEB-INF/classes/cal/TableBean.java | 19 ++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/webapps/examples/WEB-INF/classes/cal/Entries.java 
b/webapps/examples/WEB-INF/classes/cal/Entries.java
index 4b3a5ee1e3..cac611a03b 100644
--- a/webapps/examples/WEB-INF/classes/cal/Entries.java
+++ b/webapps/examples/WEB-INF/classes/cal/Entries.java
@@ -16,19 +16,20 @@
  */
 package cal;
 
-import java.util.Hashtable;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.servlet.http.HttpServletRequest;
 
 public class Entries {
 
-private final Hashtable entries;
+private final Map entries;
 private static final String[] time = { "8am", "9am", "10am", "11am",
 "12pm", "1pm", "2pm", "3pm", "4pm", "5pm", "6pm", "7pm", "8pm" };
 public static final int rows = 12;
 
 public Entries() {
-entries = new Hashtable<>(rows);
+entries = new ConcurrentHashMap<>(rows);
 for (int i = 0; i < rows; i++) {
 entries.put(time[i], new Entry(time[i]));
 }
diff --git a/webapps/examples/WEB-INF/classes/cal/TableBean.java 
b/webapps/examples/WEB-INF/classes/cal/TableBean.java
index 1a871ae28b..9f1cc4a6cf 100644
--- a/webapps/examples/WEB-INF/classes/cal/TableBean.java
+++ b/webapps/examples/WEB-INF/classes/cal/TableBean.java
@@ -16,22 +16,23 @@
  */
 package cal;
 
-import java.util.Hashtable;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.servlet.http.HttpServletRequest;
 
 public class TableBean {
 
-final Hashtable table;
-final JspCalendar JspCal;
-Entries entries;
-String date;
-String name = null;
-String email = null;
-boolean processError = false;
+private final Map table;
+private final JspCalendar JspCal;
+private Entries entries;
+private String date;
+private String name = null;
+private String email = null;
+private boolean processError = false;
 
 public TableBean() {
-this.table = new Hashtable<>(10);
+this.table = new ConcurrentHashMap<>(10);
 this.JspCal = new JspCalendar();
 this.date = JspCal.getCurrentDate();
 }


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

[tomcat] branch 8.5.x updated: Refactor to avoid use of Hashtable. No functional change.

[markt]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 8ab37d8c0d Refactor to avoid use of Hashtable. No functional change.
8ab37d8c0d is described below

commit 8ab37d8c0dfb5609d4e6b68755c8c21f06bebb0b
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:18:47 2022 +0100

Refactor to avoid use of Hashtable. No functional change.
---
 webapps/examples/WEB-INF/classes/cal/Entries.java   |  7 ---
 webapps/examples/WEB-INF/classes/cal/TableBean.java | 19 ++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/webapps/examples/WEB-INF/classes/cal/Entries.java 
b/webapps/examples/WEB-INF/classes/cal/Entries.java
index 4b3a5ee1e3..cac611a03b 100644
--- a/webapps/examples/WEB-INF/classes/cal/Entries.java
+++ b/webapps/examples/WEB-INF/classes/cal/Entries.java
@@ -16,19 +16,20 @@
  */
 package cal;
 
-import java.util.Hashtable;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.servlet.http.HttpServletRequest;
 
 public class Entries {
 
-private final Hashtable entries;
+private final Map entries;
 private static final String[] time = { "8am", "9am", "10am", "11am",
 "12pm", "1pm", "2pm", "3pm", "4pm", "5pm", "6pm", "7pm", "8pm" };
 public static final int rows = 12;
 
 public Entries() {
-entries = new Hashtable<>(rows);
+entries = new ConcurrentHashMap<>(rows);
 for (int i = 0; i < rows; i++) {
 entries.put(time[i], new Entry(time[i]));
 }
diff --git a/webapps/examples/WEB-INF/classes/cal/TableBean.java 
b/webapps/examples/WEB-INF/classes/cal/TableBean.java
index 1a871ae28b..9f1cc4a6cf 100644
--- a/webapps/examples/WEB-INF/classes/cal/TableBean.java
+++ b/webapps/examples/WEB-INF/classes/cal/TableBean.java
@@ -16,22 +16,23 @@
  */
 package cal;
 
-import java.util.Hashtable;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.servlet.http.HttpServletRequest;
 
 public class TableBean {
 
-final Hashtable table;
-final JspCalendar JspCal;
-Entries entries;
-String date;
-String name = null;
-String email = null;
-boolean processError = false;
+private final Map table;
+private final JspCalendar JspCal;
+private Entries entries;
+private String date;
+private String name = null;
+private String email = null;
+private boolean processError = false;
 
 public TableBean() {
-this.table = new Hashtable<>(10);
+this.table = new ConcurrentHashMap<>(10);
 this.JspCal = new JspCalendar();
 this.date = JspCal.getCurrentDate();
 }


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

[tomcat] branch main updated: Refactor to avoid use of Hashtable. No functional change.

[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 1b2509fe08 Refactor to avoid use of Hashtable. No functional change.
1b2509fe08 is described below

commit 1b2509fe08b68eedb90398d14e65a9a24f45c740
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:22:43 2022 +0100

Refactor to avoid use of Hashtable. No functional change.
---
 java/org/apache/catalina/ha/session/DeltaSession.java | 3 +--
 java/org/apache/catalina/session/StandardSession.java | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java 
b/java/org/apache/catalina/ha/session/DeltaSession.java
index 968f02272c..1b0e9a72d2 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -27,7 +27,6 @@ import java.io.Serializable;
 import java.io.WriteAbortedException;
 import java.security.Principal;
 import java.util.ArrayList;
-import java.util.Hashtable;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -955,7 +954,7 @@ public class DeltaSession extends StandardSession 
implements Externalizable,Clus
 }
 
 if (notes == null) {
-notes = new Hashtable<>();
+notes = new ConcurrentHashMap<>();
 }
 activate();
 }
diff --git a/java/org/apache/catalina/session/StandardSession.java 
b/java/org/apache/catalina/session/StandardSession.java
index 8525072e3c..bd06046419 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -31,7 +31,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -206,7 +205,7 @@ public class StandardSession implements HttpSession, 
Session, Serializable {
  * and event listeners.  IMPLEMENTATION NOTE: This object is
  * not saved and restored across session serializations!
  */
-protected transient Map notes = new Hashtable<>();
+protected transient Map notes = new ConcurrentHashMap<>();
 
 
 /**
@@ -1446,7 +1445,7 @@ public class StandardSession implements HttpSession, 
Session, Serializable {
 }
 
 if (notes == null) {
-notes = new Hashtable<>();
+notes = new ConcurrentHashMap<>();
 }
 /*
  * The next object read could either be the number of attributes


-
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: Refactor to avoid use of Hashtable. No functional change.

[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 98a6911568 Refactor to avoid use of Hashtable. No functional change.
98a6911568 is described below

commit 98a6911568be500d357937c66ee7860ac37179a1
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:22:43 2022 +0100

Refactor to avoid use of Hashtable. No functional change.
---
 java/org/apache/catalina/ha/session/DeltaSession.java | 3 +--
 java/org/apache/catalina/session/StandardSession.java | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java 
b/java/org/apache/catalina/ha/session/DeltaSession.java
index 21d411936d..94fd89257e 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -27,7 +27,6 @@ import java.io.Serializable;
 import java.io.WriteAbortedException;
 import java.security.Principal;
 import java.util.ArrayList;
-import java.util.Hashtable;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -959,7 +958,7 @@ public class DeltaSession extends StandardSession 
implements Externalizable,Clus
 }
 
 if (notes == null) {
-notes = new Hashtable<>();
+notes = new ConcurrentHashMap<>();
 }
 activate();
 }
diff --git a/java/org/apache/catalina/session/StandardSession.java 
b/java/org/apache/catalina/session/StandardSession.java
index 439f71bb41..a71a340a8e 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -31,7 +31,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -206,7 +205,7 @@ public class StandardSession implements HttpSession, 
Session, Serializable {
  * and event listeners.  IMPLEMENTATION NOTE: This object is
  * not saved and restored across session serializations!
  */
-protected transient Map notes = new Hashtable<>();
+protected transient Map notes = new ConcurrentHashMap<>();
 
 
 /**
@@ -1567,7 +1566,7 @@ public class StandardSession implements HttpSession, 
Session, Serializable {
 }
 
 if (notes == null) {
-notes = new Hashtable<>();
+notes = new ConcurrentHashMap<>();
 }
 /*
  * The next object read could either be the number of attributes


-
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: Refactor to avoid use of Hashtable. No functional change.

[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 1fedce1b15 Refactor to avoid use of Hashtable. No functional change.
1fedce1b15 is described below

commit 1fedce1b153e03d4b209b1db59005ddef655e89f
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:22:43 2022 +0100

Refactor to avoid use of Hashtable. No functional change.
---
 java/org/apache/catalina/ha/session/DeltaSession.java | 3 +--
 java/org/apache/catalina/session/StandardSession.java | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java 
b/java/org/apache/catalina/ha/session/DeltaSession.java
index 2b72a3ab36..f2640a7f8f 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -27,7 +27,6 @@ import java.io.Serializable;
 import java.io.WriteAbortedException;
 import java.security.Principal;
 import java.util.ArrayList;
-import java.util.Hashtable;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -959,7 +958,7 @@ public class DeltaSession extends StandardSession 
implements Externalizable,Clus
 }
 
 if (notes == null) {
-notes = new Hashtable<>();
+notes = new ConcurrentHashMap<>();
 }
 activate();
 }
diff --git a/java/org/apache/catalina/session/StandardSession.java 
b/java/org/apache/catalina/session/StandardSession.java
index 4afd6662e1..ae906c67fc 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -31,7 +31,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -227,7 +226,7 @@ public class StandardSession implements HttpSession, 
Session, Serializable {
  * and event listeners.  IMPLEMENTATION NOTE: This object is
  * not saved and restored across session serializations!
  */
-protected transient Map notes = new Hashtable<>();
+protected transient Map notes = new ConcurrentHashMap<>();
 
 
 /**
@@ -1576,7 +1575,7 @@ public class StandardSession implements HttpSession, 
Session, Serializable {
 }
 
 if (notes == null) {
-notes = new Hashtable<>();
+notes = new ConcurrentHashMap<>();
 }
 /*
  * The next object read could either be the number of attributes


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

[tomcat] branch 8.5.x updated: Refactor to avoid use of Hashtable. No functional change.

[markt]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new f877a9dc96 Refactor to avoid use of Hashtable. No functional change.
f877a9dc96 is described below

commit f877a9dc96d3020a245f917b57adfa5fedcaf210
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:22:43 2022 +0100

Refactor to avoid use of Hashtable. No functional change.
---
 java/org/apache/catalina/ha/session/DeltaSession.java | 3 +--
 java/org/apache/catalina/session/StandardSession.java | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java 
b/java/org/apache/catalina/ha/session/DeltaSession.java
index 2b72a3ab36..f2640a7f8f 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -27,7 +27,6 @@ import java.io.Serializable;
 import java.io.WriteAbortedException;
 import java.security.Principal;
 import java.util.ArrayList;
-import java.util.Hashtable;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -959,7 +958,7 @@ public class DeltaSession extends StandardSession 
implements Externalizable,Clus
 }
 
 if (notes == null) {
-notes = new Hashtable<>();
+notes = new ConcurrentHashMap<>();
 }
 activate();
 }
diff --git a/java/org/apache/catalina/session/StandardSession.java 
b/java/org/apache/catalina/session/StandardSession.java
index 3bf4c069bb..27ea4a7120 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -31,7 +31,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -227,7 +226,7 @@ public class StandardSession implements HttpSession, 
Session, Serializable {
  * and event listeners.  IMPLEMENTATION NOTE: This object is
  * not saved and restored across session serializations!
  */
-protected transient Map notes = new Hashtable<>();
+protected transient Map notes = new ConcurrentHashMap<>();
 
 
 /**
@@ -1571,7 +1570,7 @@ public class StandardSession implements HttpSession, 
Session, Serializable {
 }
 
 if (notes == null) {
-notes = new Hashtable<>();
+notes = new ConcurrentHashMap<>();
 }
 /*
  * The next object read could either be the number of attributes


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

[tomcat] branch main updated: Clean-up. No functional change.

[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 72c7c36b05 Clean-up. No functional change.
72c7c36b05 is described below

commit 72c7c36b05db0ebafe3b823bc40eed9d92d45db6
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:25:11 2022 +0100

Clean-up. No functional change.
---
 .../apache/catalina/startup/HomesUserDatabase.java | 32 +-
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/java/org/apache/catalina/startup/HomesUserDatabase.java 
b/java/org/apache/catalina/startup/HomesUserDatabase.java
index 0b858c1df9..bbcb090d20 100644
--- a/java/org/apache/catalina/startup/HomesUserDatabase.java
+++ b/java/org/apache/catalina/startup/HomesUserDatabase.java
@@ -16,12 +16,10 @@
  */
 package org.apache.catalina.startup;
 
-
 import java.io.File;
 import java.util.Enumeration;
 import java.util.Hashtable;
 
-
 /**
  * Concrete implementation of the UserDatabase interface
  * considers all directories in a directory whose pathname is specified
@@ -29,41 +27,19 @@ import java.util.Hashtable;
  *
  * @author Craig R. McClanahan
  */
-public final class HomesUserDatabase
-implements UserDatabase {
-
-
-// - Constructors
-
-
-/**
- * Initialize a new instance of this user database component.
- */
-public HomesUserDatabase() {
-
-super();
-
-}
-
-
-// --- Instance Variables
-
+public final class HomesUserDatabase implements UserDatabase {
 
 /**
  * The set of home directories for all defined users, keyed by username.
  */
 private final Hashtable homes = new Hashtable<>();
 
-
 /**
  * The UserConfig listener with which we are associated.
  */
 private UserConfig userConfig = null;
 
 
-// --- Properties
-
-
 /**
  * Return the UserConfig listener with which we are associated.
  */
@@ -85,9 +61,6 @@ public final class HomesUserDatabase
 }
 
 
-// --- Public Methods
-
-
 /**
  * Return an absolute pathname to the home directory for the specified 
user.
  *
@@ -108,9 +81,6 @@ public final class HomesUserDatabase
 }
 
 
-// -- Private Methods
-
-
 /**
  * Initialize our set of users and home directories.
  */


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

[tomcat] branch main updated: Refactor to avoid use of Hashtable. No functional change.

[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 1115f37ada Refactor to avoid use of Hashtable. No functional change.
1115f37ada is described below

commit 1115f37ada93fd6e07511604ed857eecdbd7882a
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:29:18 2022 +0100

Refactor to avoid use of Hashtable. No functional change.
---
 java/org/apache/catalina/startup/HomesUserDatabase.java  | 10 ++
 java/org/apache/catalina/startup/PasswdUserDatabase.java | 12 +++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/startup/HomesUserDatabase.java 
b/java/org/apache/catalina/startup/HomesUserDatabase.java
index bbcb090d20..a0be2dbc5f 100644
--- a/java/org/apache/catalina/startup/HomesUserDatabase.java
+++ b/java/org/apache/catalina/startup/HomesUserDatabase.java
@@ -17,8 +17,10 @@
 package org.apache.catalina.startup;
 
 import java.io.File;
+import java.util.Collections;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Concrete implementation of the UserDatabase interface
@@ -32,7 +34,7 @@ public final class HomesUserDatabase implements UserDatabase {
 /**
  * The set of home directories for all defined users, keyed by username.
  */
-private final Hashtable homes = new Hashtable<>();
+private final Map homes = new HashMap<>();
 
 /**
  * The UserConfig listener with which we are associated.
@@ -73,11 +75,11 @@ public final class HomesUserDatabase implements 
UserDatabase {
 
 
 /**
- * Return an enumeration of the usernames defined on this server.
+ * Return an enumeration of the user names defined on this server.
  */
 @Override
 public Enumeration getUsers() {
-return homes.keys();
+return Collections.enumeration(homes.keySet());
 }
 
 
diff --git a/java/org/apache/catalina/startup/PasswdUserDatabase.java 
b/java/org/apache/catalina/startup/PasswdUserDatabase.java
index 893557ad81..3cfc9f7fd1 100644
--- a/java/org/apache/catalina/startup/PasswdUserDatabase.java
+++ b/java/org/apache/catalina/startup/PasswdUserDatabase.java
@@ -18,8 +18,10 @@ package org.apache.catalina.startup;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
+import java.util.Collections;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -43,9 +45,9 @@ public final class PasswdUserDatabase implements UserDatabase 
{
 
 
 /**
- * The set of home directories for all defined users, keyed by username.
+ * The set of home directories for all defined users, keyed by user name.
  */
-private final Hashtable homes = new Hashtable<>();
+private final Map homes = new HashMap<>();
 
 
 /**
@@ -87,11 +89,11 @@ public final class PasswdUserDatabase implements 
UserDatabase {
 
 
 /**
- * Return an enumeration of the usernames defined on this server.
+ * Return an enumeration of the user names defined on this server.
  */
 @Override
 public Enumeration getUsers() {
-return homes.keys();
+return Collections.enumeration(homes.keySet());
 }
 
 


-
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: Refactor to avoid use of Hashtable. No functional change.

[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 317afcf5b8 Refactor to avoid use of Hashtable. No functional change.
317afcf5b8 is described below

commit 317afcf5b874b0a6d4445f620ba2331124c17e76
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:29:18 2022 +0100

Refactor to avoid use of Hashtable. No functional change.
---
 java/org/apache/catalina/startup/HomesUserDatabase.java  | 10 ++
 java/org/apache/catalina/startup/PasswdUserDatabase.java | 12 +++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/startup/HomesUserDatabase.java 
b/java/org/apache/catalina/startup/HomesUserDatabase.java
index 0b858c1df9..1a77c16fa8 100644
--- a/java/org/apache/catalina/startup/HomesUserDatabase.java
+++ b/java/org/apache/catalina/startup/HomesUserDatabase.java
@@ -18,8 +18,10 @@ package org.apache.catalina.startup;
 
 
 import java.io.File;
+import java.util.Collections;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -52,7 +54,7 @@ public final class HomesUserDatabase
 /**
  * The set of home directories for all defined users, keyed by username.
  */
-private final Hashtable homes = new Hashtable<>();
+private final Map homes = new HashMap<>();
 
 
 /**
@@ -100,11 +102,11 @@ public final class HomesUserDatabase
 
 
 /**
- * Return an enumeration of the usernames defined on this server.
+ * Return an enumeration of the user names defined on this server.
  */
 @Override
 public Enumeration getUsers() {
-return homes.keys();
+return Collections.enumeration(homes.keySet());
 }
 
 
diff --git a/java/org/apache/catalina/startup/PasswdUserDatabase.java 
b/java/org/apache/catalina/startup/PasswdUserDatabase.java
index 893557ad81..3cfc9f7fd1 100644
--- a/java/org/apache/catalina/startup/PasswdUserDatabase.java
+++ b/java/org/apache/catalina/startup/PasswdUserDatabase.java
@@ -18,8 +18,10 @@ package org.apache.catalina.startup;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
+import java.util.Collections;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -43,9 +45,9 @@ public final class PasswdUserDatabase implements UserDatabase 
{
 
 
 /**
- * The set of home directories for all defined users, keyed by username.
+ * The set of home directories for all defined users, keyed by user name.
  */
-private final Hashtable homes = new Hashtable<>();
+private final Map homes = new HashMap<>();
 
 
 /**
@@ -87,11 +89,11 @@ public final class PasswdUserDatabase implements 
UserDatabase {
 
 
 /**
- * Return an enumeration of the usernames defined on this server.
+ * Return an enumeration of the user names defined on this server.
  */
 @Override
 public Enumeration getUsers() {
-return homes.keys();
+return Collections.enumeration(homes.keySet());
 }
 
 


-
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: Refactor to avoid use of Hashtable. No functional change.

[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 f36d28ec85 Refactor to avoid use of Hashtable. No functional change.
f36d28ec85 is described below

commit f36d28ec85dd9338eedd4146a03525e272ee92bd
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:29:18 2022 +0100

Refactor to avoid use of Hashtable. No functional change.
---
 java/org/apache/catalina/startup/HomesUserDatabase.java  | 10 ++
 java/org/apache/catalina/startup/PasswdUserDatabase.java | 12 +++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/startup/HomesUserDatabase.java 
b/java/org/apache/catalina/startup/HomesUserDatabase.java
index 0b858c1df9..1a77c16fa8 100644
--- a/java/org/apache/catalina/startup/HomesUserDatabase.java
+++ b/java/org/apache/catalina/startup/HomesUserDatabase.java
@@ -18,8 +18,10 @@ package org.apache.catalina.startup;
 
 
 import java.io.File;
+import java.util.Collections;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -52,7 +54,7 @@ public final class HomesUserDatabase
 /**
  * The set of home directories for all defined users, keyed by username.
  */
-private final Hashtable homes = new Hashtable<>();
+private final Map homes = new HashMap<>();
 
 
 /**
@@ -100,11 +102,11 @@ public final class HomesUserDatabase
 
 
 /**
- * Return an enumeration of the usernames defined on this server.
+ * Return an enumeration of the user names defined on this server.
  */
 @Override
 public Enumeration getUsers() {
-return homes.keys();
+return Collections.enumeration(homes.keySet());
 }
 
 
diff --git a/java/org/apache/catalina/startup/PasswdUserDatabase.java 
b/java/org/apache/catalina/startup/PasswdUserDatabase.java
index 893557ad81..3cfc9f7fd1 100644
--- a/java/org/apache/catalina/startup/PasswdUserDatabase.java
+++ b/java/org/apache/catalina/startup/PasswdUserDatabase.java
@@ -18,8 +18,10 @@ package org.apache.catalina.startup;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
+import java.util.Collections;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -43,9 +45,9 @@ public final class PasswdUserDatabase implements UserDatabase 
{
 
 
 /**
- * The set of home directories for all defined users, keyed by username.
+ * The set of home directories for all defined users, keyed by user name.
  */
-private final Hashtable homes = new Hashtable<>();
+private final Map homes = new HashMap<>();
 
 
 /**
@@ -87,11 +89,11 @@ public final class PasswdUserDatabase implements 
UserDatabase {
 
 
 /**
- * Return an enumeration of the usernames defined on this server.
+ * Return an enumeration of the user names defined on this server.
  */
 @Override
 public Enumeration getUsers() {
-return homes.keys();
+return Collections.enumeration(homes.keySet());
 }
 
 


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

[tomcat] branch 8.5.x updated: Refactor to avoid use of Hashtable. No functional change.

[markt]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new faeeedc08b Refactor to avoid use of Hashtable. No functional change.
faeeedc08b is described below

commit faeeedc08bd13f17aaa8cdbdfce302f1a463aa09
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:29:18 2022 +0100

Refactor to avoid use of Hashtable. No functional change.
---
 java/org/apache/catalina/startup/HomesUserDatabase.java  | 10 ++
 java/org/apache/catalina/startup/PasswdUserDatabase.java | 12 +++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/startup/HomesUserDatabase.java 
b/java/org/apache/catalina/startup/HomesUserDatabase.java
index 0b858c1df9..1a77c16fa8 100644
--- a/java/org/apache/catalina/startup/HomesUserDatabase.java
+++ b/java/org/apache/catalina/startup/HomesUserDatabase.java
@@ -18,8 +18,10 @@ package org.apache.catalina.startup;
 
 
 import java.io.File;
+import java.util.Collections;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -52,7 +54,7 @@ public final class HomesUserDatabase
 /**
  * The set of home directories for all defined users, keyed by username.
  */
-private final Hashtable homes = new Hashtable<>();
+private final Map homes = new HashMap<>();
 
 
 /**
@@ -100,11 +102,11 @@ public final class HomesUserDatabase
 
 
 /**
- * Return an enumeration of the usernames defined on this server.
+ * Return an enumeration of the user names defined on this server.
  */
 @Override
 public Enumeration getUsers() {
-return homes.keys();
+return Collections.enumeration(homes.keySet());
 }
 
 
diff --git a/java/org/apache/catalina/startup/PasswdUserDatabase.java 
b/java/org/apache/catalina/startup/PasswdUserDatabase.java
index 893557ad81..3cfc9f7fd1 100644
--- a/java/org/apache/catalina/startup/PasswdUserDatabase.java
+++ b/java/org/apache/catalina/startup/PasswdUserDatabase.java
@@ -18,8 +18,10 @@ package org.apache.catalina.startup;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
+import java.util.Collections;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -43,9 +45,9 @@ public final class PasswdUserDatabase implements UserDatabase 
{
 
 
 /**
- * The set of home directories for all defined users, keyed by username.
+ * The set of home directories for all defined users, keyed by user name.
  */
-private final Hashtable homes = new Hashtable<>();
+private final Map homes = new HashMap<>();
 
 
 /**
@@ -87,11 +89,11 @@ public final class PasswdUserDatabase implements 
UserDatabase {
 
 
 /**
- * Return an enumeration of the usernames defined on this server.
+ * Return an enumeration of the user names defined on this server.
  */
 @Override
 public Enumeration getUsers() {
-return homes.keys();
+return Collections.enumeration(homes.keySet());
 }
 
 


-
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: Refactor to avoid use of Hashtable. No functional change.

[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 7ec46b2caf Refactor to avoid use of Hashtable. No functional change.
7ec46b2caf is described below

commit 7ec46b2caf5a3a887eced3cd2a598975be84ae4d
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:44:37 2022 +0100

Refactor to avoid use of Hashtable. No functional change.
---
 java/org/apache/catalina/tribes/util/StringManager.java | 5 ++---
 java/org/apache/naming/StringManager.java   | 6 +++---
 java/org/apache/tomcat/util/res/StringManager.java  | 5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/tribes/util/StringManager.java 
b/java/org/apache/catalina/tribes/util/StringManager.java
index 0979c469a6..ed689fdb8c 100644
--- a/java/org/apache/catalina/tribes/util/StringManager.java
+++ b/java/org/apache/catalina/tribes/util/StringManager.java
@@ -18,7 +18,7 @@ package org.apache.catalina.tribes.util;
 
 import java.text.MessageFormat;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -180,8 +180,7 @@ public class StringManager {
 // STATIC SUPPORT METHODS
 // --
 
-private static final Map> managers =
-new Hashtable<>();
+private static final Map> managers = new 
HashMap<>();
 
 
 /**
diff --git a/java/org/apache/naming/StringManager.java 
b/java/org/apache/naming/StringManager.java
index 0a4c3699ce..b20094d071 100644
--- a/java/org/apache/naming/StringManager.java
+++ b/java/org/apache/naming/StringManager.java
@@ -17,8 +17,9 @@
 package org.apache.naming;
 
 import java.text.MessageFormat;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
@@ -155,8 +156,7 @@ public class StringManager {
 // STATIC SUPPORT METHODS
 // --
 
-private static final Hashtable managers =
-new Hashtable<>();
+private static final Map managers = new HashMap<>();
 
 /**
  * Get the StringManager for a particular package. If a manager for
diff --git a/java/org/apache/tomcat/util/res/StringManager.java 
b/java/org/apache/tomcat/util/res/StringManager.java
index d9e11bb86e..91b39b48d7 100644
--- a/java/org/apache/tomcat/util/res/StringManager.java
+++ b/java/org/apache/tomcat/util/res/StringManager.java
@@ -18,7 +18,7 @@ package org.apache.tomcat.util.res;
 
 import java.text.MessageFormat;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -187,8 +187,7 @@ public class StringManager {
 // STATIC SUPPORT METHODS
 // --
 
-private static final Map> managers =
-new Hashtable<>();
+private static final Map> managers = new 
HashMap<>();
 
 
 /**


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

[tomcat] branch main updated: Refactor to avoid use of Hashtable. No functional change.

[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 d55ac6ef92 Refactor to avoid use of Hashtable. No functional change.
d55ac6ef92 is described below

commit d55ac6ef92e858082498d8882b36f8cb968e5a57
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:44:37 2022 +0100

Refactor to avoid use of Hashtable. No functional change.
---
 java/org/apache/catalina/tribes/util/StringManager.java | 5 ++---
 java/org/apache/naming/StringManager.java   | 6 +++---
 java/org/apache/tomcat/util/res/StringManager.java  | 5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/tribes/util/StringManager.java 
b/java/org/apache/catalina/tribes/util/StringManager.java
index aeb82f4235..0a60c94366 100644
--- a/java/org/apache/catalina/tribes/util/StringManager.java
+++ b/java/org/apache/catalina/tribes/util/StringManager.java
@@ -18,7 +18,7 @@ package org.apache.catalina.tribes.util;
 
 import java.text.MessageFormat;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -180,8 +180,7 @@ public class StringManager {
 // STATIC SUPPORT METHODS
 // --
 
-private static final Map> managers =
-new Hashtable<>();
+private static final Map> managers = new 
HashMap<>();
 
 
 /**
diff --git a/java/org/apache/naming/StringManager.java 
b/java/org/apache/naming/StringManager.java
index 0a4c3699ce..b20094d071 100644
--- a/java/org/apache/naming/StringManager.java
+++ b/java/org/apache/naming/StringManager.java
@@ -17,8 +17,9 @@
 package org.apache.naming;
 
 import java.text.MessageFormat;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
@@ -155,8 +156,7 @@ public class StringManager {
 // STATIC SUPPORT METHODS
 // --
 
-private static final Hashtable managers =
-new Hashtable<>();
+private static final Map managers = new HashMap<>();
 
 /**
  * Get the StringManager for a particular package. If a manager for
diff --git a/java/org/apache/tomcat/util/res/StringManager.java 
b/java/org/apache/tomcat/util/res/StringManager.java
index 17132b3d5e..ce68dc9827 100644
--- a/java/org/apache/tomcat/util/res/StringManager.java
+++ b/java/org/apache/tomcat/util/res/StringManager.java
@@ -18,7 +18,7 @@ package org.apache.tomcat.util.res;
 
 import java.text.MessageFormat;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -187,8 +187,7 @@ public class StringManager {
 // STATIC SUPPORT METHODS
 // --
 
-private static final Map> managers =
-new Hashtable<>();
+private static final Map> managers = new 
HashMap<>();
 
 
 /**


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

[tomcat] branch 8.5.x updated: Refactor to avoid use of Hashtable. No functional change.

[markt]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 0f673b7801 Refactor to avoid use of Hashtable. No functional change.
0f673b7801 is described below

commit 0f673b7801d2d669993a48db50f2d6cb58af4652
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:44:37 2022 +0100

Refactor to avoid use of Hashtable. No functional change.
---
 java/org/apache/catalina/tribes/util/StringManager.java | 5 ++---
 java/org/apache/naming/StringManager.java   | 6 +++---
 java/org/apache/tomcat/util/res/StringManager.java  | 5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/tribes/util/StringManager.java 
b/java/org/apache/catalina/tribes/util/StringManager.java
index 0979c469a6..ed689fdb8c 100644
--- a/java/org/apache/catalina/tribes/util/StringManager.java
+++ b/java/org/apache/catalina/tribes/util/StringManager.java
@@ -18,7 +18,7 @@ package org.apache.catalina.tribes.util;
 
 import java.text.MessageFormat;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -180,8 +180,7 @@ public class StringManager {
 // STATIC SUPPORT METHODS
 // --
 
-private static final Map> managers =
-new Hashtable<>();
+private static final Map> managers = new 
HashMap<>();
 
 
 /**
diff --git a/java/org/apache/naming/StringManager.java 
b/java/org/apache/naming/StringManager.java
index 0a4c3699ce..b20094d071 100644
--- a/java/org/apache/naming/StringManager.java
+++ b/java/org/apache/naming/StringManager.java
@@ -17,8 +17,9 @@
 package org.apache.naming;
 
 import java.text.MessageFormat;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
@@ -155,8 +156,7 @@ public class StringManager {
 // STATIC SUPPORT METHODS
 // --
 
-private static final Hashtable managers =
-new Hashtable<>();
+private static final Map managers = new HashMap<>();
 
 /**
  * Get the StringManager for a particular package. If a manager for
diff --git a/java/org/apache/tomcat/util/res/StringManager.java 
b/java/org/apache/tomcat/util/res/StringManager.java
index d9e11bb86e..91b39b48d7 100644
--- a/java/org/apache/tomcat/util/res/StringManager.java
+++ b/java/org/apache/tomcat/util/res/StringManager.java
@@ -18,7 +18,7 @@ package org.apache.tomcat.util.res;
 
 import java.text.MessageFormat;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -187,8 +187,7 @@ public class StringManager {
 // STATIC SUPPORT METHODS
 // --
 
-private static final Map> managers =
-new Hashtable<>();
+private static final Map> managers = new 
HashMap<>();
 
 
 /**


-
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: Refactor to avoid use of Hashtable. No functional change.

[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 86813018df Refactor to avoid use of Hashtable. No functional change.
86813018df is described below

commit 86813018df7cffce08228d1f75d5bf7ed66de6bc
Author: Mark Thomas 
AuthorDate: Wed Sep 14 19:44:37 2022 +0100

Refactor to avoid use of Hashtable. No functional change.
---
 java/org/apache/catalina/tribes/util/StringManager.java | 5 ++---
 java/org/apache/naming/StringManager.java   | 6 +++---
 java/org/apache/tomcat/util/res/StringManager.java  | 5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/tribes/util/StringManager.java 
b/java/org/apache/catalina/tribes/util/StringManager.java
index 0979c469a6..ed689fdb8c 100644
--- a/java/org/apache/catalina/tribes/util/StringManager.java
+++ b/java/org/apache/catalina/tribes/util/StringManager.java
@@ -18,7 +18,7 @@ package org.apache.catalina.tribes.util;
 
 import java.text.MessageFormat;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -180,8 +180,7 @@ public class StringManager {
 // STATIC SUPPORT METHODS
 // --
 
-private static final Map> managers =
-new Hashtable<>();
+private static final Map> managers = new 
HashMap<>();
 
 
 /**
diff --git a/java/org/apache/naming/StringManager.java 
b/java/org/apache/naming/StringManager.java
index 0a4c3699ce..b20094d071 100644
--- a/java/org/apache/naming/StringManager.java
+++ b/java/org/apache/naming/StringManager.java
@@ -17,8 +17,9 @@
 package org.apache.naming;
 
 import java.text.MessageFormat;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
@@ -155,8 +156,7 @@ public class StringManager {
 // STATIC SUPPORT METHODS
 // --
 
-private static final Hashtable managers =
-new Hashtable<>();
+private static final Map managers = new HashMap<>();
 
 /**
  * Get the StringManager for a particular package. If a manager for
diff --git a/java/org/apache/tomcat/util/res/StringManager.java 
b/java/org/apache/tomcat/util/res/StringManager.java
index d9e11bb86e..91b39b48d7 100644
--- a/java/org/apache/tomcat/util/res/StringManager.java
+++ b/java/org/apache/tomcat/util/res/StringManager.java
@@ -18,7 +18,7 @@ package org.apache.tomcat.util.res;
 
 import java.text.MessageFormat;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -187,8 +187,7 @@ public class StringManager {
 // STATIC SUPPORT METHODS
 // --
 
-private static final Map> managers =
-new Hashtable<>();
+private static final Map> managers = new 
HashMap<>();
 
 
 /**


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

Re: tomcat-jakartaee-migration #34 issue

[Rémy Maucherat]

On Wed, Sep 14, 2022 at 6:43 PM Han Li  wrote:
>
> Hi all,
>
> I am very sorry, I made a fatal mistake when fixing 
> tomcat-jakartaee-migration #29 issue, which led to #34 issue.

Well, when you do things, you're more likely to break things. So no
need to apologize.

> I have re-fixed this issue with this solution: 
> https://github.com/aooohan/tomcat-jakartaee-migration/blob/e07f9cb21b36fe44ef31cc97e39e2c1657a94424/src/main/java/org/apache/tomcat/jakartaee/Migration.java#L226-L239
>  
> 
> （I 'll continue optimising code tomorrow, it's late and I'm sleepy.）
>
> I will retest it tomorrow to make sure the problem is really fixed.
>
> But I don't know if this will affect the release tasks , like 10.1.x or other 
> version.
>
> How will we handle this situation, possibly by continuing to release 
> tomcat-jakartaee-migration 1.0.4?

With a regression, a 1.0.4 is needed, then start over the 10.1 and
10.0 release process. Good thing my internet access is "dead" (I hope
it will be fixed tomorrow), I haven't started 9.0 yet.

Rémy

>
> Best Regard
>
> Han

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

[tomcat-jakartaee-migration] branch main updated: Correct a regression in the previous fix for #29

[lihan]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new adc4ec5  Correct a regression in the previous fix for #29
adc4ec5 is described below

commit adc4ec5b8f3375bfc98d35f694fd6a0cc75f29f1
Author: lihan 
AuthorDate: Thu Sep 15 13:04:43 2022 +0800

Correct a regression in the previous fix for #29
---
 .../org/apache/tomcat/jakartaee/Migration.java | 91 ++
 1 file changed, 23 insertions(+), 68 deletions(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java 
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index bd18767..d8b899c 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -36,7 +36,6 @@ import java.util.zip.CRC32;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 
-import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
@@ -215,8 +214,9 @@ public class Migration {
 
 private void migrateArchiveStreaming(InputStream src, OutputStream dest) 
throws IOException {
 try (ZipArchiveInputStream srcZipStream = new 
ZipArchiveInputStream(CloseShieldInputStream.wrap(src));
-CrcZipArchiveOutputStream destZipStream = new 
CrcZipArchiveOutputStream(CloseShieldOutputStream.wrap(dest))) {
+ZipArchiveOutputStream destZipStream = new 
ZipArchiveOutputStream(CloseShieldOutputStream.wrap(dest))) {
 ZipArchiveEntry srcZipEntry;
+CRC32 crc32 = new CRC32();
 while ((srcZipEntry = srcZipStream.getNextZipEntry()) != null) {
 String srcName = srcZipEntry.getName();
 if (isSignatureFile(srcName)) {
@@ -224,11 +224,25 @@ public class Migration {
 continue;
 }
 String destName = profile.convert(srcName);
-MigrationZipArchiveEntry destZipEntry = new 
MigrationZipArchiveEntry(srcZipEntry, false);
-destZipEntry.setName(destName);
-destZipStream.putArchiveEntry(destZipEntry);
-migrateStream(srcName, srcZipStream, destZipStream);
-destZipStream.closeArchiveEntry();
+if (srcZipEntry.getMethod() == ZipEntry.STORED) {
+ByteArrayOutputStream tempBuffer = new 
ByteArrayOutputStream((int) (srcZipEntry.getSize() * 1.05));
+migrateStream(srcName, srcZipStream, tempBuffer);
+crc32.update(tempBuffer.toByteArray(), 0, 
tempBuffer.size());
+MigrationZipArchiveEntry destZipEntry = new 
MigrationZipArchiveEntry(srcZipEntry);
+destZipEntry.setName(destName);
+destZipEntry.setSize(tempBuffer.size());
+destZipEntry.setCrc(crc32.getValue());
+destZipStream.putArchiveEntry(destZipEntry);
+tempBuffer.writeTo(destZipStream);
+destZipStream.closeArchiveEntry();
+crc32.reset();
+} else {
+MigrationZipArchiveEntry destZipEntry = new 
MigrationZipArchiveEntry(srcZipEntry);
+destZipEntry.setName(destName);
+destZipStream.putArchiveEntry(destZipEntry);
+migrateStream(srcName, srcZipStream, destZipStream);
+destZipStream.closeArchiveEntry();
+}
 }
 }
 }
@@ -254,7 +268,7 @@ public class Migration {
 continue;
 }
 String destName = profile.convert(srcName);
-MigrationZipArchiveEntry destZipEntry = new 
MigrationZipArchiveEntry(srcZipEntry, true);
+MigrationZipArchiveEntry destZipEntry = new 
MigrationZipArchiveEntry(srcZipEntry);
 destZipEntry.setName(destName);
 destZipStream.putArchiveEntry(destZipEntry);
 migrateStream(srcName, srcZipFile.getInputStream(srcZipEntry), 
destZipStream);
@@ -320,30 +334,8 @@ public class Migration {
 }
 
 private static class MigrationZipArchiveEntry extends ZipArchiveEntry {
-protected final CRC32 crc = new CRC32();
-protected long size = 0;
-protected boolean needResetCrc;
-public MigrationZipArchiveEntry(ZipArchiveEntry entry, boolean 
inMemory) throws ZipException {
+public MigrationZipArchiveEntry(ZipArchiveEntry entry) throws 
ZipException {
 super(entry);
-// No recalculation required, when in memory mode and not of type 

[tomcat-jakartaee-migration] branch main updated: Add changelog entry

[lihan]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 90d2f46  Add changelog entry
90d2f46 is described below

commit 90d2f46977cff54925bd626932e9be74300bcd8f
Author: lihan 
AuthorDate: Thu Sep 15 13:14:34 2022 +0800

Add changelog entry
---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index f532c10..abe51c5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,7 @@
 
 ## 1.0.4 (in progress)
 
-- TBD
+- Correct a regression in the previous fix for 
[#29](https://github.com/apache/tomcat-jakartaee-migration/issues/29) (lihan)
 
 ## 1.0.3
 


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

[GitHub] [tomcat-jakartaee-migration] aooohan commented on issue #34: v1.0.3 causes java.lang.IllegalArgumentException: java.io.EOFException on certain Tomcat War deployments

[GitBox]

aooohan commented on issue #34:
URL: 
https://github.com/apache/tomcat-jakartaee-migration/issues/34#issuecomment-1247598549

   > After having a look at the jars and the file size differences between 
migrated ones with 1.0.0 and 1.0.3 I could figure out four jars where I can 
reproduce the issue at any time.
   
   This is entirely due to my unfamiliarity with the apache-commons-compress 
tool. I didn't read its java doc carefully, which led me to write a wrong code 
implementation that caused this.
   
   After a few tests, I think I have fixed the problem. Thanks to the detailed 
steps you provided to reproduce it, I was able to solve the issue so smoothly.
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[GitHub] [tomcat-jakartaee-migration] aooohan closed issue #34: v1.0.3 causes java.lang.IllegalArgumentException: java.io.EOFException on certain Tomcat War deployments

[GitBox]

aooohan closed issue #34: v1.0.3 causes java.lang.IllegalArgumentException: 
java.io.EOFException on certain Tomcat War deployments
URL: https://github.com/apache/tomcat-jakartaee-migration/issues/34


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[tomcat-jakartaee-migration] branch main updated: Modify description of changelog entry

[lihan]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new ca6e718  Modify description of changelog entry
ca6e718 is described below

commit ca6e71865eef5f324d46feaeed3b8d3b114b432e
Author: lihan 
AuthorDate: Thu Sep 15 13:35:06 2022 +0800

Modify description of changelog entry
---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index abe51c5..d724e8d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,7 @@
 
 ## 1.0.4 (in progress)
 
-- Correct a regression in the previous fix for 
[#29](https://github.com/apache/tomcat-jakartaee-migration/issues/29) (lihan)
+- Correct a wrong implementation in the previous fix for 
[#29](https://github.com/apache/tomcat-jakartaee-migration/issues/29) (lihan)
 
 ## 1.0.3
 


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

Re: tomcat-jakartaee-migration #34 issue

[Han Li]

> 2022年9月15日 04:06，Rémy Maucherat  写道：
> 
> On Wed, Sep 14, 2022 at 6:43 PM Han Li  wrote:
>> 
>> Hi all,
>> 
>> I am very sorry, I made a fatal mistake when fixing 
>> tomcat-jakartaee-migration #29 issue, which led to #34 issue.
> 
> Well, when you do things, you're more likely to break things. So no
> need to apologize.
: )  Thanks.


> 
>> I have re-fixed this issue with this solution: 
>> https://github.com/aooohan/tomcat-jakartaee-migration/blob/e07f9cb21b36fe44ef31cc97e39e2c1657a94424/src/main/java/org/apache/tomcat/jakartaee/Migration.java#L226-L239
>>  
>> 
>> （I 'll continue optimising code tomorrow, it's late and I'm sleepy.）
>> 
>> I will retest it tomorrow to make sure the problem is really fixed.
>> 
>> But I don't know if this will affect the release tasks , like 10.1.x or 
>> other version.
>> 
>> How will we handle this situation, possibly by continuing to release 
>> tomcat-jakartaee-migration 1.0.4?
> 
> With a regression, a 1.0.4 is needed, then start over the 10.1 and
> 10.0 release process.
I have fixed it.

> Good thing my internet access is "dead" (I hope
> it will be fixed tomorrow), I haven't started 9.0 yet.
Hmmm, Maybe your internet  has “guessed” in advance  that there was a problem 
with my fix. ;)

Han

> 
> Rémy
> 
>> 
>> Best Regard
>> 
>> Han
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 

[GitHub] [tomcat-jakartaee-migration] gregorkistler commented on issue #34: v1.0.3 causes java.lang.IllegalArgumentException: java.io.EOFException on certain Tomcat War deployments

[GitBox]

gregorkistler commented on issue #34:
URL: 
https://github.com/apache/tomcat-jakartaee-migration/issues/34#issuecomment-1247614172

   Sweet! Thank you. I can confirm that commit 
adc4ec5b8f3375bfc98d35f694fd6a0cc75f29f1 fixes the issue 🥳


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

Re: [VOTE] Release Apache Tomcat 10.1.0-M19

[Rémy Maucherat]

On Tue, Sep 13, 2022 at 7:09 PM Mark Thomas  wrote:
>
> The proposed Apache Tomcat 10.1.0-M19 release is now available for
> voting.
>
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
> without changes. Java EE applications designed for Tomcat 9 and earlier
> may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat
> will automatically convert them to Jakarta EE and copy them to the
> webapps directory.
>
> The notable changes compared to 10.1.0-M17 are:
>
> - Add support for authenticating WebSocket clients with an HTTP forward
>proxy when establishing a connection to a WebSocket endpoint via a
>forward proxy that requires authentication. Based on a patch provided
>by Joe Mokos.
>
> - Various fixes for edge case bugs in EL processing
>
> - Improve host header handling for HTTP/2 requests
>
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M19/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1389
>
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.0-M19
> ff0b6c231b7a1a416688346fdd299a3d6cfb5b64
>
>
> The proposed 10.1.0-M19 release is:
> [ ] Broken - do not release
> [X] Beta - go ahead and release as 10.1.0-M19 (beta)

About the 9.0 release, I will only do it tomorrow afternoon (or
night), bad internet access right now.

Rémy

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

[tomcat] tag 10.0.24 created (now d25d6a48e8)

[markt]

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

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


  at d25d6a48e8 (commit)
No new revisions were added by this update.


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

svn commit: r56814 - in /dev/tomcat/tomcat-10/v10.0.24-dev: ./ bin/ bin/embed/ src/

[markt]

Author: markt
Date: Wed Sep 14 11:07:17 2022
New Revision: 56814

Log:
Upload 10.0.24 for voting

Added:
dev/tomcat/tomcat-10/v10.0.24-dev/
dev/tomcat/tomcat-10/v10.0.24-dev/KEYS
dev/tomcat/tomcat-10/v10.0.24-dev/README.html
dev/tomcat/tomcat-10/v10.0.24-dev/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.0.24-dev/bin/
dev/tomcat/tomcat-10/v10.0.24-dev/bin/README.html

dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev-deployer.tar.gz 
  (with props)

dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev-deployer.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev-deployer.tar.gz.sha512

dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev-deployer.zip   
(with props)

dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev-deployer.zip.asc

dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev-deployer.zip.sha512

dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev-fulldocs.tar.gz 
  (with props)

dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev-fulldocs.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev-fulldocs.tar.gz.sha512

dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev-windows-x64.zip 
  (with props)

dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev-windows-x64.zip.asc

dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev-windows-x64.zip.sha512

dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev-windows-x86.zip 
  (with props)

dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev-windows-x86.zip.asc

dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev-windows-x86.zip.sha512
dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev.exe   (with 
props)
dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev.exe.asc
dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev.exe.sha512
dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev.zip   (with 
props)
dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev.zip.asc
dev/tomcat/tomcat-10/v10.0.24-dev/bin/apache-tomcat-10.0.24-dev.zip.sha512
dev/tomcat/tomcat-10/v10.0.24-dev/bin/embed/

dev/tomcat/tomcat-10/v10.0.24-dev/bin/embed/apache-tomcat-10.0.24-dev-embed.tar.gz
   (with props)

dev/tomcat/tomcat-10/v10.0.24-dev/bin/embed/apache-tomcat-10.0.24-dev-embed.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.24-dev/bin/embed/apache-tomcat-10.0.24-dev-embed.tar.gz.sha512

dev/tomcat/tomcat-10/v10.0.24-dev/bin/embed/apache-tomcat-10.0.24-dev-embed.zip 
  (with props)

dev/tomcat/tomcat-10/v10.0.24-dev/bin/embed/apache-tomcat-10.0.24-dev-embed.zip.asc

dev/tomcat/tomcat-10/v10.0.24-dev/bin/embed/apache-tomcat-10.0.24-dev-embed.zip.sha512
dev/tomcat/tomcat-10/v10.0.24-dev/src/
dev/tomcat/tomcat-10/v10.0.24-dev/src/apache-tomcat-10.0.24-dev-src.tar.gz  
 (with props)

dev/tomcat/tomcat-10/v10.0.24-dev/src/apache-tomcat-10.0.24-dev-src.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.24-dev/src/apache-tomcat-10.0.24-dev-src.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.24-dev/src/apache-tomcat-10.0.24-dev-src.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.24-dev/src/apache-tomcat-10.0.24-dev-src.zip.asc

dev/tomcat/tomcat-10/v10.0.24-dev/src/apache-tomcat-10.0.24-dev-src.zip.sha512

Added: dev/tomcat/tomcat-10/v10.0.24-dev/KEYS
==
--- dev/tomcat/tomcat-10/v10.0.24-dev/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.0.24-dev/KEYS Wed Sep 14 11:07:17 2022
@@ -0,0 +1,453 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+pub   4096R/2F6059E7 2009-09-18
+  Key fingerprint = A9C5 DF4D 22E9 9998 D987  5A51 10C0 1C5A 2F60 59E7
+uid  Mark E D Thomas 
+sub   4096R/5E763BEC 2009-09-18
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Comment: GPGTools - http://gpgtools.org
+
+mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX
+pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t
+6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K
+GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz
+4yvDOZItqDURP

svn commit: r56815 - /dev/tomcat/tomcat-10/v10.0.24-dev/

[markt]

Author: markt
Date: Wed Sep 14 11:19:51 2022
New Revision: 56815

Log:
Something isn't right. Starting again...

Removed:
dev/tomcat/tomcat-10/v10.0.24-dev/


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

[tomcat] tag 10.0.24 created (now 74a5bd703f)

[markt]

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

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


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

 new 74a5bd703f Tag 10.0.24

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



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

[tomcat] 01/01: Tag 10.0.24

[markt]

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

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

commit 74a5bd703f1d477548449bd400721e960cc4514c
Author: Mark Thomas 
AuthorDate: Wed Sep 14 13:47:29 2022 +0100

Tag 10.0.24
---
 build.properties.release |  49 +++
 res/install-win/Uninstall.exe.sig| Bin 0 -> 10253 bytes
 res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10253 bytes
 res/maven/mvn.properties.release |  27 +
 webapps/docs/changelog.xml   |   2 +-
 5 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/build.properties.release b/build.properties.release
new file mode 100644
index 00..c7986eb8c6
--- /dev/null
+++ b/build.properties.release
@@ -0,0 +1,49 @@
+# -
+# 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.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Any unwanted settings may be over-ridden in a build.properties file located
+# in the same directory as this file.
+
+# Set the version-dev to "" (empty string) as this is not a development 
release.
+version.dev=
+
+# Ensure consistent timestamps for reproducible builds.
+ant.tstamp.now.iso=2022-09-14T12:25:32Z
+
+# Enable insertion of detatched signatures into the Windows installer.
+do.codesigning=true
+
+# Reproducible builds require the use of the build tools defined below. The
+# vendors (where appropriate) and versions must match exactly for a 
reproducible
+# build since this data is embedded in various files, particularly JAR file
+# manifests, as part of the build process.
+#
+# Apache Ant:  Apache Ant(TM) version 1.10.12 compiled on October 13 2021
+#
+# Java Name:   OpenJDK 64-Bit Server VM
+# Java Vendor: Eclipse Adoptium
+# Java Version:11.0.15+10
+
+# The following is provided for information only. Builds will be repeatable
+# whether or not the build ennvironment in consistent with this information.
+#
+# OS:  amd64 Windows Server 2022 10.0
+# File encoding:   Cp1252
+#
+# Release Manager: markt
diff --git a/res/install-win/Uninstall.exe.sig 
b/res/install-win/Uninstall.exe.sig
new file mode 100644
index 00..bb2bcdf7a8
Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ
diff --git a/res/install-win/tomcat-installer.exe.sig 
b/res/install-win/tomcat-installer.exe.sig
new file mode 100644
index 00..a511cd6be0
Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ
diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release
new file mode 100644
index 00..f13d6926d4
--- /dev/null
+++ b/res/maven/mvn.properties.release
@@ -0,0 +1,27 @@
+# -
+# 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.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Remove "-dev" from the version since this is not a development release.
+maven.asf.release.deploy.version=10.0.24
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/GnuPG/bin/gpg.exe
+
+# Set the user name to use to upload the artefacts to Nexus.
+asf.ldap.username=markt
diff --git 

svn commit: r56816 - in /dev/tomcat/tomcat-10/v10.0.24: ./ bin/ bin/embed/ src/

[markt]

Author: markt
Date: Wed Sep 14 13:09:24 2022
New Revision: 56816

Log:
Upload 10.0.24 for voting

Added:
dev/tomcat/tomcat-10/v10.0.24/
dev/tomcat/tomcat-10/v10.0.24/KEYS
dev/tomcat/tomcat-10/v10.0.24/README.html
dev/tomcat/tomcat-10/v10.0.24/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.0.24/bin/
dev/tomcat/tomcat-10/v10.0.24/bin/README.html
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24-deployer.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24-deployer.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24-deployer.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24-deployer.zip.asc
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24-deployer.zip.sha512
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24-fulldocs.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24-windows-x64.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24-windows-x64.zip.asc

dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24-windows-x64.zip.sha512
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24-windows-x86.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24-windows-x86.zip.asc

dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24-windows-x86.zip.sha512
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24.exe   (with props)
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24.exe.asc
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24.exe.sha512
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24.tar.gz   (with 
props)
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24.tar.gz.asc
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24.zip   (with props)
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24.zip.asc
dev/tomcat/tomcat-10/v10.0.24/bin/apache-tomcat-10.0.24.zip.sha512
dev/tomcat/tomcat-10/v10.0.24/bin/embed/
dev/tomcat/tomcat-10/v10.0.24/bin/embed/apache-tomcat-10.0.24-embed.tar.gz  
 (with props)

dev/tomcat/tomcat-10/v10.0.24/bin/embed/apache-tomcat-10.0.24-embed.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.24/bin/embed/apache-tomcat-10.0.24-embed.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.24/bin/embed/apache-tomcat-10.0.24-embed.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.24/bin/embed/apache-tomcat-10.0.24-embed.zip.asc

dev/tomcat/tomcat-10/v10.0.24/bin/embed/apache-tomcat-10.0.24-embed.zip.sha512
dev/tomcat/tomcat-10/v10.0.24/src/
dev/tomcat/tomcat-10/v10.0.24/src/apache-tomcat-10.0.24-src.tar.gz   (with 
props)
dev/tomcat/tomcat-10/v10.0.24/src/apache-tomcat-10.0.24-src.tar.gz.asc
dev/tomcat/tomcat-10/v10.0.24/src/apache-tomcat-10.0.24-src.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.24/src/apache-tomcat-10.0.24-src.zip   (with 
props)
dev/tomcat/tomcat-10/v10.0.24/src/apache-tomcat-10.0.24-src.zip.asc
dev/tomcat/tomcat-10/v10.0.24/src/apache-tomcat-10.0.24-src.zip.sha512

Added: dev/tomcat/tomcat-10/v10.0.24/KEYS
==
--- dev/tomcat/tomcat-10/v10.0.24/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.0.24/KEYS Wed Sep 14 13:09:24 2022
@@ -0,0 +1,453 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+pub   4096R/2F6059E7 2009-09-18
+  Key fingerprint = A9C5 DF4D 22E9 9998 D987  5A51 10C0 1C5A 2F60 59E7
+uid  Mark E D Thomas 
+sub   4096R/5E763BEC 2009-09-18
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Comment: GPGTools - http://gpgtools.org
+
+mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX
+pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t
+6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K
+GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz
+4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M
+UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF
+kUi8BjCHDcSgE/IReKUanjHzm4XSymKDTeqqzidi4k6PDD4jyHb8k8vxi6qT6Udn
+lcfo5NBkkUT1TauhEy8ktHhbl9k60BvvMBP9l6cURiJg1WS77egI4P/82oPbzzFi
+GFqXyJKULVgxtdQ3JikCpodp3f1fh6PlYZwkW4xCJLJucJ5MiQp07HAkMVW5w+k8
+Xvuk4i5quh3N+2kzKHOOiQCDmN0sz0XjOE+