(tomcat-tck) 05/05: The final 6.0.0 TCK has been staged

[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-tck.git

commit 1af6a7d2f1192365f51b0891b97893f9d81bd11c
Author: Mark Thomas 
AuthorDate: Thu Feb 29 17:46:02 2024 +

The final 6.0.0 TCK has been staged
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8df9a7a..3933b6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
 11.0.0-M18-SNAPSHOT
 
 
-6.0.0-SNAPSHOT
+6.0.0
 6.0.0-SNAPSHOT
 4.0.0-SNAPSHOT
 10.0.0-SNAPSHOT


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

(tomcat-tck) 04/05: First pass at adding JSP TCK

[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-tck.git

commit ca80e510e3096d563736b106fbaf960bd84ea5be
Author: Mark Thomas 
AuthorDate: Thu Feb 29 15:29:06 2024 +

First pass at adding JSP TCK
---
 README.md   |  22 ++
 jsp-tck/pom.xml | 124 
 2 files changed, 146 insertions(+)

diff --git a/README.md b/README.md
index f687d65..e24ac46 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,22 @@ At the moment, you will need to build the TCK locally (see 
below).
 
 1. `mvn verify`
 
+### Running the Servlet TCK
+
+1. Review the component TCK and Tomcat versions in `$TCK_TOMCAT/pom.xml` and 
edit as required.
+
+1. `cd $TOMCAT_TCK\servlet-tck`
+
+1. `mvn verify`
+
+### Running the JSP TCK
+
+1. Review the component TCK and Tomcat versions in `$TCK_TOMCAT/pom.xml` and 
edit as required.
+
+1. `cd $TOMCAT_TCK\jsp-tck`
+
+1. `mvn verify`
+
 ### Running against a local build of the TCK
 
 1. Checkout the tckrefactor branch of the jakarta-tck repository to `$TCK`
@@ -63,6 +79,12 @@ At the moment, you will need to build the TCK locally (see 
below).
cd $TCK/el
mvn install

+   cd $TCK/servlet
+   mvn install
+   
+   cd $TCK/jsp
+   mvn install
+   
cd $TCK/websocket
mvn install
 ```
diff --git a/jsp-tck/pom.xml b/jsp-tck/pom.xml
new file mode 100644
index 000..ed5df5a
--- /dev/null
+++ b/jsp-tck/pom.xml
@@ -0,0 +1,124 @@
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+jsp-tck
+jar
+4.0.0
+
+
+org.apache.tomcat
+tck
+11.0.0-SNAPSHOT
+../pom.xml
+
+
+
+
+jakarta.tck
+jakarta-pages-tck
+${tck.jsp.version}
+
+
+  
+jakarta.servlet.jsp
+jakarta.jsp-api
+  
+
+
+
+org.apache.tomcat
+tomcat-jasper-el
+${tomcat.version}
+test
+
+
+org.apache.tomcat.embed
+tomcat-embed-jasper
+${tomcat.version}
+test
+
+
+jakarta.tck
+common
+${tck.common.version}
+
+
+org.jboss.arquillian.container
+arquillian-tomcat-embedded-10
+${arquillian.tomcat.version}
+test
+
+
+org.jboss.arquillian.container
+arquillian-container-spi
+${arquillian.version}
+
+
+org.jboss.arquillian.test
+arquillian-test-api
+${arquillian.version}
+
+
+org.jboss.arquillian.junit5
+arquillian-junit5-container
+${arquillian.version}
+
+
+org.jboss.arquillian.junit5
+arquillian-junit5-core
+${arquillian.version}
+
+
+junit
+junit
+4.13.2
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+${failsafe.plugin.version}
+
+
+
+integration-test
+verify
+
+
+
jakarta.tck:jakarta-pages-tck
+false
+
+localhost
+8080
+
8443
+5
+true
+
com.sun.ts.tests.jsp.lib.implementation.sun.common.SunRIURL
+
${settings.localRepository}/org/apache/tomcat/tomcat-jsp-api/${tomcat.version}/tomcat-jsp-api-${tomcat.version}.jar:${settings.localRepository}/org/apache/tomcat/tomcat-el-api/11.0.0-M18-SNAPSHOT/tomcat-el-api-11.0.0-M18-SNAPSHOT.jar:${settings.localRepository}/org/apache/tomcat/tomcat-servlet-api/11.0.0-M18-SNAPSHOT/tomcat-servlet-api-11.0.0-M18-SNAPSHOT.jar:${env.JAVA_HOME}/jmods/java.base
+
+
+
+
+
+
+
+


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

(tomcat-tck) 03/05: Version updates. TCK group ID 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-tck.git

commit 365ba8f834edaf9fbf49e9b4b90474540b74663f
Author: Mark Thomas 
AuthorDate: Thu Feb 29 15:28:45 2024 +

Version updates. TCK group ID change
---
 websocket-tck/pom.xml | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/websocket-tck/pom.xml b/websocket-tck/pom.xml
index 65f707e..8a180fe 100644
--- a/websocket-tck/pom.xml
+++ b/websocket-tck/pom.xml
@@ -30,7 +30,7 @@
 
 
 
-jakartatck
+jakarta.tck
 websocket-tck
 ${tck.websocket.version}
 
@@ -54,7 +54,7 @@
 test
 
 
-jakartatck
+jakarta.tck
 common
 ${tck.common.version}
 
@@ -89,7 +89,9 @@
 
 
 
+org.apache.maven.plugins
 maven-failsafe-plugin
+${failsafe.plugin.version}
 
 
 
@@ -100,7 +102,7 @@
 
 **/platform/**
 
-
jakartatck:websocket-tck
+
jakarta.tck:websocket-tck
 false
 
 localhost


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

(tomcat-tck) 01/05: Update TCK group ID. Fix warnings in pom.

[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-tck.git

commit 8eab85c10ff6ccbec041edc6737f19abb254fd84
Author: Mark Thomas 
AuthorDate: Thu Feb 29 15:23:03 2024 +

Update TCK group ID. Fix warnings in pom.
---
 el-tck/pom.xml | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/el-tck/pom.xml b/el-tck/pom.xml
index a644a3b..c902151 100644
--- a/el-tck/pom.xml
+++ b/el-tck/pom.xml
@@ -30,7 +30,7 @@
 
 
 
-jakartatck
+jakarta.tck
 jakarta-expression-language-tck
 ${tck.el.version}
 

(tomcat) branch 8.5.x updated: Align error handling for CoyoteWriter and CoyoteOutputStream

[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 fda5196f31 Align error handling for CoyoteWriter and CoyoteOutputStream
fda5196f31 is described below

commit fda5196f317d3d014b35969029ccddffd022563c
Author: Mark Thomas 
AuthorDate: Thu Feb 29 09:10:19 2024 +

Align error handling for CoyoteWriter and CoyoteOutputStream

Prior to this change it was possible for errors on the
CoyoteOutputStream to be recorded against the wrong response if the
response was recycled during the call to realWriteBytes().
---
 .../catalina/connector/CoyoteOutputStream.java | 35 ++
 .../apache/catalina/connector/CoyoteWriter.java| 12 +---
 .../apache/catalina/connector/OutputBuffer.java|  7 -
 webapps/docs/changelog.xml | 11 +++
 4 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteOutputStream.java 
b/java/org/apache/catalina/connector/CoyoteOutputStream.java
index a6cb729b9e..40209b352e 100644
--- a/java/org/apache/catalina/connector/CoyoteOutputStream.java
+++ b/java/org/apache/catalina/connector/CoyoteOutputStream.java
@@ -78,7 +78,12 @@ public class CoyoteOutputStream extends ServletOutputStream {
 @Override
 public void write(int i) throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.writeByte(i);
+try {
+ob.writeByte(i);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -94,7 +99,12 @@ public class CoyoteOutputStream extends ServletOutputStream {
 @Override
 public void write(byte[] b, int off, int len) throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.write(b, off, len);
+try {
+ob.write(b, off, len);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -104,7 +114,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 public void write(ByteBuffer from) throws IOException {
 Objects.requireNonNull(from);
 boolean nonBlocking = checkNonBlockingWrite();
-ob.write(from);
+try {
+ob.write(from);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -117,7 +132,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 @Override
 public void flush() throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.flush();
+try {
+ob.flush();
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -152,7 +172,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 
 @Override
 public void close() throws IOException {
-ob.close();
+try {
+ob.close();
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 }
 
 @Override
diff --git a/java/org/apache/catalina/connector/CoyoteWriter.java 
b/java/org/apache/catalina/connector/CoyoteWriter.java
index 6eef35949d..6868156f0a 100644
--- a/java/org/apache/catalina/connector/CoyoteWriter.java
+++ b/java/org/apache/catalina/connector/CoyoteWriter.java
@@ -92,7 +92,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.flush();
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -130,7 +130,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(c);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -146,7 +146,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(buf, off, len);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -168,7 +168,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(s, off, len);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -313,4 +313,8 @@ public class CoyoteWriter extends PrintWriter {
 }
 
 
+private void setErrorException(Exception e) {
+error = true;
+ob.setErrorException(e

(tomcat) branch 9.0.x updated: Align error handling for CoyoteWriter and CoyoteOutputStream

[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 0f873149e5 Align error handling for CoyoteWriter and CoyoteOutputStream
0f873149e5 is described below

commit 0f873149e52c83307038e2d2347682b56d276fb9
Author: Mark Thomas 
AuthorDate: Thu Feb 29 09:10:19 2024 +

Align error handling for CoyoteWriter and CoyoteOutputStream

Prior to this change it was possible for errors on the
CoyoteOutputStream to be recorded against the wrong response if the
response was recycled during the call to realWriteBytes().
---
 .../catalina/connector/CoyoteOutputStream.java | 35 ++
 .../apache/catalina/connector/CoyoteWriter.java| 12 +---
 .../apache/catalina/connector/OutputBuffer.java|  7 -
 webapps/docs/changelog.xml |  7 +
 4 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteOutputStream.java 
b/java/org/apache/catalina/connector/CoyoteOutputStream.java
index a6cb729b9e..40209b352e 100644
--- a/java/org/apache/catalina/connector/CoyoteOutputStream.java
+++ b/java/org/apache/catalina/connector/CoyoteOutputStream.java
@@ -78,7 +78,12 @@ public class CoyoteOutputStream extends ServletOutputStream {
 @Override
 public void write(int i) throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.writeByte(i);
+try {
+ob.writeByte(i);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -94,7 +99,12 @@ public class CoyoteOutputStream extends ServletOutputStream {
 @Override
 public void write(byte[] b, int off, int len) throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.write(b, off, len);
+try {
+ob.write(b, off, len);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -104,7 +114,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 public void write(ByteBuffer from) throws IOException {
 Objects.requireNonNull(from);
 boolean nonBlocking = checkNonBlockingWrite();
-ob.write(from);
+try {
+ob.write(from);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -117,7 +132,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 @Override
 public void flush() throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.flush();
+try {
+ob.flush();
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -152,7 +172,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 
 @Override
 public void close() throws IOException {
-ob.close();
+try {
+ob.close();
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 }
 
 @Override
diff --git a/java/org/apache/catalina/connector/CoyoteWriter.java 
b/java/org/apache/catalina/connector/CoyoteWriter.java
index 6eef35949d..6868156f0a 100644
--- a/java/org/apache/catalina/connector/CoyoteWriter.java
+++ b/java/org/apache/catalina/connector/CoyoteWriter.java
@@ -92,7 +92,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.flush();
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -130,7 +130,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(c);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -146,7 +146,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(buf, off, len);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -168,7 +168,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(s, off, len);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -313,4 +313,8 @@ public class CoyoteWriter extends PrintWriter {
 }
 
 
+private void setErrorException(Exception e) {
+error = true;
+ob.setErrorException(e

(tomcat) branch 10.1.x updated: Align error handling for CoyoteWriter and CoyoteOutputStream

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 67584b93a0 Align error handling for CoyoteWriter and CoyoteOutputStream
67584b93a0 is described below

commit 67584b93a0dd4b447105540f76d318c8406d68c3
Author: Mark Thomas 
AuthorDate: Thu Feb 29 09:10:19 2024 +

Align error handling for CoyoteWriter and CoyoteOutputStream

Prior to this change it was possible for errors on the
CoyoteOutputStream to be recorded against the wrong response if the
response was recycled during the call to realWriteBytes().
---
 .../catalina/connector/CoyoteOutputStream.java | 35 ++
 .../apache/catalina/connector/CoyoteWriter.java| 12 +---
 .../apache/catalina/connector/OutputBuffer.java|  7 -
 webapps/docs/changelog.xml |  7 +
 4 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteOutputStream.java 
b/java/org/apache/catalina/connector/CoyoteOutputStream.java
index 4096e4d38d..139b1e6eb5 100644
--- a/java/org/apache/catalina/connector/CoyoteOutputStream.java
+++ b/java/org/apache/catalina/connector/CoyoteOutputStream.java
@@ -78,7 +78,12 @@ public class CoyoteOutputStream extends ServletOutputStream {
 @Override
 public void write(int i) throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.writeByte(i);
+try {
+ob.writeByte(i);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -94,7 +99,12 @@ public class CoyoteOutputStream extends ServletOutputStream {
 @Override
 public void write(byte[] b, int off, int len) throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.write(b, off, len);
+try {
+ob.write(b, off, len);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -104,7 +114,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 public void write(ByteBuffer from) throws IOException {
 Objects.requireNonNull(from);
 boolean nonBlocking = checkNonBlockingWrite();
-ob.write(from);
+try {
+ob.write(from);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -117,7 +132,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 @Override
 public void flush() throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.flush();
+try {
+ob.flush();
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -152,7 +172,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 
 @Override
 public void close() throws IOException {
-ob.close();
+try {
+ob.close();
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 }
 
 @Override
diff --git a/java/org/apache/catalina/connector/CoyoteWriter.java 
b/java/org/apache/catalina/connector/CoyoteWriter.java
index 6eef35949d..6868156f0a 100644
--- a/java/org/apache/catalina/connector/CoyoteWriter.java
+++ b/java/org/apache/catalina/connector/CoyoteWriter.java
@@ -92,7 +92,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.flush();
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -130,7 +130,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(c);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -146,7 +146,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(buf, off, len);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -168,7 +168,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(s, off, len);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -313,4 +313,8 @@ public class CoyoteWriter extends PrintWriter {
 }
 
 
+private void setErrorException(Exception e) {
+error = true;
+ob.setErrorException(e

(tomcat) branch main updated: Align error handling for CoyoteWriter and CoyoteOutputStream

[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 6ee4600185 Align error handling for CoyoteWriter and CoyoteOutputStream
6ee4600185 is described below

commit 6ee4600185945c4c37ff81403c616bf9db3ec34f
Author: Mark Thomas 
AuthorDate: Thu Feb 29 09:10:19 2024 +

Align error handling for CoyoteWriter and CoyoteOutputStream

Prior to this change it was possible for errors on the
CoyoteOutputStream to be recorded against the wrong response if the
response was recycled during the call to realWriteBytes().
---
 .../catalina/connector/CoyoteOutputStream.java | 35 ++
 .../apache/catalina/connector/CoyoteWriter.java| 12 +---
 .../apache/catalina/connector/OutputBuffer.java|  7 -
 webapps/docs/changelog.xml |  7 +
 4 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteOutputStream.java 
b/java/org/apache/catalina/connector/CoyoteOutputStream.java
index c61eebf8e5..9dd3f11197 100644
--- a/java/org/apache/catalina/connector/CoyoteOutputStream.java
+++ b/java/org/apache/catalina/connector/CoyoteOutputStream.java
@@ -78,7 +78,12 @@ public class CoyoteOutputStream extends ServletOutputStream {
 @Override
 public void write(int i) throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.writeByte(i);
+try {
+ob.writeByte(i);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -94,7 +99,12 @@ public class CoyoteOutputStream extends ServletOutputStream {
 @Override
 public void write(byte[] b, int off, int len) throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.write(b, off, len);
+try {
+ob.write(b, off, len);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -108,7 +118,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 if (from.remaining() == 0) {
 return;
 }
-ob.write(from);
+try {
+ob.write(from);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -121,7 +136,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 @Override
 public void flush() throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.flush();
+try {
+ob.flush();
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -156,7 +176,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 
 @Override
 public void close() throws IOException {
-ob.close();
+try {
+ob.close();
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 }
 
 @Override
diff --git a/java/org/apache/catalina/connector/CoyoteWriter.java 
b/java/org/apache/catalina/connector/CoyoteWriter.java
index 6eef35949d..6868156f0a 100644
--- a/java/org/apache/catalina/connector/CoyoteWriter.java
+++ b/java/org/apache/catalina/connector/CoyoteWriter.java
@@ -92,7 +92,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.flush();
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -130,7 +130,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(c);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -146,7 +146,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(buf, off, len);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -168,7 +168,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(s, off, len);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -313,4 +313,8 @@ public class CoyoteWriter extends PrintWriter {
 }
 
 
+private void setErrorException(Exception e) {
+error = true;
+ob.setErrorException(e);
+}
 }
diff --git a/java/org/apache/catalina/connector/OutputBuffer.java 
b/java/org

(tomcat) branch 8.5.x updated: Don't overwrite the initial exception with any subsequent exception

[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 0b4848acdd Don't overwrite the initial exception with any subsequent 
exception
0b4848acdd is described below

commit 0b4848acddac44944c07fe846e9b8046b53e7b59
Author: Mark Thomas 
AuthorDate: Thu Feb 29 09:03:42 2024 +

Don't overwrite the initial exception with any subsequent exception
---
 java/org/apache/coyote/Response.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/Response.java 
b/java/org/apache/coyote/Response.java
index 9e11308278..930f2c19e3 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -275,7 +275,9 @@ public final class Response {
  * @param ex The exception that occurred
  */
 public void setErrorException(Exception ex) {
-errorException = ex;
+if (errorException == null) {
+errorException = ex;
+}
 }
 
 


-
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: Don't overwrite the initial exception with any subsequent exception

[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 2f876d2997 Don't overwrite the initial exception with any subsequent 
exception
2f876d2997 is described below

commit 2f876d29974b79fdf5740470bca60a5678b177ea
Author: Mark Thomas 
AuthorDate: Thu Feb 29 09:03:42 2024 +

Don't overwrite the initial exception with any subsequent exception
---
 java/org/apache/coyote/Response.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/Response.java 
b/java/org/apache/coyote/Response.java
index e1bed1c4e0..4af1c8a4c7 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -278,7 +278,9 @@ public final class Response {
  * @param ex The exception that occurred
  */
 public void setErrorException(Exception ex) {
-errorException = ex;
+if (errorException == null) {
+errorException = ex;
+}
 }
 
 


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

(tomcat) branch 10.1.x updated: Don't overwrite the initial exception with any subsequent exception

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new afab76ec57 Don't overwrite the initial exception with any subsequent 
exception
afab76ec57 is described below

commit afab76ec57db3140997062ff3ca99dffe2b02b09
Author: Mark Thomas 
AuthorDate: Thu Feb 29 09:03:42 2024 +

Don't overwrite the initial exception with any subsequent exception
---
 java/org/apache/coyote/Response.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/Response.java 
b/java/org/apache/coyote/Response.java
index 354634513d..b1d88ee267 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -288,7 +288,9 @@ public final class Response {
  * @param ex The exception that occurred
  */
 public void setErrorException(Exception ex) {
-errorException = ex;
+if (errorException == null) {
+errorException = ex;
+}
 }
 
 


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

(tomcat) branch main updated: Don't overwrite the initial exception with any subsequent exception

[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 8910694963 Don't overwrite the initial exception with any subsequent 
exception
8910694963 is described below

commit 89106949633cd778939574960980d4cfcbdba915
Author: Mark Thomas 
AuthorDate: Thu Feb 29 09:03:42 2024 +

Don't overwrite the initial exception with any subsequent exception
---
 java/org/apache/coyote/Response.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/Response.java 
b/java/org/apache/coyote/Response.java
index d0d7f2a54d..8bc89249b7 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -284,7 +284,9 @@ public final class Response {
  * @param ex The exception that occurred
  */
 public void setErrorException(Exception ex) {
-errorException = ex;
+if (errorException == null) {
+errorException = ex;
+}
 }
 
 


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

(tomcat) 02/02: Add release date for 8.5.99

[markt]

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

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

commit 42440c8e69e127e7a17cfcc3922d1f8407d4f698
Author: Mark Thomas 
AuthorDate: Tue Feb 27 09:04:26 2024 +

Add release date for 8.5.99
---
 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 37737186fb..78cd4aa7ce 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,7 +127,7 @@
 
   
 
-
+
   
 
   


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

(tomcat) 01/02: Add support for JSP compilation with Java 22

[markt]

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

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

commit 87e34bed3d21377bedf830d9d03f2ae44e0dcc2f
Author: Mark Thomas 
AuthorDate: Tue Feb 27 09:01:47 2024 +

Add support for JSP compilation with Java 22
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++
 webapps/docs/changelog.xml   | 11 +++
 2 files changed, 22 insertions(+)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 8ab753b541..487499b7ba 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -384,6 +384,11 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 // Java 7.
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_Source, "21");
+} else if (opt.equals("22")) {
+// Constant not available in latest ECJ version that runs on
+// Java 7.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "22");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
 settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_7);
@@ -493,6 +498,12 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_TargetPlatform, "21");
 settings.put(CompilerOptions.OPTION_Compliance, "21");
+} else if (opt.equals("22")) {
+// Constant not available in latest ECJ version that runs on
+// Java 7.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "22");
+settings.put(CompilerOptions.OPTION_Compliance, "22");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM", 
opt));
 settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_1_7);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cfa29db518..37737186fb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,17 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Add support for specifying Java 22 (with the value 22) as
+the compiler source and/or compiler target for JSP compilation. If used
+with an Eclipse JDT compiler version that does not support these 
values,
+a warning will be logged and the default will used.
+(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 (4e288be9c9 -> 42440c8e69)

[markt]

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

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


from 4e288be9c9 Remove old javadoc
 new 87e34bed3d Add support for JSP compilation with Java 22
 new 42440c8e69 Add release date for 8.5.99

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


Summary of changes:
 java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++
 webapps/docs/changelog.xml   | 13 -
 2 files changed, 23 insertions(+), 1 deletion(-)


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

(tomcat) branch 10.1.x updated: Fix copy/paste error

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 73ae83a602 Fix copy/paste error
73ae83a602 is described below

commit 73ae83a602d10257a21134bd5c32a719aa0b49e9
Author: Mark Thomas 
AuthorDate: Tue Feb 27 09:01:15 2024 +

Fix copy/paste error
---
 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 8ebde7195b..0d11f722ed 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -108,7 +108,7 @@
   
 
   
-Add support for specifying Java 21 (with the value 21) as
+Add support for specifying Java 22 (with the value 22) as
 the compiler source and/or compiler target for JSP compilation. If used
 with an Eclipse JDT compiler version that does not support these 
values,
 a warning will be logged and the default will used.


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

(tomcat) branch 10.1.x updated: Better comment - aligns with 9.0.x

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new c5bbf38efe Better comment - aligns with 9.0.x
c5bbf38efe is described below

commit c5bbf38efe7b19b4ce35407a3e6d153144090aba
Author: Mark Thomas 
AuthorDate: Tue Feb 27 08:59:42 2024 +

Better comment - aligns with 9.0.x
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 283738d319..2179f3a7e7 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -318,18 +318,18 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 } else if (opt.equals("19")) {
 settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_19);
 } else if (opt.equals("20")) {
-// Constant not available in ECJ version shipped with
-// Tomcat. May be supported in a later or snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 11.
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_Source, "20");
 } else if (opt.equals("21")) {
-// Constant not available in ECJ version shipped with
-// Tomcat. May be supported in a later or snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 11.
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_Source, "21");
 } else if (opt.equals("22")) {
-// Constant not available in ECJ version shipped with
-// Tomcat. May be supported in a later or snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 11.
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_Source, "22");
 } else {
@@ -400,20 +400,20 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_19);
 settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_19);
 } else if (opt.equals("20")) {
-// Constant not available in ECJ version shipped with
-// Tomcat. May be supported in a later or snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 11.
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_TargetPlatform, "20");
 settings.put(CompilerOptions.OPTION_Compliance, "20");
 } else if (opt.equals("21")) {
-// Constant not available in ECJ version shipped with
-// Tomcat. May be supported in a later or snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 11.
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_TargetPlatform, "21");
 settings.put(CompilerOptions.OPTION_Compliance, "21");
 } else if (opt.equals("22")) {
-// Constant not available in ECJ version shipped with
-// Tomcat. May be supported in a later or snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 11.
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_TargetPlatform, "22");
 settings.put(CompilerOptions.OPTION_Compliance, "22");


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

(tomcat) 01/02: Add support for JSP compilation using Java 22

[markt]

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

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

commit e02be5c7d5438ee63f66bc0614875f732f25c4df
Author: Mark Thomas 
AuthorDate: Tue Feb 27 08:55:13 2024 +

Add support for JSP compilation using Java 22
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 27 +---
 webapps/docs/changelog.xml   | 11 ++
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 2a19f14794..283738d319 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -318,15 +318,20 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 } else if (opt.equals("19")) {
 settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_19);
 } else if (opt.equals("20")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
+// Constant not available in ECJ version shipped with
+// Tomcat. May be supported in a later or snapshot build.
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_Source, "20");
 } else if (opt.equals("21")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
+// Constant not available in ECJ version shipped with
+// Tomcat. May be supported in a later or snapshot build.
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_Source, "21");
+} else if (opt.equals("22")) {
+// Constant not available in ECJ version shipped with
+// Tomcat. May be supported in a later or snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "22");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
 settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_11);
@@ -395,17 +400,23 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_19);
 settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_19);
 } else if (opt.equals("20")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
+// Constant not available in ECJ version shipped with
+// Tomcat. May be supported in a later or snapshot build.
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_TargetPlatform, "20");
 settings.put(CompilerOptions.OPTION_Compliance, "20");
 } else if (opt.equals("21")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
+// Constant not available in ECJ version shipped with
+// Tomcat. May be supported in a later or snapshot build.
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_TargetPlatform, "21");
 settings.put(CompilerOptions.OPTION_Compliance, "21");
+} else if (opt.equals("22")) {
+// Constant not available in ECJ version shipped with
+// Tomcat. May be supported in a later or snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "22");
+settings.put(CompilerOptions.OPTION_Compliance, "22");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM", 
opt));
 settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_11);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3cc6d582fe..d9e39d5d32 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,17 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Add support for specifying 

(tomcat) 02/02: Add release date for 10.1.19

[markt]

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

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

commit ccb68ff4742caa30b531021039df3bf45e13a4eb
Author: Mark Thomas 
AuthorDate: Tue Feb 27 08:55:41 2024 +

Add release date for 10.1.19
---
 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 d9e39d5d32..8ebde7195b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,7 +124,7 @@
 
   
 
-
+
   
 
   


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

(tomcat) branch 10.1.x updated (ed83bb9fbf -> ccb68ff474)

[markt]

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

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


from ed83bb9fbf Explain the Java 22 check
 new e02be5c7d5 Add support for JSP compilation using Java 22
 new ccb68ff474 Add release date for 10.1.19

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


Summary of changes:
 java/org/apache/jasper/compiler/JDTCompiler.java | 27 +---
 webapps/docs/changelog.xml   | 13 +++-
 2 files changed, 31 insertions(+), 9 deletions(-)


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

(tomcat) branch 10.1.x updated: Update Java version required to build Tomcat

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 559238d7cf Update Java version required to build Tomcat
559238d7cf is described below

commit 559238d7cf3a463762e89400425983ea677b472f
Author: Mark Thomas 
AuthorDate: Thu Feb 22 12:48:41 2024 +

Update Java version required to build Tomcat
---
 webapps/docs/tomcat-docs.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index dcdf8af21e..83d2393730 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -38,7 +38,7 @@
   
   
   
-  
+  
   
   
   


-
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 comment 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 59b09971b5 Fix comment typo.
59b09971b5 is described below

commit 59b09971b5c6c9109d9784251089e03577e5b7d2
Author: Mark Thomas 
AuthorDate: Thu Feb 22 12:46:04 2024 +

Fix comment typo.
---
 java/org/apache/catalina/webresources/CachedResource.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/webresources/CachedResource.java 
b/java/org/apache/catalina/webresources/CachedResource.java
index 6bb2f3cb58..f82b368851 100644
--- a/java/org/apache/catalina/webresources/CachedResource.java
+++ b/java/org/apache/catalina/webresources/CachedResource.java
@@ -326,7 +326,7 @@ public class CachedResource implements WebResource {
  *
  * One option to resolve this issue is to use a custom URL scheme for 
resource URLs. This would allow us, via
  * registration of a URLStreamHandlerFactory, to control how the 
resources are accessed and ensure that all
- * access go via the cache We took this approach for war: URLs so we 
can use jar:war:file: URLs to reference
+ * access go via the cache. We took this approach for war: URLs so we 
can use jar:war:file: URLs to reference
  * resources in unpacked WAR files. However, because 
URL.setURLStreamHandlerFactory() may only be called once,
  * this can cause problems when using other libraries that also want 
to use a custom URL scheme.
  *


-
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 comment 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 ca7988244d Fix comment typo.
ca7988244d is described below

commit ca7988244d7896df128f198a126432cee7808bb6
Author: Mark Thomas 
AuthorDate: Thu Feb 22 12:46:04 2024 +

Fix comment typo.
---
 java/org/apache/catalina/webresources/CachedResource.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/webresources/CachedResource.java 
b/java/org/apache/catalina/webresources/CachedResource.java
index 6bb2f3cb58..f82b368851 100644
--- a/java/org/apache/catalina/webresources/CachedResource.java
+++ b/java/org/apache/catalina/webresources/CachedResource.java
@@ -326,7 +326,7 @@ public class CachedResource implements WebResource {
  *
  * One option to resolve this issue is to use a custom URL scheme for 
resource URLs. This would allow us, via
  * registration of a URLStreamHandlerFactory, to control how the 
resources are accessed and ensure that all
- * access go via the cache We took this approach for war: URLs so we 
can use jar:war:file: URLs to reference
+ * access go via the cache. We took this approach for war: URLs so we 
can use jar:war:file: URLs to reference
  * resources in unpacked WAR files. However, because 
URL.setURLStreamHandlerFactory() may only be called once,
  * this can cause problems when using other libraries that also want 
to use a custom URL scheme.
  *


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

(tomcat) branch 10.1.x updated: Fix comment typo.

[markt]

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

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


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

commit dfdc90cd615773c4d58940c073847f99cf4ba140
Author: Mark Thomas 
AuthorDate: Thu Feb 22 12:46:04 2024 +

Fix comment typo.
---
 java/org/apache/catalina/webresources/CachedResource.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/webresources/CachedResource.java 
b/java/org/apache/catalina/webresources/CachedResource.java
index 6bb2f3cb58..f82b368851 100644
--- a/java/org/apache/catalina/webresources/CachedResource.java
+++ b/java/org/apache/catalina/webresources/CachedResource.java
@@ -326,7 +326,7 @@ public class CachedResource implements WebResource {
  *
  * One option to resolve this issue is to use a custom URL scheme for 
resource URLs. This would allow us, via
  * registration of a URLStreamHandlerFactory, to control how the 
resources are accessed and ensure that all
- * access go via the cache We took this approach for war: URLs so we 
can use jar:war:file: URLs to reference
+ * access go via the cache. We took this approach for war: URLs so we 
can use jar:war:file: URLs to reference
  * resources in unpacked WAR files. However, because 
URL.setURLStreamHandlerFactory() may only be called once,
  * this can cause problems when using other libraries that also want 
to use a custom URL scheme.
  *


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

(tomcat-tck) branch main updated: Get the EL signature tests passing

[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-tck.git


The following commit(s) were added to refs/heads/main by this push:
 new d315c80  Get the EL signature tests passing
d315c80 is described below

commit d315c803ba197e356179351cd2d35182ac86d67e
Author: Mark Thomas 
AuthorDate: Wed Feb 21 13:07:42 2024 +

Get the EL signature tests passing
---
 el-tck/pom.xml | 12 +---
 pom.xml| 16 +---
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/el-tck/pom.xml b/el-tck/pom.xml
index d6e5fc0..a644a3b 100644
--- a/el-tck/pom.xml
+++ b/el-tck/pom.xml
@@ -34,7 +34,7 @@
 jakarta-expression-language-tck
 ${tck.el.version}
 
 
   
@@ -48,7 +48,7 @@
 tomcat-jasper-el
 ${tomcat.version}
 
 
+
${settings.localRepository}/org/apache/tomcat/tomcat-el-api/${tomcat.version}/tomcat-el-api-${tomcat.version}.jar:${env.JAVA_HOME}/jmods/java.base
+
+
 
 
 
diff --git a/pom.xml b/pom.xml
index 6336c6c..d80181a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,19 +27,21 @@
 pom
 
 
-21
-21
-
+17
+17
+
+
 11.0.0-M18-SNAPSHOT
-
+
+
 6.0.0-SNAPSHOT
+6.0.0-SNAPSHOT
 10.0.0-SNAPSHOT
-
+
+
 10.0.0-SNAPSHOT
-
 1.8.0.Final
 1.2.0.Final
-
 5.7.2
 
 


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

(tomcat-tck) branch main updated: Note requirement to install additional dependency

[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-tck.git


The following commit(s) were added to refs/heads/main by this push:
 new ea3d7a9  Note requirement to install additional dependency
ea3d7a9 is described below

commit ea3d7a920bf45668a1cb93a0529257ef7189450d
Author: Mark Thomas 
AuthorDate: Tue Feb 20 17:28:58 2024 +

Note requirement to install additional dependency
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 0850418..f687d65 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,9 @@ At the moment, you will need to build the TCK locally (see 
below).
 
cd $TCK/webartifacts/jsp
mvn install
+
+   cd $TCK/signaturetest
+   mvn install
 ```
 
 6. Install the TCKs Tomcat tests against


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

(tomcat) branch main updated: Reduce minimum Java version to 17

[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 d9def06167 Reduce minimum Java version to 17
d9def06167 is described below

commit d9def06167fe566674e00ebdbdce8591a228cce2
Author: Mark Thomas 
AuthorDate: Fri Jan 19 12:15:20 2024 +

Reduce minimum Java version to 17

Uses some API that is deprecated in Java 21 but not 17. JreCompat has
not been used to avoid the deprecated API if running on Java 21+.
---
 build.xml  |   8 +-
 conf/web.xml   |   4 +-
 .../authenticator/SpnegoAuthenticator.java |  65 +---
 .../core/ThreadLocalLeakPreventionListener.java|   1 -
 .../catalina/valves/StuckThreadDetectionValve.java |  10 +-
 .../catalina/webresources/CachedResource.java  |   3 -
 java/org/apache/coyote/Request.java|   4 +-
 java/org/apache/jasper/EmbeddedServletOptions.java |   4 +-
 java/org/apache/jasper/JspC.java   |   4 +-
 java/org/apache/jasper/compiler/JDTCompiler.java   |  14 +--
 .../tomcat/dbcp/dbcp2/DelegatingStatement.java |   2 +-
 java/org/apache/tomcat/util/Diagnostics.java   |   1 -
 .../org/apache/tomcat/util/compat/Jre19Compat.java |  84 +++
 .../org/apache/tomcat/util/compat/Jre21Compat.java |  82 ++
 .../org/apache/tomcat/util/compat/Jre22Compat.java |   2 +-
 java/org/apache/tomcat/util/compat/JreCompat.java  | 118 -
 .../apache/tomcat/util/net/AbstractEndpoint.java   |   1 -
 .../tomcat/util/threads/VirtualThreadExecutor.java |  11 +-
 .../TestAsyncContextImplListenerOnComplete.java|  31 +++---
 test/org/apache/juli/TestThreadNameCache.java  |   2 +-
 webapps/docs/changelog.xml |  12 +++
 webapps/docs/jasper-howto.xml  |   4 +-
 webapps/docs/tomcat-docs.xsl   |   4 +-
 23 files changed, 398 insertions(+), 73 deletions(-)

diff --git a/build.xml b/build.xml
index 22379895f9..76d1feb07c 100644
--- a/build.xml
+++ b/build.xml
@@ -104,11 +104,11 @@
   
   
 
-  
+  
   
-  
-  
-  
+  
+  
+  
   
 
   
diff --git a/conf/web.xml b/conf/web.xml
index 0a1261e3b3..788f411d48 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -160,9 +160,9 @@
   
   
   
-  
+  
   
-  
+  
   
   
   
diff --git a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java 
b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
index d76edb9ecf..6377416ea4 100644
--- a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
@@ -19,8 +19,10 @@ package org.apache.catalina.authenticator;
 import java.io.File;
 import java.io.IOException;
 import java.security.Principal;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.LinkedHashMap;
-import java.util.concurrent.CompletionException;
 import java.util.regex.Pattern;
 
 import javax.security.auth.Subject;
@@ -30,6 +32,7 @@ import javax.security.auth.login.LoginException;
 import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.catalina.LifecycleException;
+import org.apache.catalina.Realm;
 import org.apache.catalina.connector.Request;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -205,16 +208,11 @@ public class SpnegoAuthenticator extends 
AuthenticatorBase {
 } else {
 credentialLifetime = GSSCredential.DEFAULT_LIFETIME;
 }
+final PrivilegedExceptionAction action = () -> 
manager.createCredential(null,
+credentialLifetime, new Oid("1.3.6.1.5.5.2"), 
GSSCredential.ACCEPT_ONLY);
+gssContext = manager.createContext(Subject.doAs(subject, action));
 
-gssContext = manager.createContext(Subject.callAs(subject, () -> {
-return manager.createCredential(null, credentialLifetime, new 
Oid("1.3.6.1.5.5.2"),
-GSSCredential.ACCEPT_ONLY);
-}));
-
-final GSSContext gssContextFinal = gssContext;
-outToken = Subject.callAs(subject, () -> {
-return gssContextFinal.acceptSecContext(decoded, 0, 
decoded.length);
-});
+outToken = Subject.doAs(lc.getSubject(), new 
AcceptAction(gssContext, decoded));
 
 if (outToken == null) {
 if (log.isDebugEnabled()) {
@@ -226,9 +224,8 @@ public class SpnegoAuthenticator extends AuthenticatorBase {
 return false;
 }
 
-principal = Subject.callAs(subject, () -> {
-return context.getRealm().authenticate(gssContext

(tomcat) branch main updated: Remove unsued properties to align with EL 6.0 API

[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 82228cc139 Remove unsued properties to align with EL 6.0 API
82228cc139 is described below

commit 82228cc139fa78abc2d6d6f117571e03e063b20b
Author: Mark Thomas 
AuthorDate: Tue Feb 20 20:19:49 2024 +

Remove unsued properties to align with EL 6.0 API
---
 java/jakarta/el/ELResolver.java | 4 
 1 file changed, 4 deletions(-)

diff --git a/java/jakarta/el/ELResolver.java b/java/jakarta/el/ELResolver.java
index d8fb0a04b0..2bd3dd9280 100644
--- a/java/jakarta/el/ELResolver.java
+++ b/java/jakarta/el/ELResolver.java
@@ -21,10 +21,6 @@ package jakarta.el;
  */
 public abstract class ELResolver {
 
-public static final String TYPE = "type";
-
-public static final String RESOLVABLE_AT_DESIGN_TIME = 
"resolvableAtDesignTime";
-
 /**
  * Obtain the value of the given property on the given object using the 
given context.
  *


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

(tomcat-tck) branch main updated: Update to latest dev build

[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-tck.git


The following commit(s) were added to refs/heads/main by this push:
 new b55df72  Update to latest dev build
b55df72 is described below

commit b55df72bff57056fa4cfbb6e138a0082cec69d83
Author: Mark Thomas 
AuthorDate: Tue Feb 20 17:04:24 2024 +

Update to latest dev build
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 431a884..6336c6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 21
 21
 
-11.0.0-M16
+11.0.0-M18-SNAPSHOT
 
 6.0.0-SNAPSHOT
 10.0.0-SNAPSHOT


-
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 make use of {@inheritDoc} better

[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 2d065f07dc Refactor to make use of {@inheritDoc} better
2d065f07dc is described below

commit 2d065f07dc3bb139b1cfb50bc1ef03ad0ef3cbff
Author: Mark Thomas 
AuthorDate: Tue Feb 20 12:45:56 2024 +

Refactor to make use of {@inheritDoc} better
---
 java/javax/el/ELResolver.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/javax/el/ELResolver.java b/java/javax/el/ELResolver.java
index 59c568ec39..4061288061 100644
--- a/java/javax/el/ELResolver.java
+++ b/java/javax/el/ELResolver.java
@@ -45,7 +45,7 @@ public abstract class ELResolver {
 public abstract Object getValue(ELContext context, Object base, Object 
property);
 
 /**
- * Invokes a method on the the given object. This default implementation 
always returns null.
+ * Invokes a method on the the given object.
  *
  * @param contextThe EL context for this evaluation
  * @param base   The base object on which the method is to be found
@@ -53,7 +53,7 @@ public abstract class ELResolver {
  * @param paramTypes The types of the parameters of the method to invoke
  * @param params The parameters with which to invoke the method
  *
- * @return Always null
+ * @return This default implementation always returns null
  *
  * @since EL 2.2
  */
@@ -134,13 +134,13 @@ public abstract class ELResolver {
 public abstract Class getCommonPropertyType(ELContext context, Object 
base);
 
 /**
- * Converts the given object to the given type. This default 
implementation always returns null.
+ * Converts the given object to the given type.
  *
  * @param context The EL context for this evaluation
  * @param obj The object to convert
  * @param typeThe type to which the object should be converted
  *
- * @return Always null
+ * @return This default implementation always returns null
  *
  * @since EL 3.0
  */


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

(tomcat) branch 9.0.x updated: Refactor to make use of {@inheritDoc} better

[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 06aa789082 Refactor to make use of {@inheritDoc} better
06aa789082 is described below

commit 06aa789082e560f4cad14752069f412ceda0a9e4
Author: Mark Thomas 
AuthorDate: Tue Feb 20 12:45:56 2024 +

Refactor to make use of {@inheritDoc} better
---
 java/javax/el/ELResolver.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/javax/el/ELResolver.java b/java/javax/el/ELResolver.java
index 59c568ec39..4061288061 100644
--- a/java/javax/el/ELResolver.java
+++ b/java/javax/el/ELResolver.java
@@ -45,7 +45,7 @@ public abstract class ELResolver {
 public abstract Object getValue(ELContext context, Object base, Object 
property);
 
 /**
- * Invokes a method on the the given object. This default implementation 
always returns null.
+ * Invokes a method on the the given object.
  *
  * @param contextThe EL context for this evaluation
  * @param base   The base object on which the method is to be found
@@ -53,7 +53,7 @@ public abstract class ELResolver {
  * @param paramTypes The types of the parameters of the method to invoke
  * @param params The parameters with which to invoke the method
  *
- * @return Always null
+ * @return This default implementation always returns null
  *
  * @since EL 2.2
  */
@@ -134,13 +134,13 @@ public abstract class ELResolver {
 public abstract Class getCommonPropertyType(ELContext context, Object 
base);
 
 /**
- * Converts the given object to the given type. This default 
implementation always returns null.
+ * Converts the given object to the given type.
  *
  * @param context The EL context for this evaluation
  * @param obj The object to convert
  * @param typeThe type to which the object should be converted
  *
- * @return Always null
+ * @return This default implementation always returns null
  *
  * @since EL 3.0
  */


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

(tomcat) branch 10.1.x updated: Refactor to make use of {@inheritDoc} better

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new ba0c608bea Refactor to make use of {@inheritDoc} better
ba0c608bea is described below

commit ba0c608bea9eea347cdb20ee31a5c2a96a8af844
Author: Mark Thomas 
AuthorDate: Tue Feb 20 12:45:56 2024 +

Refactor to make use of {@inheritDoc} better
---
 java/jakarta/el/ELResolver.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/jakarta/el/ELResolver.java b/java/jakarta/el/ELResolver.java
index cdc933bd4d..ee01d3134a 100644
--- a/java/jakarta/el/ELResolver.java
+++ b/java/jakarta/el/ELResolver.java
@@ -45,7 +45,7 @@ public abstract class ELResolver {
 public abstract Object getValue(ELContext context, Object base, Object 
property);
 
 /**
- * Invokes a method on the the given object. This default implementation 
always returns null.
+ * Invokes a method on the the given object.
  *
  * @param contextThe EL context for this evaluation
  * @param base   The base object on which the method is to be found
@@ -53,7 +53,7 @@ public abstract class ELResolver {
  * @param paramTypes The types of the parameters of the method to invoke
  * @param params The parameters with which to invoke the method
  *
- * @return Always null
+ * @return This default implementation always returns null
  *
  * @since EL 2.2
  */
@@ -141,14 +141,14 @@ public abstract class ELResolver {
 public abstract Class getCommonPropertyType(ELContext context, Object 
base);
 
 /**
- * Converts the given object to the given type. This default 
implementation always returns null.
+ * Converts the given object to the given type.
  *
  * @param  The type to which the object should be converted
  * @param context The EL context for this evaluation
  * @param obj The object to convert
  * @param typeThe type to which the object should be converted
  *
- * @return Always null
+ * @return This default implementation always returns null
  *
  * @since EL 3.0
  */


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

(tomcat) branch main updated (5c3695e8dc -> 9784bafa94)

[markt]

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

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


from 5c3695e8dc Remove useless import
 new 799eea5b1b Code clean-up. Formatting. No functional change.
 new 8916733c05 Refactor to make use of {@@inheritDoc} better
 new 9784bafa94 Add method invocation support to OptionalELREsolver

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


Summary of changes:
 java/jakarta/el/ELResolver.java  |   8 +-
 java/jakarta/el/OptionalELResolver.java  | 135 +++
 java/jakarta/el/RecordELResolver.java|  18 ++-
 java/jakarta/el/Util.java|   4 +-
 test/jakarta/el/TestOptionalELResolver.java  |  76 -
 test/jakarta/el/TestOptionalELResolverInJsp.java |  18 +--
 test/jakarta/el/TesterBeanB.java |   4 +
 test/webapp/el-optional.jsp  |   8 ++
 webapps/docs/changelog.xml   |  11 ++
 9 files changed, 209 insertions(+), 73 deletions(-)


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

(tomcat) 01/03: Code clean-up. Formatting. 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

commit 799eea5b1ba1a2dcf5fb592a178a8cd768358bb8
Author: Mark Thomas 
AuthorDate: Tue Feb 20 12:45:18 2024 +

Code clean-up. Formatting. No functional change.
---
 java/jakarta/el/RecordELResolver.java | 18 +++---
 java/jakarta/el/Util.java |  4 ++--
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/java/jakarta/el/RecordELResolver.java 
b/java/jakarta/el/RecordELResolver.java
index 6a5683924f..fcb70fe7e9 100644
--- a/java/jakarta/el/RecordELResolver.java
+++ b/java/jakarta/el/RecordELResolver.java
@@ -22,9 +22,9 @@ import java.util.Objects;
 /**
  * Defines property resolution behavior on instances of {@link Record}.
  * 
- * The resolver handles base objects of type {@link Record}. It accepts any 
non-{@code null} object as a property and coerces it to a
- * String using {@link Object#toString()}. The property string is used to find 
an accessor method for a field
- * with the same name.
+ * The resolver handles base objects of type {@link Record}. It accepts any 
non-{@code null} object as a property and
+ * coerces it to a String using {@link Object#toString()}. The property string 
is used to find an accessor method for a
+ * field with the same name.
  * 
  * This resolver is always read-only since {@link Record}s are always 
read-only.
  * 
@@ -67,8 +67,7 @@ public class RecordELResolver extends ELResolver {
 method = base.getClass().getMethod(propertyName);
 } catch (NoSuchMethodException nsme) {
 throw new PropertyNotFoundException(
-Util.message(context, "propertyNotFound", 
base.getClass().getName(), propertyName),
-nsme);
+Util.message(context, "propertyNotFound", 
base.getClass().getName(), propertyName), nsme);
 }
 
 try {
@@ -112,8 +111,7 @@ public class RecordELResolver extends ELResolver {
 base.getClass().getMethod(propertyName);
 } catch (NoSuchMethodException nsme) {
 throw new PropertyNotFoundException(
-Util.message(context, "propertyNotFound", 
base.getClass().getName(), propertyName),
-nsme);
+Util.message(context, "propertyNotFound", 
base.getClass().getName(), propertyName), nsme);
 }
 }
 return null;
@@ -150,8 +148,7 @@ public class RecordELResolver extends ELResolver {
 base.getClass().getMethod(propertyName);
 } catch (NoSuchMethodException nsme) {
 throw new PropertyNotFoundException(
-Util.message(context, "propertyNotFound", 
base.getClass().getName(), propertyName),
-nsme);
+Util.message(context, "propertyNotFound", 
base.getClass().getName(), propertyName), nsme);
 }
 
 throw new PropertyNotWritableException(
@@ -187,8 +184,7 @@ public class RecordELResolver extends ELResolver {
 base.getClass().getMethod(propertyName);
 } catch (NoSuchMethodException nsme) {
 throw new PropertyNotFoundException(
-Util.message(context, "propertyNotFound", 
base.getClass().getName(), propertyName),
-nsme);
+Util.message(context, "propertyNotFound", 
base.getClass().getName(), propertyName), nsme);
 }
 
 return true;
diff --git a/java/jakarta/el/Util.java b/java/jakarta/el/Util.java
index f44b662063..c168de6e5b 100644
--- a/java/jakarta/el/Util.java
+++ b/java/jakarta/el/Util.java
@@ -494,8 +494,8 @@ class Util {
  */
 private static boolean isCoercibleFrom(ELContext context, Object src, 
Class target) {
 /*
- *  TODO: This isn't pretty but it works. Significant refactoring 
would be required to avoid the exception. See
- *also OptionalELResolver.convertToType().
+ * TODO: This isn't pretty but it works. Significant refactoring would 
be required to avoid the exception. See
+ * also OptionalELResolver.convertToType().
  */
 try {
 context.convertToType(src, target);


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

(tomcat) 02/03: Refactor to make use of {@@inheritDoc} better

[markt]

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

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

commit 8916733c05f9896b328d28fe02aa4910a889766a
Author: Mark Thomas 
AuthorDate: Tue Feb 20 12:45:56 2024 +

Refactor to make use of {@@inheritDoc} better
---
 java/jakarta/el/ELResolver.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/jakarta/el/ELResolver.java b/java/jakarta/el/ELResolver.java
index c356fb379d..d8fb0a04b0 100644
--- a/java/jakarta/el/ELResolver.java
+++ b/java/jakarta/el/ELResolver.java
@@ -43,7 +43,7 @@ public abstract class ELResolver {
 public abstract Object getValue(ELContext context, Object base, Object 
property);
 
 /**
- * Invokes a method on the the given object. This default implementation 
always returns null.
+ * Invokes a method on the the given object.
  *
  * @param contextThe EL context for this evaluation
  * @param base   The base object on which the method is to be found
@@ -51,7 +51,7 @@ public abstract class ELResolver {
  * @param paramTypes The types of the parameters of the method to invoke
  * @param params The parameters with which to invoke the method
  *
- * @return Always null
+ * @return This default implementation always returns null
  *
  * @since EL 2.2
  */
@@ -122,14 +122,14 @@ public abstract class ELResolver {
 public abstract Class getCommonPropertyType(ELContext context, Object 
base);
 
 /**
- * Converts the given object to the given type. This default 
implementation always returns null.
+ * Converts the given object to the given type.
  *
  * @param  The type to which the object should be converted
  * @param context The EL context for this evaluation
  * @param obj The object to convert
  * @param typeThe type to which the object should be converted
  *
- * @return Always null
+ * @return This default implementation always returns null
  *
  * @since EL 3.0
  */


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

(tomcat) 03/03: Add method invocation support to OptionalELREsolver

[markt]

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

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

commit 9784bafa940938ebfca20a0cb914a64e3dc28a62
Author: Mark Thomas 
AuthorDate: Tue Feb 20 15:07:20 2024 +

Add method invocation support to OptionalELREsolver

Ensure consistent behaviour and ensure that the OptionalELResolver never
returns an Optional instance.
Ensure coerceToType coerces empty Optional instances based on a value of
null rather than just returning null.
Improve Javadoc
Add/update tests for new/changed behaviour
---
 java/jakarta/el/OptionalELResolver.java  | 135 +++
 test/jakarta/el/TestOptionalELResolver.java  |  76 -
 test/jakarta/el/TestOptionalELResolverInJsp.java |  18 +--
 test/jakarta/el/TesterBeanB.java |   4 +
 test/webapp/el-optional.jsp  |   8 ++
 webapps/docs/changelog.xml   |  11 ++
 6 files changed, 196 insertions(+), 56 deletions(-)

diff --git a/java/jakarta/el/OptionalELResolver.java 
b/java/jakarta/el/OptionalELResolver.java
index c16c8f781b..f8ff316305 100644
--- a/java/jakarta/el/OptionalELResolver.java
+++ b/java/jakarta/el/OptionalELResolver.java
@@ -20,32 +20,36 @@ import java.util.Objects;
 import java.util.Optional;
 
 /**
- * Defines property resolution behaviour on {@link Optional}s.
+ * Defines property resolution, method invocation and type conversion 
behaviour on {@link Optional}s.
  * 
  * This resolver handles base objects that are instances of {@link Optional}.
  * 
- * If the {@link Optional#isEmpty()} is {@code true} for the base object and 
the property is {@code null} then the
- * resulting value is {@code null}.
- * 
- * If the {@link Optional#isEmpty()} is {@code true} for the base object and 
the property is not {@code null} then the
- * resulting value is the base object (an empty {@link Optional}).
- * 
- * If the {@link Optional#isPresent()} is {@code true} for the base object and 
the property is {@code null} then the
- * resulting value is the result of calling {@link Optional#get()} on the base 
object.
- * 
- * If the {@link Optional#isPresent()} is {@code true} for the base object and 
the property is not {@code null} then the
- * resulting value is the result of calling {@link 
ELResolver#getValue(ELContext, Object, Object)} using the
- * {@link ELResolver} obtained from {@link ELContext#getELResolver()} with the 
following parameters:
- * 
- * The {@link ELContext} is the current context
- * The base object is the result of calling {@link Optional#get()} on the 
current base object
- * The property object is the current property object
- * 
- * 
- * This resolver is always a read-only resolver.
+ * This resolver is always a read-only resolver since {@link Optional} 
instances are immutable.
  */
 public class OptionalELResolver extends ELResolver {
 
+/**
+ * {@inheritDoc}
+ *
+ * @return If the base object is an {@link Optional} and {@link 
Optional#isEmpty()} returns {@code true} then the
+ * resulting value is {@code null}.
+ * 
+ * If the base object is an {@link Optional}, {@link 
Optional#isPresent()} returns {@code true} and the
+ * property is {@code null} then the resulting value is the 
result of calling {@link Optional#get()} on
+ * the base object.
+ * 
+ * If the base object is an {@link Optional}, {@link 
Optional#isPresent()} returns {@code true} and the
+ * property is not {@code null} then the resulting value is 
the result of calling
+ * {@link ELResolver#getValue(ELContext, Object, Object)} 
using the {@link ELResolver} obtained from
+ * {@link ELContext#getELResolver()} with the following 
parameters:
+ * 
+ * The {@link ELContext} is the current context
+ * The base object is the result of calling {@link 
Optional#get()} on the current base object
+ * The property object is the current property object
+ * 
+ * 
+ * If the base object is not an {@link Optional} then the 
return value is undefined.
+ */
 @Override
 public Object getValue(ELContext context, Object base, Object property) {
 Objects.requireNonNull(context);
@@ -55,8 +59,6 @@ public class OptionalELResolver extends ELResolver {
 if (((Optional) base).isEmpty()) {
 if (property == null) {
 return null;
-} else {
-return base;
 }
 } else {
 if (property == null) {
@@ -74,9 +76,11 @@ public class OptionalELResolver extends ELResolver {
 
 /**
  * {@inheritDoc}
- * 
- * If the base object is an {@link Optional

svn commit: r67423 - /release/tomcat/tomcat-11/v11.0.0-M16/

[markt]

Author: markt
Date: Mon Feb 19 09:07:16 2024
New Revision: 67423

Log:
Drop 11.0.0-M16 from CDN

Removed:
release/tomcat/tomcat-11/v11.0.0-M16/


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

svn commit: r1915869 - in /tomcat/site/trunk: docs/download-11.html docs/index.html docs/migration-11.0.html docs/oldnews.html docs/whichversion.html xdocs/download-11.xml xdocs/index.xml xdocs/migrat

[markt]

Author: markt
Date: Mon Feb 19 09:04:49 2024
New Revision: 1915869

URL: http://svn.apache.org/viewvc?rev=1915869=rev
Log:
Update site for 11.0.0-M17 release

Modified:
tomcat/site/trunk/docs/download-11.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-11.0.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/download-11.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-11.0.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/download-11.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-11.html?rev=1915869=1915868=1915869=diff
==
--- tomcat/site/trunk/docs/download-11.html (original)
+++ tomcat/site/trunk/docs/download-11.html Mon Feb 19 09:04:49 2024
@@ -19,7 +19,7 @@
 
   Quick Navigation
 
-[define v]11.0.0-M16[end]
+[define v]11.0.0-M17[end]
 https://downloads.apache.org/tomcat/tomcat-11/KEYS;>KEYS |
 [v] (alpha) |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1915869=1915868=1915869=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Mon Feb 19 09:04:49 2024
@@ -34,6 +34,38 @@ wiki page.
 Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
 project logo are trademarks of the Apache Software Foundation.
 
+2024-02-19 Tomcat 11.0.0-M17 Released
+
+The Apache Tomcat Project is proud to announce the release of version 
11.0.0-M17
+(alpha) of Apache Tomcat. This release is a milestone release and is targeted 
at
+Jakarta EE 11.
+Users of Tomcat 10 onwards should be aware that, as a result of the move 
from
+Java EE to Jakarta EE as part of the transfer of Java EE to the Eclipse
+Foundation, the primary package for all implemented APIs has changed from
+javax.* to jakarta.*. This will almost certainly
+require code changes to enable applications to migrate from Tomcat 9 and 
earlier
+to Tomcat 10 and later. A
+https://github.com/apache/tomcat-jakartaee-migration;>migration
+tool is available to aid this process.
+The notable changes in this release are:
+
+Add improvements to the CSRF prevention filter including the ability to 
skip
+adding nonces for resource name and subtree URL patterns.
+Add support for user provided SSLContext instances configured on
+SSLHostConfigCertificate instances. Based on pull request #673 provided by
+Hakan Altındağ.
+Review usage of debug logging and downgrade trace or data dumping 
operations
+from debug level to trace. 
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 11
+(alpha) changelog.
+
+
+
+https://tomcat.apache.org/download-11.cgi;>Download
+
 2024-02-12 Tomcat Native 1.3.0 Released
 
 The Apache Tomcat Project is proud to announce the release of version 1.3.0 of
@@ -176,39 +208,6 @@ reach https://tomcat.apache.org
 
 https://tomcat.apache.org/download-80.cgi;>Download
 
-2024-01-09 Tomcat 11.0.0-M16 Released
-
-The Apache Tomcat Project is proud to announce the release of version 
11.0.0-M16
-(alpha) of Apache Tomcat. This release is a milestone release and is targeted 
at
-Jakarta EE 11.
-Users of Tomcat 10 onwards should be aware that, as a result of the move 
from
-Java EE to Jakarta EE as part of the transfer of Java EE to the Eclipse
-Foundation, the primary package for all implemented APIs has changed from
-javax.* to jakarta.*. This will almost certainly
-require code changes to enable applications to migrate from Tomcat 9 and 
earlier
-to Tomcat 10 and later. A
-https://github.com/apache/tomcat-jakartaee-migration;>migration
-tool is available to aid this process.
-The notable changes in this release are:
-
-Fix virtual thread support for the NIO2 connector
-Correct a regression in the fix for 67675 that broke TLS key file
-parsing for PKCS#8 format keys that do not specify an explicit
-pseudo-random function and rely on the default. This typically affects
-keys generated by OpenSSL 1.0.2.
-Allow multiple operations with the same name on introspected mbeans,
-fixing a regression caused by the introduction of a second
-addSslHostConfig() method. 
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 11
-(alpha) changelog.
-
-
-
-https://tomcat.apache.org/download-11.cgi;>Download
-
 2023-10-03 Tomcat Native 1.2.39 Released
 
 The Apache Tomcat Project is proud to announce the release of version 1.2.39 of

Modified: tomcat/site/trunk/docs/migration-11.0.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-11.0.html?rev=1915869=19

svn commit: r1915868 [3/5] - in /tomcat/site/trunk: docs/ xdocs/

[markt]

Modified: tomcat/site/trunk/docs/oldnews.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1915868=1915867=1915868=diff
==
--- tomcat/site/trunk/docs/oldnews.html (original)
+++ tomcat/site/trunk/docs/oldnews.html Mon Feb 19 09:00:21 2024
@@ -2,7 +2,8 @@
 Apache Tomcat - Old news!https://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png
 " class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-11.c
 gi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool 
for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat 
ConnectorsTomcat Native 
2Tomcat Native 
1.3Tomcat Native 
1.2https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>PrivacySupport Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentOlder news
 Announcements from previous years can be found here:
 
-  year 2023
+  year 2024
+  year 2023
   year 2022
   year 2021
   year 2020
@@ -17,1696 +18,6 @@
   year 2011
   year 2010
 
-2023-12-12 Tomcat 9.0.84 Released
-
-The Apache Tomcat Project is proud to announce the release of version 9.0.84
-of Apache Tomcat. This release implements specifications that are part of the
-Java EE 8 platform. The notable changes compared to 9.0.83 include:
-
-  Background processes for a Container no longer execute while lifecycle
-  operations are in progress for that Container.
-
-  Correct unintended escaping of XML in some WebDAV responses.
-
-  Use a 408 status code if a read timeout occurs during HTTP
-  request processing instead of an HTTP 400 status.
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 9
-changelog.
-
-
-
-https://tomcat.apache.org/download-90.cgi;>Download
-
-2023-12-12 Tomcat 11.0.0-M15 Released
-
-The Apache Tomcat Project is proud to announce the release of version 
11.0.0-M15
-(alpha) of Apache Tomcat. This release is a milestone release and is targeted 
at
-Jakarta EE 11.
-Users of Tomcat 10 onwards should be aware that, as a result of the move 
from
-Java EE to Jakarta EE as part of the transfer of Java EE to the Eclipse
-Foundation, the primary package for all implemented APIs has changed from
-javax.* to jakarta.*. This will almost certainly
-require code changes to enable applications to migrate from Tomcat 9 and 
earlier
-to Tomcat 10 and later. A
-https://github.com/apache/tomcat-jakartaee-migration;>migration
-tool is available to aid this process.
-The notable changes in this release are:
-
-Background processes for a Container no longer execute while lifecycle
-operations are in progress for that Container.
-Align with the latest additions and changes from the Servlet 6.1
-specification.
-Update the sample.war included in the documentation to use the Jakarta
-EE APIs.
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 11
-(alpha) changelog.
-
-
-
-https://tomcat.apache.org/download-11.cgi;>Download
-
-2023-12-12 Tomcat 8.5.97 Released
- 
-The Apache Tomcat Project is proud to announce the release of version 8.5.97
-of Apache Tomcat. This release implements specifications that are part of the
-Java EE 7 platform. The notable changes compared to 8.5.96 include:
-
-
-  Background processes for a Container no longer execute while lifecycle
-  operations are in progress for that Container.
-
-  

svn commit: r1915868 [4/5] - in /tomcat/site/trunk: docs/ xdocs/

[markt]

Modified: tomcat/site/trunk/xdocs/oldnews-2011.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2011.xml?rev=1915868=1915867=1915868=diff
==
--- tomcat/site/trunk/xdocs/oldnews-2011.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews-2011.xml Mon Feb 19 09:00:21 2024
@@ -11,7 +11,8 @@
 
 Announcements from other years can be found here:
 
-  year 2023
+  year 2024
+  year 2023
   year 2022
   year 2021
   year 2020

Modified: tomcat/site/trunk/xdocs/oldnews-2012.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2012.xml?rev=1915868=1915867=1915868=diff
==
--- tomcat/site/trunk/xdocs/oldnews-2012.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews-2012.xml Mon Feb 19 09:00:21 2024
@@ -11,7 +11,8 @@
 
 Announcements from other years can be found here:
 
-  year 2023
+  year 2024
+  year 2023
   year 2022
   year 2021
   year 2020

Modified: tomcat/site/trunk/xdocs/oldnews-2013.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2013.xml?rev=1915868=1915867=1915868=diff
==
--- tomcat/site/trunk/xdocs/oldnews-2013.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews-2013.xml Mon Feb 19 09:00:21 2024
@@ -11,7 +11,8 @@
 
 Announcements from other years can be found here:
 
-  year 2023
+  year 2024
+  year 2023
   year 2022
   year 2021
   year 2020

Modified: tomcat/site/trunk/xdocs/oldnews-2014.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2014.xml?rev=1915868=1915867=1915868=diff
==
--- tomcat/site/trunk/xdocs/oldnews-2014.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews-2014.xml Mon Feb 19 09:00:21 2024
@@ -11,7 +11,8 @@
 
 Announcements from other years can be found here:
 
-  year 2023
+  year 2024
+  year 2023
   year 2022
   year 2021
   year 2020

Modified: tomcat/site/trunk/xdocs/oldnews-2015.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2015.xml?rev=1915868=1915867=1915868=diff
==
--- tomcat/site/trunk/xdocs/oldnews-2015.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews-2015.xml Mon Feb 19 09:00:21 2024
@@ -11,7 +11,8 @@
 
 Announcements from other years can be found here:
 
-  year 2023
+  year 2024
+  year 2023
   year 2022
   year 2021
   year 2020

Modified: tomcat/site/trunk/xdocs/oldnews-2016.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2016.xml?rev=1915868=1915867=1915868=diff
==
--- tomcat/site/trunk/xdocs/oldnews-2016.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews-2016.xml Mon Feb 19 09:00:21 2024
@@ -11,7 +11,8 @@
 
 Announcements from previous years can be found here:
 
-  year 2023
+  year 2024
+  year 2023
   year 2022
   year 2021
   year 2020

Modified: tomcat/site/trunk/xdocs/oldnews-2017.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2017.xml?rev=1915868=1915867=1915868=diff
==
--- tomcat/site/trunk/xdocs/oldnews-2017.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews-2017.xml Mon Feb 19 09:00:21 2024
@@ -11,7 +11,8 @@
 
 Announcements from previous years can be found here:
 
-  year 2023
+  year 2024
+  year 2023
   year 2022
   year 2021
   year 2020

Modified: tomcat/site/trunk/xdocs/oldnews-2018.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2018.xml?rev=1915868=1915867=1915868=diff
==
--- tomcat/site/trunk/xdocs/oldnews-2018.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews-2018.xml Mon Feb 19 09:00:21 2024
@@ -11,7 +11,8 @@
 
 Announcements from previous years can be found here:
 
-  year 2023
+  year 2024
+  year 2023
   year 2022
   year 2021
   year 2020

Modified: tomcat/site/trunk/xdocs/oldnews-2019.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2019.xml?rev=1915868=1915867=1915868=diff
==
--- tomcat/site/trunk/xdocs/oldnews-2019.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews-2019.xml Mon Feb 19 09:00:21 2024
@@ -11,7 +11,8 @@
 
 Announcements from previous years can be found here:
 
-  year 2023
+  year 2024
+  year 2023
   year 2022
   year 2021
   year 2020

Modified: tomcat/site/trunk/xdocs/oldnews-2020.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2020.xml?rev=1915868=1915867=1915868=diff
==
--- tomcat/site/trunk/xdocs/oldnews-2020.xml (original)
+++ 

svn commit: r1915868 [5/5] - in /tomcat/site/trunk: docs/ xdocs/

[markt]

Modified: tomcat/site/trunk/xdocs/oldnews.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews.xml?rev=1915868=1915867=1915868=diff
==
--- tomcat/site/trunk/xdocs/oldnews.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews.xml Mon Feb 19 09:00:21 2024
@@ -11,7 +11,8 @@
 
 Announcements from previous years can be found here:
 
-  year 2023
+  year 2024
+  year 2023
   year 2022
   year 2021
   year 2020
@@ -28,1813 +29,5 @@
 
 
 
-
-
-The Apache Tomcat Project is proud to announce the release of version 9.0.84
-of Apache Tomcat. This release implements specifications that are part of the
-Java EE 8 platform. The notable changes compared to 9.0.83 include:
-
-  Background processes for a Container no longer execute while lifecycle
-  operations are in progress for that Container.
-
-  Correct unintended escaping of XML in some WebDAV responses.
-
-  Use a 408 status code if a read timeout occurs during HTTP
-  request processing instead of an HTTP 400 status.
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 9
-changelog.
-
-
-
-Download
-
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 
11.0.0-M15
-(alpha) of Apache Tomcat. This release is a milestone release and is targeted 
at
-Jakarta EE 11.
-Users of Tomcat 10 onwards should be aware that, as a result of the move 
from
-Java EE to Jakarta EE as part of the transfer of Java EE to the Eclipse
-Foundation, the primary package for all implemented APIs has changed from
-javax.* to jakarta.*. This will almost certainly
-require code changes to enable applications to migrate from Tomcat 9 and 
earlier
-to Tomcat 10 and later. A
-https://github.com/apache/tomcat-jakartaee-migration;>migration
-tool is available to aid this process.
-The notable changes in this release are:
-
-Background processes for a Container no longer execute while lifecycle
-operations are in progress for that Container.
-Align with the latest additions and changes from the Servlet 6.1
-specification.
-Update the sample.war included in the documentation to use the Jakarta
-EE APIs.
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 11
-(alpha) changelog.
-
-
-
-Download
-
-
-
- 
-The Apache Tomcat Project is proud to announce the release of version 8.5.97
-of Apache Tomcat. This release implements specifications that are part of the
-Java EE 7 platform. The notable changes compared to 8.5.96 include:
-
-
-  Background processes for a Container no longer execute while lifecycle
-  operations are in progress for that Container.
-
-  Correct unintended escaping of XML in some WebDAV responses.
-
-  Use a 408 status code if a read timeout occurs during HTTP
-  request processing instead of an HTTP 400 status.
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 8
-changelog.
-
-
-Please note that Apache Tomcat 8.5.x will
-reach https://tomcat.apache.org/tomcat-85-eol.html;>End-of-life
-(EOL) on 31 March 2024.
-
-
-Download
-
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 10.1.17
-of Apache Tomcat. This release implements specifications that are part of the
-Jakarta EE 10 platform.
-Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
-without changes. Java EE based 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. This conversion is performed using the
-https://github.com/apache/tomcat-jakartaee-migration;>Apache Tomcat
-migration tool for Jakarta EE tool which is also available as a separate
-download for off-line use.
-The notable changes in this release are:
-
-  Background processes for a Container no longer execute while lifecycle
-  operations are in progress for that Container.
-
-  Correct unintended escaping of XML in some WebDAV responses.
-
-  Use a 408 status code if a read timeout occurs during HTTP
-  request processing instead of an HTTP 400 status.
-
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 10.1
-changelog.
-
-
-
-Download
-
-
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 9.0.83
-of Apache Tomcat. This release implements specifications that are part of the
-Java EE 8 platform. The notable changes compared to 9.0.82 include:
-
-  Fix reloading TLS configuration could cause the Connector to
-  refuse new connections or the JVM to crash.
-  Ensure that an IOException during the reading of the request
-  triggers always error handling, regardless of whether the
-  application swallows the exception.
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 9
-changelog.
-
-
-

svn commit: r1915868 [2/5] - in /tomcat/site/trunk: docs/ xdocs/

[markt]

Added: tomcat/site/trunk/docs/oldnews-2023.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2023.html?rev=1915868=auto
==
--- tomcat/site/trunk/docs/oldnews-2023.html (added)
+++ tomcat/site/trunk/docs/oldnews-2023.html Mon Feb 19 09:00:21 2024
@@ -0,0 +1,1717 @@
+
+Apache Tomcat - Old news!https://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png
 " class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-11.c
 gi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool 
for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat 
ConnectorsTomcat Native 
2Tomcat Native 
1.3Tomcat Native 
1.2https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>PrivacySupport Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentOlder news
+Announcements from previous years can be found here:
+
+  year 2024
+  year 2023
+  year 2022
+  year 2021
+  year 2020
+  year 2019
+  year 2018
+  year 2017
+  year 2016
+  year 2015
+  year 2014
+  year 2013
+  year 2012
+  year 2011
+  year 2010
+
+2023-12-12 Tomcat 9.0.84 Released
+
+The Apache Tomcat Project is proud to announce the release of version 9.0.84
+of Apache Tomcat. This release implements specifications that are part of the
+Java EE 8 platform. The notable changes compared to 9.0.83 include:
+
+  Background processes for a Container no longer execute while lifecycle
+  operations are in progress for that Container.
+
+  Correct unintended escaping of XML in some WebDAV responses.
+
+  Use a 408 status code if a read timeout occurs during HTTP
+  request processing instead of an HTTP 400 status.
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 9
+changelog.
+
+
+
+https://tomcat.apache.org/download-90.cgi;>Download
+
+2023-12-12 Tomcat 11.0.0-M15 Released
+
+The Apache Tomcat Project is proud to announce the release of version 
11.0.0-M15
+(alpha) of Apache Tomcat. This release is a milestone release and is targeted 
at
+Jakarta EE 11.
+Users of Tomcat 10 onwards should be aware that, as a result of the move 
from
+Java EE to Jakarta EE as part of the transfer of Java EE to the Eclipse
+Foundation, the primary package for all implemented APIs has changed from
+javax.* to jakarta.*. This will almost certainly
+require code changes to enable applications to migrate from Tomcat 9 and 
earlier
+to Tomcat 10 and later. A
+https://github.com/apache/tomcat-jakartaee-migration;>migration
+tool is available to aid this process.
+The notable changes in this release are:
+
+Background processes for a Container no longer execute while lifecycle
+operations are in progress for that Container.
+Align with the latest additions and changes from the Servlet 6.1
+specification.
+Update the sample.war included in the documentation to use the Jakarta
+EE APIs.
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 11
+(alpha) changelog.
+
+
+
+https://tomcat.apache.org/download-11.cgi;>Download
+
+2023-12-12 Tomcat 8.5.97 Released
+ 
+The Apache Tomcat Project is proud to announce the release of version 8.5.97
+of Apache Tomcat. This release implements specifications that are part of the
+Java EE 7 platform. The notable changes compared to 8.5.96 include:
+
+
+  Background processes for a Container no longer execute 

svn commit: r1915868 [1/5] - in /tomcat/site/trunk: docs/ xdocs/

[markt]

Author: markt
Date: Mon Feb 19 09:00:21 2024
New Revision: 1915868

URL: http://svn.apache.org/viewvc?rev=1915868=rev
Log:
Prepare old news pages for 2024

Added:
tomcat/site/trunk/docs/oldnews-2023.html
tomcat/site/trunk/xdocs/oldnews-2023.xml
Modified:
tomcat/site/trunk/docs/oldnews-2010.html
tomcat/site/trunk/docs/oldnews-2011.html
tomcat/site/trunk/docs/oldnews-2012.html
tomcat/site/trunk/docs/oldnews-2013.html
tomcat/site/trunk/docs/oldnews-2014.html
tomcat/site/trunk/docs/oldnews-2015.html
tomcat/site/trunk/docs/oldnews-2016.html
tomcat/site/trunk/docs/oldnews-2017.html
tomcat/site/trunk/docs/oldnews-2018.html
tomcat/site/trunk/docs/oldnews-2019.html
tomcat/site/trunk/docs/oldnews-2020.html
tomcat/site/trunk/docs/oldnews-2021.html
tomcat/site/trunk/docs/oldnews-2022.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/xdocs/oldnews-2010.xml
tomcat/site/trunk/xdocs/oldnews-2011.xml
tomcat/site/trunk/xdocs/oldnews-2012.xml
tomcat/site/trunk/xdocs/oldnews-2013.xml
tomcat/site/trunk/xdocs/oldnews-2014.xml
tomcat/site/trunk/xdocs/oldnews-2015.xml
tomcat/site/trunk/xdocs/oldnews-2016.xml
tomcat/site/trunk/xdocs/oldnews-2017.xml
tomcat/site/trunk/xdocs/oldnews-2018.xml
tomcat/site/trunk/xdocs/oldnews-2019.xml
tomcat/site/trunk/xdocs/oldnews-2020.xml
tomcat/site/trunk/xdocs/oldnews-2021.xml
tomcat/site/trunk/xdocs/oldnews-2022.xml
tomcat/site/trunk/xdocs/oldnews.xml

Modified: tomcat/site/trunk/docs/oldnews-2010.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2010.html?rev=1915868=1915867=1915868=diff
==
--- tomcat/site/trunk/docs/oldnews-2010.html (original)
+++ tomcat/site/trunk/docs/oldnews-2010.html Mon Feb 19 09:00:21 2024
@@ -2,7 +2,8 @@
 Apache Tomcat - Old news! - 2010https://www.apachecon.com/event-images/snippet.js&quot</a>;>http://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-sm
 all.png" class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/downlo
 ad-11.cgi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool 
for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3Tomcat Native 1.2https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource 
codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>PrivacySupport 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentOther news
 Announcements from other years can be found here:
 
-  year 2023
+  year 2024
+  year 2023
   year 2022
   year 2021
   year 2020

Modified: tomcat/site/trunk/docs/oldnews-2011.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2011.html?rev=1915868=1915867=1915868=diff
==
--- tomcat/site/trunk/docs/oldnews-2011.html (original)
+++ tomcat/site/trunk/docs/oldnews-2011.html Mon Feb 19 09:00:21 2024
@@ -2,7 +2,8 @@
 Apache Tomcat - Old news! - 2011https://www.apachecon.com/event-images/snippet.js&quot</a>;>http://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-sm
 all.png" class="

svn commit: r1915867 - in /tomcat/site/trunk: ./ docs/tomcat-11.0-doc/ docs/tomcat-11.0-doc/annotationapi/ docs/tomcat-11.0-doc/annotationapi/jakarta/annotation/ docs/tomcat-11.0-doc/annotationapi/jak

[markt]

Author: markt
Date: Mon Feb 19 08:57:18 2024
New Revision: 1915867

URL: http://svn.apache.org/viewvc?rev=1915867=rev
Log:
Upload docs for 11.0.0-M17 release


[This commit notification would consist of 78 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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

(tomcat) branch main updated: Add release date

[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 9aac51464b Add release date
9aac51464b is described below

commit 9aac51464b7274a135ca980c62d2dfd8efa26235
Author: Mark Thomas 
AuthorDate: Mon Feb 19 08:54:18 2024 +

Add release date
---
 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 db3d526990..bcc3491e88 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -106,7 +106,7 @@
 -->
 
 
-
+
   
 
   


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

svn commit: r67420 - /dev/tomcat/tomcat-11/v11.0.0-M17/ /release/tomcat/tomcat-11/v11.0.0-M17/

[markt]

Author: markt
Date: Mon Feb 19 08:28:10 2024
New Revision: 67420

Log:
Release Tomcat 11.0.0-M17

Added:
release/tomcat/tomcat-11/v11.0.0-M17/
  - copied from r67419, dev/tomcat/tomcat-11/v11.0.0-M17/
Removed:
dev/tomcat/tomcat-11/v11.0.0-M17/


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

(tomcat) branch main updated: Increment version number for next development cycle

[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 1be4499b37 Increment version number for next development cycle
1be4499b37 is described below

commit 1be4499b3778be0b0c031eddcf6202e667834f63
Author: Mark Thomas 
AuthorDate: Wed Feb 14 08:57:38 2024 +

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

diff --git a/build.properties.default b/build.properties.default
index 476c2f7461..608d420343 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,7 +33,7 @@ version.major=11
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=-M17
+version.suffix=-M18
 version.dev=-dev
 
 # - Build tools -
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 4cd8e5604c..03b441851e 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=11.0.0-M17
+maven.asf.release.deploy.version=11.0.0-M18
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5a21629ec8..db3d526990 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


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

(tomcat) branch 10.1.x updated: Fix typo

[markt]

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

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


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

commit bea5d5c43f6d254a6c148d3a473b16cc7ce22668
Author: Mark Thomas 
AuthorDate: Tue Feb 13 22:46:17 2024 +

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 9f1428b302..aa499c58f3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -108,7 +108,7 @@
   
 
   
-Correct JPMS and OSGi meta-data for tomcat-enbed-core.jar
+Correct JPMS and OSGi meta-data for tomcat-embed-core.jar
 by removing reference to org.apache.catalina.ssi package
 that is no longer included in the JAR. Based on pull request
 684 by Jendrik Johannes. (markt)


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

(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 a4511e64aa Fix typo
a4511e64aa is described below

commit a4511e64aafe396d128dbb8162b2a0b2dbbc7a1d
Author: Mark Thomas 
AuthorDate: Tue Feb 13 22:46:17 2024 +

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 4c5835e04c..5a21629ec8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -115,7 +115,7 @@
 WebSocket API. (markt)
   
   
-Correct JPMS and OSGi meta-data for tomcat-enbed-core.jar
+Correct JPMS and OSGi meta-data for tomcat-embed-core.jar
 by removing reference to org.apache.catalina.ssi package
 that is no longer included in the JAR. Based on pull request
 684 by Jendrik Johannes. (markt)


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

svn commit: r67334 - in /dev/tomcat/tomcat-11/v11.0.0-M17: ./ bin/ bin/embed/ src/

[markt]

Author: markt
Date: Tue Feb 13 22:42:50 2024
New Revision: 67334

Log:
Upload Upload 11.0.0-M17 for voting

Added:
dev/tomcat/tomcat-11/v11.0.0-M17/
dev/tomcat/tomcat-11/v11.0.0-M17/KEYS
dev/tomcat/tomcat-11/v11.0.0-M17/README.html
dev/tomcat/tomcat-11/v11.0.0-M17/RELEASE-NOTES
dev/tomcat/tomcat-11/v11.0.0-M17/bin/
dev/tomcat/tomcat-11/v11.0.0-M17/bin/README.html

dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17-deployer.tar.gz   
(with props)

dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17-deployer.tar.gz.asc

dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17-deployer.tar.gz.sha512
dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17-deployer.zip  
 (with props)

dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17-deployer.zip.asc

dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17-deployer.zip.sha512

dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17-fulldocs.tar.gz   
(with props)

dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17-fulldocs.tar.gz.asc

dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17-fulldocs.tar.gz.sha512

dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17-windows-x64.zip   
(with props)

dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17-windows-x64.zip.asc

dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17-windows-x64.zip.sha512
dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17.exe   (with 
props)
dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17.exe.asc
dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17.exe.sha512
dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17.tar.gz   
(with props)
dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17.tar.gz.asc
dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17.tar.gz.sha512
dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17.zip   (with 
props)
dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17.zip.asc
dev/tomcat/tomcat-11/v11.0.0-M17/bin/apache-tomcat-11.0.0-M17.zip.sha512
dev/tomcat/tomcat-11/v11.0.0-M17/bin/embed/

dev/tomcat/tomcat-11/v11.0.0-M17/bin/embed/apache-tomcat-11.0.0-M17-embed.tar.gz
   (with props)

dev/tomcat/tomcat-11/v11.0.0-M17/bin/embed/apache-tomcat-11.0.0-M17-embed.tar.gz.asc

dev/tomcat/tomcat-11/v11.0.0-M17/bin/embed/apache-tomcat-11.0.0-M17-embed.tar.gz.sha512

dev/tomcat/tomcat-11/v11.0.0-M17/bin/embed/apache-tomcat-11.0.0-M17-embed.zip   
(with props)

dev/tomcat/tomcat-11/v11.0.0-M17/bin/embed/apache-tomcat-11.0.0-M17-embed.zip.asc

dev/tomcat/tomcat-11/v11.0.0-M17/bin/embed/apache-tomcat-11.0.0-M17-embed.zip.sha512
dev/tomcat/tomcat-11/v11.0.0-M17/src/
dev/tomcat/tomcat-11/v11.0.0-M17/src/apache-tomcat-11.0.0-M17-src.tar.gz   
(with props)
dev/tomcat/tomcat-11/v11.0.0-M17/src/apache-tomcat-11.0.0-M17-src.tar.gz.asc

dev/tomcat/tomcat-11/v11.0.0-M17/src/apache-tomcat-11.0.0-M17-src.tar.gz.sha512
dev/tomcat/tomcat-11/v11.0.0-M17/src/apache-tomcat-11.0.0-M17-src.zip   
(with props)
dev/tomcat/tomcat-11/v11.0.0-M17/src/apache-tomcat-11.0.0-M17-src.zip.asc
dev/tomcat/tomcat-11/v11.0.0-M17/src/apache-tomcat-11.0.0-M17-src.zip.sha512

Added: dev/tomcat/tomcat-11/v11.0.0-M17/KEYS
==
--- dev/tomcat/tomcat-11/v11.0.0-M17/KEYS (added)
+++ dev/tomcat/tomcat-11/v11.0.0-M17/KEYS Tue Feb 13 22:42:50 2024
@@ -0,0 +1,453 @@
+This file contains the PGP keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+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
+Xvu

(tomcat) branch 8.5.x updated: Drop reference to Tomcat 7

[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 07db8aee59 Drop reference to Tomcat 7
07db8aee59 is described below

commit 07db8aee59e796195577ef26a185dd56be403e46
Author: Mark Thomas 
AuthorDate: Tue Feb 13 22:37:22 2024 +

Drop reference to Tomcat 7
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 839a36719c..6cef104c45 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,6 @@ links for browsing the download directories and archives:
 - [Tomcat 10](https://tomcat.apache.org/download-10.cgi)
 - [Tomcat 9](https://tomcat.apache.org/download-90.cgi)
 - [Tomcat 8](https://tomcat.apache.org/download-80.cgi)
-- [Tomcat 7](https://tomcat.apache.org/download-70.cgi)
 
 To facilitate choosing the right major Tomcat version one, we have provided a
 [version overview page](https://tomcat.apache.org/whichversion.html).


-
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: Drop reference to Tomcat 7

[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 49c0ced89a Drop reference to Tomcat 7
49c0ced89a is described below

commit 49c0ced89a7becf87ba6324db22b2f94697d2ead
Author: Mark Thomas 
AuthorDate: Tue Feb 13 22:37:22 2024 +

Drop reference to Tomcat 7
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 839a36719c..6cef104c45 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,6 @@ links for browsing the download directories and archives:
 - [Tomcat 10](https://tomcat.apache.org/download-10.cgi)
 - [Tomcat 9](https://tomcat.apache.org/download-90.cgi)
 - [Tomcat 8](https://tomcat.apache.org/download-80.cgi)
-- [Tomcat 7](https://tomcat.apache.org/download-70.cgi)
 
 To facilitate choosing the right major Tomcat version one, we have provided a
 [version overview page](https://tomcat.apache.org/whichversion.html).


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

(tomcat) branch 10.1.x updated: Drop reference to Tomcat 7

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 1110a085e1 Drop reference to Tomcat 7
1110a085e1 is described below

commit 1110a085e1ee259460c4d5489322f2f7368b8103
Author: Mark Thomas 
AuthorDate: Tue Feb 13 22:37:22 2024 +

Drop reference to Tomcat 7
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 839a36719c..6cef104c45 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,6 @@ links for browsing the download directories and archives:
 - [Tomcat 10](https://tomcat.apache.org/download-10.cgi)
 - [Tomcat 9](https://tomcat.apache.org/download-90.cgi)
 - [Tomcat 8](https://tomcat.apache.org/download-80.cgi)
-- [Tomcat 7](https://tomcat.apache.org/download-70.cgi)
 
 To facilitate choosing the right major Tomcat version one, we have provided a
 [version overview page](https://tomcat.apache.org/whichversion.html).


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

(tomcat) branch main updated: Drop reference to Tomcat 7

[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 dc0345312b Drop reference to Tomcat 7
dc0345312b is described below

commit dc0345312bbf9505f76bac95da9f0b300ee04267
Author: Mark Thomas 
AuthorDate: Tue Feb 13 22:37:22 2024 +

Drop reference to Tomcat 7
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 6c5e37428f..17c7c7c2df 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,6 @@ links for browsing the download directories and archives:
 - [Tomcat 10](https://tomcat.apache.org/download-10.cgi)
 - [Tomcat 9](https://tomcat.apache.org/download-90.cgi)
 - [Tomcat 8](https://tomcat.apache.org/download-80.cgi)
-- [Tomcat 7](https://tomcat.apache.org/download-70.cgi)
 
 To facilitate choosing the right major Tomcat version one, we have provided a
 [version overview page](https://tomcat.apache.org/whichversion.html).


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

(tomcat) 01/01: Tag 11.0.0-M17

[markt]

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

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

commit 110bc36637569f7e9d191d21ac8600a8667cfc94
Author: Mark Thomas 
AuthorDate: Tue Feb 13 22:27:51 2024 +

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

diff --git a/build.properties.release b/build.properties.release
new file mode 100644
index 00..e5f4ea9a32
--- /dev/null
+++ b/build.properties.release
@@ -0,0 +1,54 @@
+# -
+# 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=2024-02-13T22:13:53Z
+
+# Enable insertion of detached signatures into the Windows installer.
+do.codesigning=true
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/GnuPG/bin/gpg.exe
+
+# 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.13 compiled on January 4 2023
+#
+# Java Name:   OpenJDK 64-Bit Server VM
+# Java Vendor: Oracle Corporation
+# Java Version:22+35-2369
+
+# The following is provided for information only. Builds will be repeatable
+# whether or not the build environment is consistent with this information.
+#
+# OS:  amd64 Windows Server 2022 10.0
+# File encoding:   UTF-8
+#
+# Release Manager: markt
+release-java-version=22+35-2369
+release-ant-version=1.10.13
diff --git a/res/install-win/Uninstall.exe.sig 
b/res/install-win/Uninstall.exe.sig
new file mode 100644
index 00..89a5107921
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..97c0bf5eb7
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..0dc7c07e6e
--- /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.
+ma

(tomcat) tag 11.0.0-M17 created (now 110bc36637)

[markt]

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

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


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

 new 110bc36637 Tag 11.0.0-M17

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) branch 10.1.x updated: Fix test failure when serverSession is tested before it has been set

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new d7daf694cb Fix test failure when serverSession is tested before it has 
been set
d7daf694cb is described below

commit d7daf694cbd773e362567a29a3b518cc1edaa9c1
Author: Mark Thomas 
AuthorDate: Tue Feb 13 21:38:39 2024 +

Fix test failure when serverSession is tested before it has been set
---
 test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java 
b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
index f624f5c87c..6a8aad06d8 100644
--- a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
+++ b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
@@ -196,7 +196,7 @@ public class TestWsSessionSuspendResume extends 
WebSocketBaseTest {
 public static final class SuspendCloseEndpoint extends Endpoint {
 
 // Yes, a static variable is a hack.
-private static WsSession serverSession;
+private static volatile WsSession serverSession;
 
 @Override
 public void onOpen(Session session, EndpointConfig epc) {
@@ -226,7 +226,7 @@ public class TestWsSessionSuspendResume extends 
WebSocketBaseTest {
 }
 
 public static boolean isServerSessionFullyClosed() {
-return serverSession.isClosed();
+return serverSession != null && serverSession.isClosed();
 }
 }
 


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

(tomcat) branch main updated: Fix test failure when serverSession is tested before it has been set

[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 4ce922d872 Fix test failure when serverSession is tested before it has 
been set
4ce922d872 is described below

commit 4ce922d87275154fea252a155b8d43d499c4283f
Author: Mark Thomas 
AuthorDate: Tue Feb 13 21:38:39 2024 +

Fix test failure when serverSession is tested before it has been set
---
 test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java 
b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
index f624f5c87c..6a8aad06d8 100644
--- a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
+++ b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
@@ -196,7 +196,7 @@ public class TestWsSessionSuspendResume extends 
WebSocketBaseTest {
 public static final class SuspendCloseEndpoint extends Endpoint {
 
 // Yes, a static variable is a hack.
-private static WsSession serverSession;
+private static volatile WsSession serverSession;
 
 @Override
 public void onOpen(Session session, EndpointConfig epc) {
@@ -226,7 +226,7 @@ public class TestWsSessionSuspendResume extends 
WebSocketBaseTest {
 }
 
 public static boolean isServerSessionFullyClosed() {
-return serverSession.isClosed();
+return serverSession != null && serverSession.isClosed();
 }
 }
 


-
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 test failure when serverSession is tested before it has been set

[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 1b530a41d5 Fix test failure when serverSession is tested before it has 
been set
1b530a41d5 is described below

commit 1b530a41d531063013856fcdd713100c4aff0ca8
Author: Mark Thomas 
AuthorDate: Tue Feb 13 21:38:39 2024 +

Fix test failure when serverSession is tested before it has been set
---
 test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java 
b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
index 2cfad10103..4a93167f5e 100644
--- a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
+++ b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
@@ -196,7 +196,7 @@ public class TestWsSessionSuspendResume extends 
WebSocketBaseTest {
 public static final class SuspendCloseEndpoint extends Endpoint {
 
 // Yes, a static variable is a hack.
-private static WsSession serverSession;
+private static volatile WsSession serverSession;
 
 @Override
 public void onOpen(Session session, EndpointConfig epc) {
@@ -226,7 +226,7 @@ public class TestWsSessionSuspendResume extends 
WebSocketBaseTest {
 }
 
 public static boolean isServerSessionFullyClosed() {
-return serverSession.isClosed();
+return serverSession != null && serverSession.isClosed();
 }
 }
 


-
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 test failure when serverSession is tested before it has been set

[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 4a4463ced2 Fix test failure when serverSession is tested before it has 
been set
4a4463ced2 is described below

commit 4a4463ced20664faca75168c5b2a028064d80f14
Author: Mark Thomas 
AuthorDate: Tue Feb 13 21:38:39 2024 +

Fix test failure when serverSession is tested before it has been set
---
 test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java 
b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
index 10c3a8204e..87c64c00be 100644
--- a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
+++ b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
@@ -207,7 +207,7 @@ public class TestWsSessionSuspendResume extends 
WebSocketBaseTest {
 public static final class SuspendCloseEndpoint extends Endpoint {
 
 // Yes, a static variable is a hack.
-private static WsSession serverSession;
+private static volatile WsSession serverSession;
 
 @Override
 public void onOpen(Session session, EndpointConfig epc) {
@@ -240,7 +240,7 @@ public class TestWsSessionSuspendResume extends 
WebSocketBaseTest {
 }
 
 public static boolean isServerSessionFullyClosed() {
-return serverSession.isClosed();
+return serverSession != null && serverSession.isClosed();
 }
 }
 


-
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 test failures on Windows

[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 9b3e7c0568 Fix test failures on Windows
9b3e7c0568 is described below

commit 9b3e7c0568bce0f69670ff09a6a98ccf0ae38fb9
Author: Mark Thomas 
AuthorDate: Tue Feb 13 17:46:57 2024 +

Fix test failures on Windows
---
 test/org/apache/coyote/http2/TestHttp2Limits.java | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java 
b/test/org/apache/coyote/http2/TestHttp2Limits.java
index 5e916528f7..7bb6d19043 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -280,9 +280,17 @@ public class TestHttp2Limits extends Http2TestBase {
 }
 case STREAM_RESET_THEN_CONNECTION_RESET: {
 // Expect a stream reset
-parser.readFrame();
-Assert.assertEquals("3-RST-[11]\n", output.getTrace());
-output.clearTrace();
+// On some platform / Connector combinations the TCP 
connection close
+// will be processed before the client gets a chance to read 
the
+// connection close frame which will trigger an
+// IOException when we try to read the frame.
+try {
+parser.readFrame();
+Assert.assertEquals("3-RST-[11]\n", output.getTrace());
+output.clearTrace();
+} catch (IOException ioe) {
+// Expected on some platforms
+}
 }
 //$FALL-THROUGH$
 case CONNECTION_RESET: {


-
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 test failures on Windows

[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 c861392b8f Fix test failures on Windows
c861392b8f is described below

commit c861392b8f1698527d9fc4461ee92f4bcce5b6f0
Author: Mark Thomas 
AuthorDate: Tue Feb 13 17:46:57 2024 +

Fix test failures on Windows
---
 test/org/apache/coyote/http2/TestHttp2Limits.java | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java 
b/test/org/apache/coyote/http2/TestHttp2Limits.java
index 5e916528f7..7bb6d19043 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -280,9 +280,17 @@ public class TestHttp2Limits extends Http2TestBase {
 }
 case STREAM_RESET_THEN_CONNECTION_RESET: {
 // Expect a stream reset
-parser.readFrame();
-Assert.assertEquals("3-RST-[11]\n", output.getTrace());
-output.clearTrace();
+// On some platform / Connector combinations the TCP 
connection close
+// will be processed before the client gets a chance to read 
the
+// connection close frame which will trigger an
+// IOException when we try to read the frame.
+try {
+parser.readFrame();
+Assert.assertEquals("3-RST-[11]\n", output.getTrace());
+output.clearTrace();
+} catch (IOException ioe) {
+// Expected on some platforms
+}
 }
 //$FALL-THROUGH$
 case CONNECTION_RESET: {


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

(tomcat) branch 10.1.x updated: Fix test failures on Windows

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new be906e2fe8 Fix test failures on Windows
be906e2fe8 is described below

commit be906e2fe8fcd2be2ef7bbeba0c7883824aaa6a4
Author: Mark Thomas 
AuthorDate: Tue Feb 13 17:46:57 2024 +

Fix test failures on Windows
---
 test/org/apache/coyote/http2/TestHttp2Limits.java | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java 
b/test/org/apache/coyote/http2/TestHttp2Limits.java
index 7b891fbfff..b184270dc3 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -281,9 +281,17 @@ public class TestHttp2Limits extends Http2TestBase {
 }
 case STREAM_RESET_THEN_CONNECTION_RESET: {
 // Expect a stream reset
-parser.readFrame();
-Assert.assertEquals("3-RST-[11]\n", output.getTrace());
-output.clearTrace();
+// On some platform / Connector combinations the TCP 
connection close
+// will be processed before the client gets a chance to read 
the
+// connection close frame which will trigger an
+// IOException when we try to read the frame.
+try {
+parser.readFrame();
+Assert.assertEquals("3-RST-[11]\n", output.getTrace());
+output.clearTrace();
+} catch (IOException ioe) {
+// Expected on some platforms
+}
 }
 //$FALL-THROUGH$
 case CONNECTION_RESET: {


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

(tomcat) branch main updated: Fix test failures on Windows

[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 985157dcd1 Fix test failures on Windows
985157dcd1 is described below

commit 985157dcd1d46d6d5d80ba9a58f3112e5ecf75a1
Author: Mark Thomas 
AuthorDate: Tue Feb 13 17:46:57 2024 +

Fix test failures on Windows
---
 test/org/apache/coyote/http2/TestHttp2Limits.java | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java 
b/test/org/apache/coyote/http2/TestHttp2Limits.java
index 7b891fbfff..b184270dc3 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -281,9 +281,17 @@ public class TestHttp2Limits extends Http2TestBase {
 }
 case STREAM_RESET_THEN_CONNECTION_RESET: {
 // Expect a stream reset
-parser.readFrame();
-Assert.assertEquals("3-RST-[11]\n", output.getTrace());
-output.clearTrace();
+// On some platform / Connector combinations the TCP 
connection close
+// will be processed before the client gets a chance to read 
the
+// connection close frame which will trigger an
+// IOException when we try to read the frame.
+try {
+parser.readFrame();
+Assert.assertEquals("3-RST-[11]\n", output.getTrace());
+output.clearTrace();
+} catch (IOException ioe) {
+// Expected on some platforms
+}
 }
 //$FALL-THROUGH$
 case CONNECTION_RESET: {


-
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: Re-enable tests

[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 bb80f82210 Re-enable tests
bb80f82210 is described below

commit bb80f8221030e476f57fc10c0ed4b6f80628285a
Author: Mark Thomas 
AuthorDate: Tue Feb 13 11:12:02 2024 +

Re-enable tests

Recent improvements to APR stability appear to have fixed the issues
with these tests.
---
 test/org/apache/tomcat/websocket/server/TestClose.java | 9 -
 1 file changed, 9 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/server/TestClose.java 
b/test/org/apache/tomcat/websocket/server/TestClose.java
index 97535709f3..052af7e9f7 100644
--- a/test/org/apache/tomcat/websocket/server/TestClose.java
+++ b/test/org/apache/tomcat/websocket/server/TestClose.java
@@ -34,7 +34,6 @@ import javax.websocket.Session;
 import javax.websocket.server.ServerEndpointConfig;
 
 import org.junit.Assert;
-import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -115,10 +114,6 @@ public class TestClose extends WebSocketBaseTest {
 
 @Test
 public void testTcpClose() throws Exception {
-// TODO
-Assume.assumeFalse("This test currently fails for APR",
-
getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Apr"));
-
 startServer(TestEndpointConfig.class);
 
 TesterWsClient client = new TesterWsClient("localhost", getPort());
@@ -178,10 +173,6 @@ public class TestClose extends WebSocketBaseTest {
 
 @Test
 public void testTcpCloseInOnMessage() throws Exception {
-// TODO
-Assume.assumeFalse("This test currently fails for APR",
-
getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Apr"));
-
 startServer(TestEndpointConfig.class);
 
 TesterWsClient client = new TesterWsClient("localhost", getPort());


-
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: Re-enable tests

[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 838f0b6b40 Re-enable tests
838f0b6b40 is described below

commit 838f0b6b4014a7459d84814ab59f0849232fa34b
Author: Mark Thomas 
AuthorDate: Tue Feb 13 11:12:02 2024 +

Re-enable tests

Recent improvements to APR stability appear to have fixed the issues
with these tests.
---
 test/org/apache/tomcat/websocket/server/TestClose.java | 9 -
 1 file changed, 9 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/server/TestClose.java 
b/test/org/apache/tomcat/websocket/server/TestClose.java
index 97535709f3..052af7e9f7 100644
--- a/test/org/apache/tomcat/websocket/server/TestClose.java
+++ b/test/org/apache/tomcat/websocket/server/TestClose.java
@@ -34,7 +34,6 @@ import javax.websocket.Session;
 import javax.websocket.server.ServerEndpointConfig;
 
 import org.junit.Assert;
-import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -115,10 +114,6 @@ public class TestClose extends WebSocketBaseTest {
 
 @Test
 public void testTcpClose() throws Exception {
-// TODO
-Assume.assumeFalse("This test currently fails for APR",
-
getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Apr"));
-
 startServer(TestEndpointConfig.class);
 
 TesterWsClient client = new TesterWsClient("localhost", getPort());
@@ -178,10 +173,6 @@ public class TestClose extends WebSocketBaseTest {
 
 @Test
 public void testTcpCloseInOnMessage() throws Exception {
-// TODO
-Assume.assumeFalse("This test currently fails for APR",
-
getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Apr"));
-
 startServer(TestEndpointConfig.class);
 
 TesterWsClient client = new TesterWsClient("localhost", getPort());


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

(tomcat) 05/05: Back-port addditional translations

[markt]

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

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

commit 41197ccd64c0c1e92b72dca4c781d25fd9a9d7d3
Author: Mark Thomas 
AuthorDate: Tue Feb 13 11:06:47 2024 +

Back-port addditional translations
---
 java/org/apache/catalina/tribes/transport/nio/LocalStrings_ko.properties | 1 +
 .../apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties   | 1 +
 2 files changed, 2 insertions(+)

diff --git 
a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ko.properties 
b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ko.properties
index 070cd1c666..1268e356fa 100644
--- a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ko.properties
@@ -16,6 +16,7 @@
 nioReceiver.alreadyStarted=ServerSocketChannel이 이미 시작되었습니다.
 nioReceiver.cleanup.fail=selector close 시에 cleanup을 할 수 없습니다.
 nioReceiver.clientDisconnect=복제 클라이언트가 연결이 끊겼습니다. 키를 poll할 때, 오류가 발생했습니다. 해당 
클라이언트는 무시됩니다.
+nioReceiver.eventsError=이벤트들을 처리하는 중 오류 발생
 nioReceiver.requestError=NioReceiver에서 요청을 처리할 수 없습니다.
 nioReceiver.run.fail=복제 리스너를 실행할 수 없습니다.
 nioReceiver.start.fail=클러스터 receiver를 시작 할 수 없습니다.
diff --git 
a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
index 5baf3e8da4..b2f297453c 100644
--- 
a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
+++ 
b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
@@ -16,6 +16,7 @@
 nioReceiver.alreadyStarted=ServerSocketChannel已经被启动
 nioReceiver.cleanup.fail=无法清除关闭的选择器
 nioReceiver.clientDisconnect=复制客户端已断开连接，轮询密钥时出错。忽略客户端。
+nioReceiver.eventsError=处理事件时出错
 nioReceiver.requestError=NioReceiver无法处理请求
 nioReceiver.run.fail=不能允许复制监听器
 nioReceiver.start.fail=无法启动集群接收器


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

(tomcat) 04/05: Remove unused translations

[markt]

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

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

commit 68b01be50337b900cf33708dce91abff9c0b93c3
Author: Mark Thomas 
AuthorDate: Tue Feb 13 11:06:33 2024 +

Remove unused translations
---
 java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties| 1 -
 java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties | 1 -
 2 files changed, 2 deletions(-)

diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties 
b/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
index 8144318ca8..f4301207c7 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=PING 메시지가 제한 시간을 초과
 abstractReplicatedMap.mapMember.unavailable=멤버 [{0}]은(는) 아직 가용하지 않습니다.
 abstractReplicatedMap.mapMemberAdded.added=Map 멤버가 추가되었습니다:[{0}]
 abstractReplicatedMap.mapMemberAdded.nullMember=통지된 멤버는 멤버십에 등록되어 있지 않습니다: 
[{0}]
-abstractReplicatedMap.member.disappeared=멤버 [{0}]이(가) 사라졌습니다. 관련 Map 엔트리들은 새 
노드로 다시 위치시킬 것입니다.
 abstractReplicatedMap.ping.stateTransferredMember=멤버 [{0}]이(가), 상태가 이전된 상태이지만, 
아직 가용하지 않습니다.
 abstractReplicatedMap.ping.timeout=Map [{1}] 내의 멤버 [{0}]은(는) ping 처리 중에 제한 시간 
초과되었습니다.
 abstractReplicatedMap.relocate.complete=Map 엔트리들을 재위치시키는 작업이 [{0}] 밀리초에 
완료되었습니다.
diff --git 
a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
index 6d2631b652..575ff86e11 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=PING消息已超过超时时间。映射
 abstractReplicatedMap.mapMember.unavailable=Member[{0}]还不可用
 abstractReplicatedMap.mapMemberAdded.added=已添加映射成员：[{0}]
 abstractReplicatedMap.mapMemberAdded.nullMember=通知的成员未注册：[{0}]
-abstractReplicatedMap.member.disappeared=成员[{0}]已消失。相关的映射项将重新定位到新节点。
 abstractReplicatedMap.ping.stateTransferredMember=成员[{0}]已状态转移，但尚不可用。
 abstractReplicatedMap.ping.timeout=映射[{1}]中的成员[{0}]在ping处理中超时。
 abstractReplicatedMap.relocate.complete=已在[{0}]ms内完成映射项的重新定位。


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

(tomcat) 03/05: Improvements to Japanese translations by tak7iji

[markt]

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

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

commit 18a1bc15cac216513f6817eb72334a15f7c30654
Author: Mark Thomas 
AuthorDate: Tue Feb 13 11:06:11 2024 +

Improvements to Japanese translations by tak7iji
---
 .../authenticator/LocalStrings_ja.properties   |  6 +++---
 .../jaspic/LocalStrings_ja.properties  |  4 ++--
 .../catalina/core/LocalStrings_ja.properties   |  4 ++--
 .../catalina/loader/LocalStrings_ja.properties |  2 +-
 .../catalina/servlets/LocalStrings_ja.properties   |  2 +-
 .../catalina/startup/LocalStrings_ja.properties|  6 +++---
 .../tribes/tipis/LocalStrings_ja.properties|  1 -
 .../transport/nio/LocalStrings_ja.properties   |  1 +
 .../catalina/util/LocalStrings_ja.properties   |  2 +-
 .../catalina/valves/LocalStrings_ja.properties |  4 ++--
 .../http11/upgrade/LocalStrings_ja.properties  |  2 +-
 .../apache/coyote/http2/LocalStrings_ja.properties | 25 +++---
 .../jasper/resources/LocalStrings_ja.properties|  3 ++-
 .../util/net/openssl/LocalStrings_ja.properties|  4 ++--
 .../tomcat/util/threads/LocalStrings_ja.properties |  2 ++
 .../websocket/pojo/LocalStrings_ja.properties  | 22 +--
 webapps/docs/changelog.xml |  3 +++
 17 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index 10f1fa3c7e..0bc7790bbe 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -20,7 +20,7 @@ authenticator.check.authorizeFail=Realm がユーザー[{0}]を認識しませ
 authenticator.check.found=既に認証された [{0}]
 authenticator.check.sso=認証されていませんが、SSOセッションID [{0}]が見つかりました。 再認証を試みます。
 authenticator.formlogin=フォームログインページへの無効な直接参照です
-authenticator.jaspicCleanSubjectFail=JASPIC の cleanSubject が失敗しました
+authenticator.jaspicCleanSubjectFail=JASPIC Subject のクリーンアップに失敗しました
 authenticator.jaspicSecureResponseFail=JASPIC処理中のsecure レスポンスに失敗しました
 authenticator.jaspicServerAuthContextFail=JASPIC ServerAuthContext 
インスタンスの取得に失敗しました
 authenticator.loginFail=ログイン失敗
@@ -51,7 +51,7 @@ formAuthenticator.sessionIdMismatch=現在のセッションIDは [{0}] です
 
 singleSignOn.debug.associate=SSO はアプリケーションセッション [{1}] を SSO セッション [{0}] に関連付けます
 
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
-singleSignOn.debug.cookieCheck=SSOはSSOクッキーをチェックしています
+singleSignOn.debug.cookieCheck=SSOはSSO Cookieをチェックしています
 singleSignOn.debug.cookieNotFound=SSOはSSO Cookieを検出しませんでした。
 singleSignOn.debug.deregister=SSOセッション[{1}]に関連付けられたアプリケーションセッション[{0}]を破棄します。
 singleSignOn.debug.deregisterFail=キャッシュにないため、SSO セッション [{0}] の登録を解除できませんでした
@@ -67,7 +67,7 @@ singleSignOn.debug.sessionLogout=SSOはSSOセッション[{0}]とアプリケー
 
singleSignOn.debug.sessionTimeout=SSOはSSOセッション[{0}]とアプリケーションセッション[{1}]のタイムアウトを処理しています
 singleSignOn.debug.update=SSOはSSOセッション [{0}] を認証タイプ [{1}] に更新します
 singleSignOn.sessionExpire.contextNotFound=Context が見つからないため、SSO はセッション [{0}] 
を破棄できません
-singleSignOn.sessionExpire.engineNull=Engine が Null だったため、SSO はセッション [{0}] 
を破棄できません
+singleSignOn.sessionExpire.engineNull=Engine が null だったため、SSO はセッション [{0}] 
を破棄できません
 singleSignOn.sessionExpire.hostNotFound=ホストが見つからないため SSO セッション [{0}] を破棄できません
 
singleSignOn.sessionExpire.managerError=セッションを検索するときにマネージャが例外をスローしたため、SSOはセッション 
[{0}] を破棄できません
 singleSignOn.sessionExpire.managerNotFound=マネージャが見つからなかったため、SSO はセッション [{0}] 
を破棄できません
diff --git 
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties 
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
index 76b9155735..b85800063a 100644
--- a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
@@ -16,8 +16,8 @@
 authConfigFactoryImpl.load=[{0}]から永続化プロバイダの登録を読み込みます。
 authConfigFactoryImpl.registerClass=アプリケーションコンテキスト [{2}] のレイヤー [{1}] にクラス 
[{0}] を登録します。
 authConfigFactoryImpl.registerInstance=認証構成プロバイダ [{0}] のインスタンスを、レイヤ [{1}] 
とアプリケーションコンテキスト [{2}] に登録しています
-authConfigFactoryImpl.zeroLengthAppContext=文字列長が 0 のアプリケーションコンテキスト名は無効です。
-authConfigFactoryImpl.zeroLengthMessageLayer=長さゼロのメッセージレイヤ名は無効です
+authConfigFactoryImpl.zeroLengthAppContext=長さ 0 のアプリケーションコンテキスト名は無効です
+authConfigFactoryImpl.zeroLengthMessageLayer=長さ 0 のメッセージレイヤ名は無効です
 
 callbackHandlerImpl.containerMissing=無視されたタイプ [{0}] のJASPICコールバックのコンテナーがありません
 callbackHandlerImpl.jaspicCallbackMissing=受信したタイプ [{0}] 
のサポートされていないJASPICコールバックが無視されました
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties 
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 3b8845b830..95c193ef52 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties

(tomcat) branch 8.5.x updated (ad1a93f2dc -> 41197ccd64)

[markt]

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

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


from ad1a93f2dc Fix typo
 new 6eb411c784 Fix order/grouping. No functional change.
 new ef289696ae Improvements to French translations. (remm)
 new 18a1bc15ca Improvements to Japanese translations by tak7iji
 new 68b01be503 Remove unused translations
 new 41197ccd64 Back-port addditional translations

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


Summary of changes:
 .../catalina/authenticator/LocalStrings.properties |  2 +-
 .../authenticator/LocalStrings_ja.properties   |  6 +++---
 .../jaspic/LocalStrings_ja.properties  |  4 ++--
 .../catalina/core/LocalStrings_ja.properties   |  4 ++--
 .../catalina/loader/LocalStrings_ja.properties |  2 +-
 .../catalina/servlets/LocalStrings_ja.properties   |  2 +-
 .../catalina/startup/LocalStrings_ja.properties|  6 +++---
 .../tribes/tipis/LocalStrings_fr.properties|  1 -
 .../tribes/tipis/LocalStrings_ja.properties|  1 -
 .../tribes/tipis/LocalStrings_ko.properties|  1 -
 .../tribes/tipis/LocalStrings_zh_CN.properties |  1 -
 .../transport/nio/LocalStrings_fr.properties   |  1 +
 .../transport/nio/LocalStrings_ja.properties   |  1 +
 .../transport/nio/LocalStrings_ko.properties   |  1 +
 .../transport/nio/LocalStrings_zh_CN.properties|  1 +
 .../catalina/util/LocalStrings_ja.properties   |  2 +-
 .../apache/catalina/valves/LocalStrings.properties |  2 +-
 .../catalina/valves/LocalStrings_ja.properties |  4 ++--
 .../http11/upgrade/LocalStrings_ja.properties  |  2 +-
 .../apache/coyote/http2/LocalStrings_ja.properties | 25 +++---
 .../jasper/resources/LocalStrings_ja.properties|  3 ++-
 .../util/codec/binary/LocalStrings.properties  |  1 -
 .../util/net/openssl/LocalStrings_ja.properties|  4 ++--
 .../tomcat/util/threads/LocalStrings_fr.properties |  2 ++
 .../tomcat/util/threads/LocalStrings_ja.properties |  2 ++
 .../websocket/pojo/LocalStrings_ja.properties  | 22 +--
 webapps/docs/changelog.xml |  6 ++
 27 files changed, 60 insertions(+), 49 deletions(-)


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

(tomcat) 01/05: Fix order/grouping. 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

commit 6eb411c784a0c8a3df0323c34570ee40908d68c5
Author: Mark Thomas 
AuthorDate: Tue Feb 13 11:05:07 2024 +

Fix order/grouping. No functional change.
---
 java/org/apache/catalina/authenticator/LocalStrings.properties   | 2 +-
 java/org/apache/catalina/valves/LocalStrings.properties  | 2 +-
 java/org/apache/tomcat/util/codec/binary/LocalStrings.properties | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/LocalStrings.properties 
b/java/org/apache/catalina/authenticator/LocalStrings.properties
index 4909ee1967..62825a2578 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings.properties
@@ -88,7 +88,7 @@ spnegoAuthenticator.authHeaderNotNego=The authorization 
header sent by the clien
 spnegoAuthenticator.serviceLoginFail=Unable to login as the service principal
 spnegoAuthenticator.ticketValidateFail=Failed to validate client supplied 
ticket
 
+sslAuthenticatorValve.authFailed=Authentication with the provided certificates 
failed
 sslAuthenticatorValve.http2=The context [{0}] in virtual host [{1}] is 
configured to use CLIENT-CERT authentication and [{2}] is configured to support 
HTTP/2. Use of CLIENT-CERT authentication is not compatible with the use of 
HTTP/2.
 sslAuthenticatorValve.noCertificates=No certificates are included with this 
request
-sslAuthenticatorValve.authFailed=Authentication with the provided certificates 
failed
 sslAuthenticatorValve.tls13=The context [{0}] in virtual host [{1}] is 
configured to use CLIENT-CERT authentication and [{2}] is configured to support 
TLS 1.3 using JSSE. Use of CLIENT-CERT authentication is not compatible with 
the use of TLS 1.3 and JSSE.
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties 
b/java/org/apache/catalina/valves/LocalStrings.properties
index 13466d2f12..c91f3c7269 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -26,12 +26,12 @@ accessLogValve.rotateFail=Failed to rotate access log
 accessLogValve.unsupportedEncoding=Failed to set encoding to [{0}], will use 
the system default character set.
 accessLogValve.writeFail=Failed to write log message [{0}]
 
+errorReportValve.contentTypeFail=Failure to set the content-type of response
 errorReportValve.description=Description
 errorReportValve.errorPageIOException=Unable to display error page at [{0}] 
due to an exception
 errorReportValve.errorPageNotFound=Unable to find a static error page at [{0}]
 errorReportValve.exception=Exception
 errorReportValve.exceptionReport=Exception Report
-errorReportValve.contentTypeFail=Failure to set the content-type of response
 errorReportValve.message=Message
 errorReportValve.noDescription=No description available
 errorReportValve.note=Note
diff --git a/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties 
b/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
index 6b17260a15..794f26c05b 100644
--- a/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
@@ -17,5 +17,4 @@ base64.impossibleModulus=Impossible modulus [{0}]
 base64.inputTooLarge=Input array too large, the output array would be bigger 
[{0}] than the specified maximum size of [{1}]
 base64.lineSeparator=Line separator must not contain base64 characters [{0}]
 base64.nullEncodeParameter=Cannot encode integer with null parameter
-
 base64.outOfMemory=Unable to allocate array size [{0}]


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

(tomcat) 02/05: Improvements to French translations. (remm)

[markt]

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

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

commit ef289696ae0a7e82b4615eee55f675b612c4c732
Author: Mark Thomas 
AuthorDate: Tue Feb 13 11:05:45 2024 +

Improvements to French translations. (remm)
---
 java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties   | 1 -
 .../apache/catalina/tribes/transport/nio/LocalStrings_fr.properties| 1 +
 java/org/apache/tomcat/util/threads/LocalStrings_fr.properties | 2 ++
 webapps/docs/changelog.xml | 3 +++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties 
b/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
index dbbec8bbdb..e8a4dc7bbf 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=Le délai d''attente a 
été dépassé po
 abstractReplicatedMap.mapMember.unavailable=Le membre [{0}] n''est pas encore 
disponible
 abstractReplicatedMap.mapMemberAdded.added=Le membre de la structure répliquée 
a été ajouté : [{0}]
 abstractReplicatedMap.mapMemberAdded.nullMember=Notifié que le membre n''est 
pas disponible dans le registre de membres : [{0}]
-abstractReplicatedMap.member.disappeared=Le membre [{0}] a disparu, les 
entrées correspondantes seront déplacées sur le nouveau nœud
 abstractReplicatedMap.ping.stateTransferredMember=L''état du membre [{0}] est 
transféré mais il n''est pas encore disponible
 abstractReplicatedMap.ping.timeout=Le membre [{0}] dans la carte répliquée 
[{1}] a fait un timeout lors du traitement d''un ping
 abstractReplicatedMap.relocate.complete=La relocation des entrées de la 
structure répliquée a été finie en [{0}] ms
diff --git 
a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_fr.properties 
b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_fr.properties
index 432de41eae..e577c471b9 100644
--- a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_fr.properties
@@ -16,6 +16,7 @@
 nioReceiver.alreadyStarted=ServerSocketChannel est déjà démarré
 nioReceiver.cleanup.fail=Impossible de nettoyer lors de la fermeture du 
sélecteur
 nioReceiver.clientDisconnect=Le client de réplication est déconnecté, erreur 
lors du "polling" de clé. Le client est ignoré.
+nioReceiver.eventsError=Erreur lors du traitement des évènements
 nioReceiver.requestError=Impossible de traiter la requête dans NioReceiver
 nioReceiver.run.fail=Impossible d'exécuter l'écouteur de réplication
 nioReceiver.start.fail=Incapable de démarrer le récepteur de cluster
diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
index 77e0529823..4cb10a86a7 100644
--- a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
@@ -19,3 +19,5 @@ threadPoolExecutor.invalidKeepAlive=Les threads principaux 
doivent avoir un temp
 threadPoolExecutor.queueFull=La file d'attente est pleine
 threadPoolExecutor.taskRejected=La tâche [{0}] a été rejetée par [{1}]
 threadPoolExecutor.threadStoppedToAvoidPotentialLeak=Arrêt du thread [{0}] 
pour éviter de potentielles fuites de mémoire après l''arrêt d''un contexte
+
+virtualThreadExecutor.taskRejected=La tâche [{0}] a été rejetée de [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5f02398080..8e1bef4bb7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -225,6 +225,9 @@
   
 Add strings for debug level messages. (remm)
   
+  
+Improvements to French translations. (remm)
+  
 
   
 


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

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

[markt]

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

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

commit 4324a6f6820403c9bc3c840eca21b2f020847b0c
Author: Mark Thomas 
AuthorDate: Tue Feb 13 11:02:44 2024 +

Improvements to French translations. (remm)
---
 java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties | 1 -
 java/org/apache/tomcat/util/threads/LocalStrings_fr.properties   | 2 ++
 webapps/docs/changelog.xml   | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties 
b/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
index dbbec8bbdb..e8a4dc7bbf 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=Le délai d''attente a 
été dépassé po
 abstractReplicatedMap.mapMember.unavailable=Le membre [{0}] n''est pas encore 
disponible
 abstractReplicatedMap.mapMemberAdded.added=Le membre de la structure répliquée 
a été ajouté : [{0}]
 abstractReplicatedMap.mapMemberAdded.nullMember=Notifié que le membre n''est 
pas disponible dans le registre de membres : [{0}]
-abstractReplicatedMap.member.disappeared=Le membre [{0}] a disparu, les 
entrées correspondantes seront déplacées sur le nouveau nœud
 abstractReplicatedMap.ping.stateTransferredMember=L''état du membre [{0}] est 
transféré mais il n''est pas encore disponible
 abstractReplicatedMap.ping.timeout=Le membre [{0}] dans la carte répliquée 
[{1}] a fait un timeout lors du traitement d''un ping
 abstractReplicatedMap.relocate.complete=La relocation des entrées de la 
structure répliquée a été finie en [{0}] ms
diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
index 77e0529823..4cb10a86a7 100644
--- a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
@@ -19,3 +19,5 @@ threadPoolExecutor.invalidKeepAlive=Les threads principaux 
doivent avoir un temp
 threadPoolExecutor.queueFull=La file d'attente est pleine
 threadPoolExecutor.taskRejected=La tâche [{0}] a été rejetée par [{1}]
 threadPoolExecutor.threadStoppedToAvoidPotentialLeak=Arrêt du thread [{0}] 
pour éviter de potentielles fuites de mémoire après l''arrêt d''un contexte
+
+virtualThreadExecutor.taskRejected=La tâche [{0}] a été rejetée de [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 27781eb925..20189409e1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -234,6 +234,9 @@
   
 Update Tomcat Native to 1.3.0. (markt)
   
+  
+Improvements to French translations. (remm)
+  
 
   
 


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

(tomcat) 03/04: Improvements to Japanese translations by tak7iji

[markt]

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

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

commit b33b8796ac8a5a9f850dcd743c6c54fd518aff98
Author: Mark Thomas 
AuthorDate: Tue Feb 13 11:03:11 2024 +

Improvements to Japanese translations by tak7iji
---
 .../authenticator/LocalStrings_ja.properties   |  6 ++---
 .../jaspic/LocalStrings_ja.properties  |  4 ++--
 .../catalina/core/LocalStrings_ja.properties   |  4 ++--
 .../catalina/loader/LocalStrings_ja.properties |  2 +-
 .../catalina/servlets/LocalStrings_ja.properties   |  2 +-
 .../catalina/startup/LocalStrings_ja.properties|  6 ++---
 .../tribes/tipis/LocalStrings_ja.properties|  1 -
 .../catalina/util/LocalStrings_ja.properties   |  2 +-
 .../catalina/valves/LocalStrings_ja.properties |  4 ++--
 .../http11/upgrade/LocalStrings_ja.properties  |  2 +-
 .../apache/coyote/http2/LocalStrings_ja.properties | 27 +++---
 .../jasper/resources/LocalStrings_ja.properties|  3 ++-
 .../util/net/openssl/LocalStrings_ja.properties|  4 ++--
 .../tomcat/util/threads/LocalStrings_ja.properties |  2 ++
 .../websocket/pojo/LocalStrings_ja.properties  | 22 +-
 webapps/docs/changelog.xml |  3 +++
 16 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index 10f1fa3c7e..0bc7790bbe 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -20,7 +20,7 @@ authenticator.check.authorizeFail=Realm がユーザー[{0}]を認識しませ
 authenticator.check.found=既に認証された [{0}]
 authenticator.check.sso=認証されていませんが、SSOセッションID [{0}]が見つかりました。 再認証を試みます。
 authenticator.formlogin=フォームログインページへの無効な直接参照です
-authenticator.jaspicCleanSubjectFail=JASPIC の cleanSubject が失敗しました
+authenticator.jaspicCleanSubjectFail=JASPIC Subject のクリーンアップに失敗しました
 authenticator.jaspicSecureResponseFail=JASPIC処理中のsecure レスポンスに失敗しました
 authenticator.jaspicServerAuthContextFail=JASPIC ServerAuthContext 
インスタンスの取得に失敗しました
 authenticator.loginFail=ログイン失敗
@@ -51,7 +51,7 @@ formAuthenticator.sessionIdMismatch=現在のセッションIDは [{0}] です
 
 singleSignOn.debug.associate=SSO はアプリケーションセッション [{1}] を SSO セッション [{0}] に関連付けます
 
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
-singleSignOn.debug.cookieCheck=SSOはSSOクッキーをチェックしています
+singleSignOn.debug.cookieCheck=SSOはSSO Cookieをチェックしています
 singleSignOn.debug.cookieNotFound=SSOはSSO Cookieを検出しませんでした。
 singleSignOn.debug.deregister=SSOセッション[{1}]に関連付けられたアプリケーションセッション[{0}]を破棄します。
 singleSignOn.debug.deregisterFail=キャッシュにないため、SSO セッション [{0}] の登録を解除できませんでした
@@ -67,7 +67,7 @@ singleSignOn.debug.sessionLogout=SSOはSSOセッション[{0}]とアプリケー
 
singleSignOn.debug.sessionTimeout=SSOはSSOセッション[{0}]とアプリケーションセッション[{1}]のタイムアウトを処理しています
 singleSignOn.debug.update=SSOはSSOセッション [{0}] を認証タイプ [{1}] に更新します
 singleSignOn.sessionExpire.contextNotFound=Context が見つからないため、SSO はセッション [{0}] 
を破棄できません
-singleSignOn.sessionExpire.engineNull=Engine が Null だったため、SSO はセッション [{0}] 
を破棄できません
+singleSignOn.sessionExpire.engineNull=Engine が null だったため、SSO はセッション [{0}] 
を破棄できません
 singleSignOn.sessionExpire.hostNotFound=ホストが見つからないため SSO セッション [{0}] を破棄できません
 
singleSignOn.sessionExpire.managerError=セッションを検索するときにマネージャが例外をスローしたため、SSOはセッション 
[{0}] を破棄できません
 singleSignOn.sessionExpire.managerNotFound=マネージャが見つからなかったため、SSO はセッション [{0}] 
を破棄できません
diff --git 
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties 
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
index 76b9155735..b85800063a 100644
--- a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
@@ -16,8 +16,8 @@
 authConfigFactoryImpl.load=[{0}]から永続化プロバイダの登録を読み込みます。
 authConfigFactoryImpl.registerClass=アプリケーションコンテキスト [{2}] のレイヤー [{1}] にクラス 
[{0}] を登録します。
 authConfigFactoryImpl.registerInstance=認証構成プロバイダ [{0}] のインスタンスを、レイヤ [{1}] 
とアプリケーションコンテキスト [{2}] に登録しています
-authConfigFactoryImpl.zeroLengthAppContext=文字列長が 0 のアプリケーションコンテキスト名は無効です。
-authConfigFactoryImpl.zeroLengthMessageLayer=長さゼロのメッセージレイヤ名は無効です
+authConfigFactoryImpl.zeroLengthAppContext=長さ 0 のアプリケーションコンテキスト名は無効です
+authConfigFactoryImpl.zeroLengthMessageLayer=長さ 0 のメッセージレイヤ名は無効です
 
 callbackHandlerImpl.containerMissing=無視されたタイプ [{0}] のJASPICコールバックのコンテナーがありません
 callbackHandlerImpl.jaspicCallbackMissing=受信したタイプ [{0}] 
のサポートされていないJASPICコールバックが無視されました
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties 
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 92588f7fb3..12cdd3556f 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties

(tomcat) 04/04: Remove unused translation

[markt]

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

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

commit 084671ca8876c888b6c2d0d8aa546edd05d83218
Author: Mark Thomas 
AuthorDate: Tue Feb 13 11:03:22 2024 +

Remove unused translation
---
 java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties| 1 -
 java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties | 1 -
 2 files changed, 2 deletions(-)

diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties 
b/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
index 8144318ca8..f4301207c7 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=PING 메시지가 제한 시간을 초과
 abstractReplicatedMap.mapMember.unavailable=멤버 [{0}]은(는) 아직 가용하지 않습니다.
 abstractReplicatedMap.mapMemberAdded.added=Map 멤버가 추가되었습니다:[{0}]
 abstractReplicatedMap.mapMemberAdded.nullMember=통지된 멤버는 멤버십에 등록되어 있지 않습니다: 
[{0}]
-abstractReplicatedMap.member.disappeared=멤버 [{0}]이(가) 사라졌습니다. 관련 Map 엔트리들은 새 
노드로 다시 위치시킬 것입니다.
 abstractReplicatedMap.ping.stateTransferredMember=멤버 [{0}]이(가), 상태가 이전된 상태이지만, 
아직 가용하지 않습니다.
 abstractReplicatedMap.ping.timeout=Map [{1}] 내의 멤버 [{0}]은(는) ping 처리 중에 제한 시간 
초과되었습니다.
 abstractReplicatedMap.relocate.complete=Map 엔트리들을 재위치시키는 작업이 [{0}] 밀리초에 
완료되었습니다.
diff --git 
a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
index 6d2631b652..575ff86e11 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=PING消息已超过超时时间。映射
 abstractReplicatedMap.mapMember.unavailable=Member[{0}]还不可用
 abstractReplicatedMap.mapMemberAdded.added=已添加映射成员：[{0}]
 abstractReplicatedMap.mapMemberAdded.nullMember=通知的成员未注册：[{0}]
-abstractReplicatedMap.member.disappeared=成员[{0}]已消失。相关的映射项将重新定位到新节点。
 abstractReplicatedMap.ping.stateTransferredMember=成员[{0}]已状态转移，但尚不可用。
 abstractReplicatedMap.ping.timeout=映射[{1}]中的成员[{0}]在ping处理中超时。
 abstractReplicatedMap.relocate.complete=已在[{0}]ms内完成映射项的重新定位。


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

(tomcat) 01/04: Fix ordering and grouping - 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

commit 201ef0f9ae74233438c35252633696b6198e8947
Author: Mark Thomas 
AuthorDate: Tue Feb 13 11:02:20 2024 +

Fix ordering and grouping - no functional change
---
 java/org/apache/catalina/authenticator/LocalStrings.properties   | 2 +-
 java/org/apache/catalina/valves/LocalStrings.properties  | 2 +-
 java/org/apache/tomcat/util/codec/binary/LocalStrings.properties | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/LocalStrings.properties 
b/java/org/apache/catalina/authenticator/LocalStrings.properties
index 4909ee1967..62825a2578 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings.properties
@@ -88,7 +88,7 @@ spnegoAuthenticator.authHeaderNotNego=The authorization 
header sent by the clien
 spnegoAuthenticator.serviceLoginFail=Unable to login as the service principal
 spnegoAuthenticator.ticketValidateFail=Failed to validate client supplied 
ticket
 
+sslAuthenticatorValve.authFailed=Authentication with the provided certificates 
failed
 sslAuthenticatorValve.http2=The context [{0}] in virtual host [{1}] is 
configured to use CLIENT-CERT authentication and [{2}] is configured to support 
HTTP/2. Use of CLIENT-CERT authentication is not compatible with the use of 
HTTP/2.
 sslAuthenticatorValve.noCertificates=No certificates are included with this 
request
-sslAuthenticatorValve.authFailed=Authentication with the provided certificates 
failed
 sslAuthenticatorValve.tls13=The context [{0}] in virtual host [{1}] is 
configured to use CLIENT-CERT authentication and [{2}] is configured to support 
TLS 1.3 using JSSE. Use of CLIENT-CERT authentication is not compatible with 
the use of TLS 1.3 and JSSE.
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties 
b/java/org/apache/catalina/valves/LocalStrings.properties
index 13466d2f12..c91f3c7269 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -26,12 +26,12 @@ accessLogValve.rotateFail=Failed to rotate access log
 accessLogValve.unsupportedEncoding=Failed to set encoding to [{0}], will use 
the system default character set.
 accessLogValve.writeFail=Failed to write log message [{0}]
 
+errorReportValve.contentTypeFail=Failure to set the content-type of response
 errorReportValve.description=Description
 errorReportValve.errorPageIOException=Unable to display error page at [{0}] 
due to an exception
 errorReportValve.errorPageNotFound=Unable to find a static error page at [{0}]
 errorReportValve.exception=Exception
 errorReportValve.exceptionReport=Exception Report
-errorReportValve.contentTypeFail=Failure to set the content-type of response
 errorReportValve.message=Message
 errorReportValve.noDescription=No description available
 errorReportValve.note=Note
diff --git a/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties 
b/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
index 6b17260a15..794f26c05b 100644
--- a/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
@@ -17,5 +17,4 @@ base64.impossibleModulus=Impossible modulus [{0}]
 base64.inputTooLarge=Input array too large, the output array would be bigger 
[{0}] than the specified maximum size of [{1}]
 base64.lineSeparator=Line separator must not contain base64 characters [{0}]
 base64.nullEncodeParameter=Cannot encode integer with null parameter
-
 base64.outOfMemory=Unable to allocate array size [{0}]


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

(tomcat) branch 9.0.x updated (1a410a8c78 -> 084671ca88)

[markt]

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

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


from 1a410a8c78 Fix typo
 new 201ef0f9ae Fix ordering and grouping - no functional change
 new 4324a6f682 Improvements to French translations. (remm)
 new b33b8796ac Improvements to Japanese translations by tak7iji
 new 084671ca88 Remove unused translation

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


Summary of changes:
 .../catalina/authenticator/LocalStrings.properties |  2 +-
 .../authenticator/LocalStrings_ja.properties   |  6 ++---
 .../jaspic/LocalStrings_ja.properties  |  4 ++--
 .../catalina/core/LocalStrings_ja.properties   |  4 ++--
 .../catalina/loader/LocalStrings_ja.properties |  2 +-
 .../catalina/servlets/LocalStrings_ja.properties   |  2 +-
 .../catalina/startup/LocalStrings_ja.properties|  6 ++---
 .../tribes/tipis/LocalStrings_fr.properties|  1 -
 .../tribes/tipis/LocalStrings_ja.properties|  1 -
 .../tribes/tipis/LocalStrings_ko.properties|  1 -
 .../tribes/tipis/LocalStrings_zh_CN.properties |  1 -
 .../catalina/util/LocalStrings_ja.properties   |  2 +-
 .../apache/catalina/valves/LocalStrings.properties |  2 +-
 .../catalina/valves/LocalStrings_ja.properties |  4 ++--
 .../http11/upgrade/LocalStrings_ja.properties  |  2 +-
 .../apache/coyote/http2/LocalStrings_ja.properties | 27 +++---
 .../jasper/resources/LocalStrings_ja.properties|  3 ++-
 .../util/codec/binary/LocalStrings.properties  |  1 -
 .../util/net/openssl/LocalStrings_ja.properties|  4 ++--
 .../tomcat/util/threads/LocalStrings_fr.properties |  2 ++
 .../tomcat/util/threads/LocalStrings_ja.properties |  2 ++
 .../websocket/pojo/LocalStrings_ja.properties  | 22 +-
 webapps/docs/changelog.xml |  6 +
 23 files changed, 57 insertions(+), 50 deletions(-)


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

(tomcat) 01/04: Alphabetical order and correct grouping - no funcitonal change

[markt]

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

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

commit d7f6a3f7fdad7a39e49921af4b4f7e7e4734aadf
Author: Mark Thomas 
AuthorDate: Tue Feb 13 10:56:14 2024 +

Alphabetical order and correct grouping - no funcitonal change
---
 java/org/apache/catalina/authenticator/LocalStrings.properties   | 2 +-
 java/org/apache/catalina/valves/LocalStrings.properties  | 2 +-
 java/org/apache/tomcat/util/codec/binary/LocalStrings.properties | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/LocalStrings.properties 
b/java/org/apache/catalina/authenticator/LocalStrings.properties
index 4909ee1967..62825a2578 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings.properties
@@ -88,7 +88,7 @@ spnegoAuthenticator.authHeaderNotNego=The authorization 
header sent by the clien
 spnegoAuthenticator.serviceLoginFail=Unable to login as the service principal
 spnegoAuthenticator.ticketValidateFail=Failed to validate client supplied 
ticket
 
+sslAuthenticatorValve.authFailed=Authentication with the provided certificates 
failed
 sslAuthenticatorValve.http2=The context [{0}] in virtual host [{1}] is 
configured to use CLIENT-CERT authentication and [{2}] is configured to support 
HTTP/2. Use of CLIENT-CERT authentication is not compatible with the use of 
HTTP/2.
 sslAuthenticatorValve.noCertificates=No certificates are included with this 
request
-sslAuthenticatorValve.authFailed=Authentication with the provided certificates 
failed
 sslAuthenticatorValve.tls13=The context [{0}] in virtual host [{1}] is 
configured to use CLIENT-CERT authentication and [{2}] is configured to support 
TLS 1.3 using JSSE. Use of CLIENT-CERT authentication is not compatible with 
the use of TLS 1.3 and JSSE.
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties 
b/java/org/apache/catalina/valves/LocalStrings.properties
index 13466d2f12..c91f3c7269 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -26,12 +26,12 @@ accessLogValve.rotateFail=Failed to rotate access log
 accessLogValve.unsupportedEncoding=Failed to set encoding to [{0}], will use 
the system default character set.
 accessLogValve.writeFail=Failed to write log message [{0}]
 
+errorReportValve.contentTypeFail=Failure to set the content-type of response
 errorReportValve.description=Description
 errorReportValve.errorPageIOException=Unable to display error page at [{0}] 
due to an exception
 errorReportValve.errorPageNotFound=Unable to find a static error page at [{0}]
 errorReportValve.exception=Exception
 errorReportValve.exceptionReport=Exception Report
-errorReportValve.contentTypeFail=Failure to set the content-type of response
 errorReportValve.message=Message
 errorReportValve.noDescription=No description available
 errorReportValve.note=Note
diff --git a/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties 
b/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
index 6b17260a15..794f26c05b 100644
--- a/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
@@ -17,5 +17,4 @@ base64.impossibleModulus=Impossible modulus [{0}]
 base64.inputTooLarge=Input array too large, the output array would be bigger 
[{0}] than the specified maximum size of [{1}]
 base64.lineSeparator=Line separator must not contain base64 characters [{0}]
 base64.nullEncodeParameter=Cannot encode integer with null parameter
-
 base64.outOfMemory=Unable to allocate array size [{0}]


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

(tomcat) 03/04: Improvements to Japanese translations by tak7iji

[markt]

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

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

commit d1cdb8879ea6253e1d75a2621e7fe236c4cacbd9
Author: Mark Thomas 
AuthorDate: Tue Feb 13 10:59:00 2024 +

Improvements to Japanese translations by tak7iji
---
 .../authenticator/LocalStrings_ja.properties   |  6 ++---
 .../jaspic/LocalStrings_ja.properties  |  4 ++--
 .../catalina/core/LocalStrings_ja.properties   |  4 ++--
 .../catalina/loader/LocalStrings_ja.properties |  2 +-
 .../catalina/servlets/LocalStrings_ja.properties   |  2 +-
 .../catalina/startup/LocalStrings_ja.properties|  6 ++---
 .../tribes/tipis/LocalStrings_ja.properties|  1 -
 .../catalina/util/LocalStrings_ja.properties   |  2 +-
 .../catalina/valves/LocalStrings_ja.properties |  4 ++--
 .../http11/upgrade/LocalStrings_ja.properties  |  2 +-
 .../apache/coyote/http2/LocalStrings_ja.properties | 27 +++---
 .../jasper/resources/LocalStrings_ja.properties|  5 ++--
 .../util/net/openssl/LocalStrings_ja.properties|  4 ++--
 .../tomcat/util/threads/LocalStrings_ja.properties |  2 ++
 .../websocket/pojo/LocalStrings_ja.properties  | 22 +-
 webapps/docs/changelog.xml |  3 +++
 16 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index 10f1fa3c7e..0bc7790bbe 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -20,7 +20,7 @@ authenticator.check.authorizeFail=Realm がユーザー[{0}]を認識しませ
 authenticator.check.found=既に認証された [{0}]
 authenticator.check.sso=認証されていませんが、SSOセッションID [{0}]が見つかりました。 再認証を試みます。
 authenticator.formlogin=フォームログインページへの無効な直接参照です
-authenticator.jaspicCleanSubjectFail=JASPIC の cleanSubject が失敗しました
+authenticator.jaspicCleanSubjectFail=JASPIC Subject のクリーンアップに失敗しました
 authenticator.jaspicSecureResponseFail=JASPIC処理中のsecure レスポンスに失敗しました
 authenticator.jaspicServerAuthContextFail=JASPIC ServerAuthContext 
インスタンスの取得に失敗しました
 authenticator.loginFail=ログイン失敗
@@ -51,7 +51,7 @@ formAuthenticator.sessionIdMismatch=現在のセッションIDは [{0}] です
 
 singleSignOn.debug.associate=SSO はアプリケーションセッション [{1}] を SSO セッション [{0}] に関連付けます
 
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
-singleSignOn.debug.cookieCheck=SSOはSSOクッキーをチェックしています
+singleSignOn.debug.cookieCheck=SSOはSSO Cookieをチェックしています
 singleSignOn.debug.cookieNotFound=SSOはSSO Cookieを検出しませんでした。
 singleSignOn.debug.deregister=SSOセッション[{1}]に関連付けられたアプリケーションセッション[{0}]を破棄します。
 singleSignOn.debug.deregisterFail=キャッシュにないため、SSO セッション [{0}] の登録を解除できませんでした
@@ -67,7 +67,7 @@ singleSignOn.debug.sessionLogout=SSOはSSOセッション[{0}]とアプリケー
 
singleSignOn.debug.sessionTimeout=SSOはSSOセッション[{0}]とアプリケーションセッション[{1}]のタイムアウトを処理しています
 singleSignOn.debug.update=SSOはSSOセッション [{0}] を認証タイプ [{1}] に更新します
 singleSignOn.sessionExpire.contextNotFound=Context が見つからないため、SSO はセッション [{0}] 
を破棄できません
-singleSignOn.sessionExpire.engineNull=Engine が Null だったため、SSO はセッション [{0}] 
を破棄できません
+singleSignOn.sessionExpire.engineNull=Engine が null だったため、SSO はセッション [{0}] 
を破棄できません
 singleSignOn.sessionExpire.hostNotFound=ホストが見つからないため SSO セッション [{0}] を破棄できません
 
singleSignOn.sessionExpire.managerError=セッションを検索するときにマネージャが例外をスローしたため、SSOはセッション 
[{0}] を破棄できません
 singleSignOn.sessionExpire.managerNotFound=マネージャが見つからなかったため、SSO はセッション [{0}] 
を破棄できません
diff --git 
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties 
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
index 74c200a3ab..2ae45738bd 100644
--- a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
@@ -18,8 +18,8 @@ authConfigFactoryImpl.nullContext=提供されたコンテキストオブジェ
 authConfigFactoryImpl.registerClass=アプリケーションコンテキスト [{2}] のレイヤー [{1}] にクラス 
[{0}] を登録します。
 authConfigFactoryImpl.registerInstance=認証構成プロバイダ [{0}] のインスタンスを、レイヤ [{1}] 
とアプリケーションコンテキスト [{2}] に登録しています
 
authConfigFactoryImpl.unsupportedContextType=この実装は、jakarta.servlet.ServletContext型のコンテキストのみをサポートしますが、提供されたコンテキストは[{0}]型でした
-authConfigFactoryImpl.zeroLengthAppContext=文字列長が 0 のアプリケーションコンテキスト名は無効です。
-authConfigFactoryImpl.zeroLengthMessageLayer=長さゼロのメッセージレイヤ名は無効です
+authConfigFactoryImpl.zeroLengthAppContext=長さ 0 のアプリケーションコンテキスト名は無効です
+authConfigFactoryImpl.zeroLengthMessageLayer=長さ 0 のメッセージレイヤ名は無効です
 
 callbackHandlerImpl.containerMissing=無視されたタイプ [{0}] のJASPICコールバックのコンテナーがありません
 callbackHandlerImpl.jaspicCallbackMissing=受信したタイプ [{0}] 
のサポートされていないJASPICコールバックが無視されました
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties 
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index f02937daf7..f122d334eb 100644

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

[markt]

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

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

commit 4bd3fbc8e0322f48f9218a038459f232d4fcd2b1
Author: Mark Thomas 
AuthorDate: Tue Feb 13 10:57:56 2024 +

Improvements to French translations. (remm)
---
 java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties | 1 -
 java/org/apache/tomcat/util/threads/LocalStrings_fr.properties   | 2 ++
 webapps/docs/changelog.xml   | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties 
b/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
index dbbec8bbdb..e8a4dc7bbf 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=Le délai d''attente a 
été dépassé po
 abstractReplicatedMap.mapMember.unavailable=Le membre [{0}] n''est pas encore 
disponible
 abstractReplicatedMap.mapMemberAdded.added=Le membre de la structure répliquée 
a été ajouté : [{0}]
 abstractReplicatedMap.mapMemberAdded.nullMember=Notifié que le membre n''est 
pas disponible dans le registre de membres : [{0}]
-abstractReplicatedMap.member.disappeared=Le membre [{0}] a disparu, les 
entrées correspondantes seront déplacées sur le nouveau nœud
 abstractReplicatedMap.ping.stateTransferredMember=L''état du membre [{0}] est 
transféré mais il n''est pas encore disponible
 abstractReplicatedMap.ping.timeout=Le membre [{0}] dans la carte répliquée 
[{1}] a fait un timeout lors du traitement d''un ping
 abstractReplicatedMap.relocate.complete=La relocation des entrées de la 
structure répliquée a été finie en [{0}] ms
diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
index 77e0529823..4cb10a86a7 100644
--- a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
@@ -19,3 +19,5 @@ threadPoolExecutor.invalidKeepAlive=Les threads principaux 
doivent avoir un temp
 threadPoolExecutor.queueFull=La file d'attente est pleine
 threadPoolExecutor.taskRejected=La tâche [{0}] a été rejetée par [{1}]
 threadPoolExecutor.threadStoppedToAvoidPotentialLeak=Arrêt du thread [{0}] 
pour éviter de potentielles fuites de mémoire après l''arrêt d''un contexte
+
+virtualThreadExecutor.taskRejected=La tâche [{0}] a été rejetée de [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index eeb1bbba8e..c3124c7e29 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -244,6 +244,9 @@
   
 Add strings for debug level messages. (remm)
   
+  
+Improvements to French translations. (remm)
+  
 
   
 


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

(tomcat) 04/04: Remove unused translation

[markt]

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

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

commit c72ec5de07a486388bd9cdda549cc07b8e9cefa2
Author: Mark Thomas 
AuthorDate: Tue Feb 13 10:59:21 2024 +

Remove unused translation
---
 java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties| 1 -
 java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties | 1 -
 2 files changed, 2 deletions(-)

diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties 
b/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
index 8144318ca8..f4301207c7 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=PING 메시지가 제한 시간을 초과
 abstractReplicatedMap.mapMember.unavailable=멤버 [{0}]은(는) 아직 가용하지 않습니다.
 abstractReplicatedMap.mapMemberAdded.added=Map 멤버가 추가되었습니다:[{0}]
 abstractReplicatedMap.mapMemberAdded.nullMember=통지된 멤버는 멤버십에 등록되어 있지 않습니다: 
[{0}]
-abstractReplicatedMap.member.disappeared=멤버 [{0}]이(가) 사라졌습니다. 관련 Map 엔트리들은 새 
노드로 다시 위치시킬 것입니다.
 abstractReplicatedMap.ping.stateTransferredMember=멤버 [{0}]이(가), 상태가 이전된 상태이지만, 
아직 가용하지 않습니다.
 abstractReplicatedMap.ping.timeout=Map [{1}] 내의 멤버 [{0}]은(는) ping 처리 중에 제한 시간 
초과되었습니다.
 abstractReplicatedMap.relocate.complete=Map 엔트리들을 재위치시키는 작업이 [{0}] 밀리초에 
완료되었습니다.
diff --git 
a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
index 6d2631b652..575ff86e11 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=PING消息已超过超时时间。映射
 abstractReplicatedMap.mapMember.unavailable=Member[{0}]还不可用
 abstractReplicatedMap.mapMemberAdded.added=已添加映射成员：[{0}]
 abstractReplicatedMap.mapMemberAdded.nullMember=通知的成员未注册：[{0}]
-abstractReplicatedMap.member.disappeared=成员[{0}]已消失。相关的映射项将重新定位到新节点。
 abstractReplicatedMap.ping.stateTransferredMember=成员[{0}]已状态转移，但尚不可用。
 abstractReplicatedMap.ping.timeout=映射[{1}]中的成员[{0}]在ping处理中超时。
 abstractReplicatedMap.relocate.complete=已在[{0}]ms内完成映射项的重新定位。


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

(tomcat) branch 10.1.x updated (cd4b32ff34 -> c72ec5de07)

[markt]

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

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


from cd4b32ff34 Fix typo
 new d7f6a3f7fd Alphabetical order and correct grouping - no funcitonal 
change
 new 4bd3fbc8e0 Improvements to French translations. (remm)
 new d1cdb8879e Improvements to Japanese translations by tak7iji
 new c72ec5de07 Remove unused translation

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


Summary of changes:
 .../catalina/authenticator/LocalStrings.properties |  2 +-
 .../authenticator/LocalStrings_ja.properties   |  6 ++---
 .../jaspic/LocalStrings_ja.properties  |  4 ++--
 .../catalina/core/LocalStrings_ja.properties   |  4 ++--
 .../catalina/loader/LocalStrings_ja.properties |  2 +-
 .../catalina/servlets/LocalStrings_ja.properties   |  2 +-
 .../catalina/startup/LocalStrings_ja.properties|  6 ++---
 .../tribes/tipis/LocalStrings_fr.properties|  1 -
 .../tribes/tipis/LocalStrings_ja.properties|  1 -
 .../tribes/tipis/LocalStrings_ko.properties|  1 -
 .../tribes/tipis/LocalStrings_zh_CN.properties |  1 -
 .../catalina/util/LocalStrings_ja.properties   |  2 +-
 .../apache/catalina/valves/LocalStrings.properties |  2 +-
 .../catalina/valves/LocalStrings_ja.properties |  4 ++--
 .../http11/upgrade/LocalStrings_ja.properties  |  2 +-
 .../apache/coyote/http2/LocalStrings_ja.properties | 27 +++---
 .../jasper/resources/LocalStrings_ja.properties|  5 ++--
 .../util/codec/binary/LocalStrings.properties  |  1 -
 .../util/net/openssl/LocalStrings_ja.properties|  4 ++--
 .../tomcat/util/threads/LocalStrings_fr.properties |  2 ++
 .../tomcat/util/threads/LocalStrings_ja.properties |  2 ++
 .../websocket/pojo/LocalStrings_ja.properties  | 22 +-
 webapps/docs/changelog.xml |  6 +
 23 files changed, 58 insertions(+), 51 deletions(-)


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

(tomcat) 02/03: Improvements to Japanese translations by tak7iji

[markt]

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

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

commit c7ec4be26cf9179378e6bed14199d7b944480bb9
Author: Mark Thomas 
AuthorDate: Tue Feb 13 10:48:25 2024 +

Improvements to Japanese translations by tak7iji
---
 .../authenticator/LocalStrings_ja.properties   |  6 ++---
 .../jaspic/LocalStrings_ja.properties  |  4 ++--
 .../catalina/core/LocalStrings_ja.properties   |  4 ++--
 .../catalina/loader/LocalStrings_ja.properties |  2 +-
 .../catalina/servlets/LocalStrings_ja.properties   |  2 +-
 .../catalina/startup/LocalStrings_ja.properties|  6 ++---
 .../tribes/tipis/LocalStrings_ja.properties|  1 -
 .../catalina/util/LocalStrings_ja.properties   |  2 +-
 .../catalina/valves/LocalStrings_ja.properties |  4 ++--
 .../http11/upgrade/LocalStrings_ja.properties  |  2 +-
 .../apache/coyote/http2/LocalStrings_ja.properties | 27 +++---
 .../jasper/resources/LocalStrings_ja.properties|  7 +++---
 .../util/net/openssl/LocalStrings_ja.properties|  4 ++--
 .../net/openssl/panama/LocalStrings_ja.properties  |  8 ---
 .../tomcat/util/threads/LocalStrings_ja.properties |  2 ++
 .../websocket/pojo/LocalStrings_ja.properties  | 22 +-
 webapps/docs/changelog.xml |  3 +++
 17 files changed, 57 insertions(+), 49 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index 10f1fa3c7e..0bc7790bbe 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -20,7 +20,7 @@ authenticator.check.authorizeFail=Realm がユーザー[{0}]を認識しませ
 authenticator.check.found=既に認証された [{0}]
 authenticator.check.sso=認証されていませんが、SSOセッションID [{0}]が見つかりました。 再認証を試みます。
 authenticator.formlogin=フォームログインページへの無効な直接参照です
-authenticator.jaspicCleanSubjectFail=JASPIC の cleanSubject が失敗しました
+authenticator.jaspicCleanSubjectFail=JASPIC Subject のクリーンアップに失敗しました
 authenticator.jaspicSecureResponseFail=JASPIC処理中のsecure レスポンスに失敗しました
 authenticator.jaspicServerAuthContextFail=JASPIC ServerAuthContext 
インスタンスの取得に失敗しました
 authenticator.loginFail=ログイン失敗
@@ -51,7 +51,7 @@ formAuthenticator.sessionIdMismatch=現在のセッションIDは [{0}] です
 
 singleSignOn.debug.associate=SSO はアプリケーションセッション [{1}] を SSO セッション [{0}] に関連付けます
 
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
-singleSignOn.debug.cookieCheck=SSOはSSOクッキーをチェックしています
+singleSignOn.debug.cookieCheck=SSOはSSO Cookieをチェックしています
 singleSignOn.debug.cookieNotFound=SSOはSSO Cookieを検出しませんでした。
 singleSignOn.debug.deregister=SSOセッション[{1}]に関連付けられたアプリケーションセッション[{0}]を破棄します。
 singleSignOn.debug.deregisterFail=キャッシュにないため、SSO セッション [{0}] の登録を解除できませんでした
@@ -67,7 +67,7 @@ singleSignOn.debug.sessionLogout=SSOはSSOセッション[{0}]とアプリケー
 
singleSignOn.debug.sessionTimeout=SSOはSSOセッション[{0}]とアプリケーションセッション[{1}]のタイムアウトを処理しています
 singleSignOn.debug.update=SSOはSSOセッション [{0}] を認証タイプ [{1}] に更新します
 singleSignOn.sessionExpire.contextNotFound=Context が見つからないため、SSO はセッション [{0}] 
を破棄できません
-singleSignOn.sessionExpire.engineNull=Engine が Null だったため、SSO はセッション [{0}] 
を破棄できません
+singleSignOn.sessionExpire.engineNull=Engine が null だったため、SSO はセッション [{0}] 
を破棄できません
 singleSignOn.sessionExpire.hostNotFound=ホストが見つからないため SSO セッション [{0}] を破棄できません
 
singleSignOn.sessionExpire.managerError=セッションを検索するときにマネージャが例外をスローしたため、SSOはセッション 
[{0}] を破棄できません
 singleSignOn.sessionExpire.managerNotFound=マネージャが見つからなかったため、SSO はセッション [{0}] 
を破棄できません
diff --git 
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties 
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
index 74c200a3ab..2ae45738bd 100644
--- a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
@@ -18,8 +18,8 @@ authConfigFactoryImpl.nullContext=提供されたコンテキストオブジェ
 authConfigFactoryImpl.registerClass=アプリケーションコンテキスト [{2}] のレイヤー [{1}] にクラス 
[{0}] を登録します。
 authConfigFactoryImpl.registerInstance=認証構成プロバイダ [{0}] のインスタンスを、レイヤ [{1}] 
とアプリケーションコンテキスト [{2}] に登録しています
 
authConfigFactoryImpl.unsupportedContextType=この実装は、jakarta.servlet.ServletContext型のコンテキストのみをサポートしますが、提供されたコンテキストは[{0}]型でした
-authConfigFactoryImpl.zeroLengthAppContext=文字列長が 0 のアプリケーションコンテキスト名は無効です。
-authConfigFactoryImpl.zeroLengthMessageLayer=長さゼロのメッセージレイヤ名は無効です
+authConfigFactoryImpl.zeroLengthAppContext=長さ 0 のアプリケーションコンテキスト名は無効です
+authConfigFactoryImpl.zeroLengthMessageLayer=長さ 0 のメッセージレイヤ名は無効です
 
 callbackHandlerImpl.containerMissing=無視されたタイプ [{0}] のJASPICコールバックのコンテナーがありません
 callbackHandlerImpl.jaspicCallbackMissing=受信したタイプ [{0}] 
のサポートされていないJASPICコールバックが無視されました
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties 
b/java/org/apache/catalina/core

(tomcat) 01/03: Improvements to French translations. (remm)

[markt]

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

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

commit 07c09f6ddef388fac9f9332b9a8fede325086b41
Author: Mark Thomas 
AuthorDate: Tue Feb 13 10:46:18 2024 +

Improvements to French translations. (remm)
---
 java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties   | 1 -
 .../apache/tomcat/util/net/openssl/panama/LocalStrings_fr.properties   | 2 ++
 java/org/apache/tomcat/util/threads/LocalStrings_fr.properties | 2 ++
 webapps/docs/changelog.xml | 3 +++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties 
b/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
index dbbec8bbdb..e8a4dc7bbf 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=Le délai d''attente a 
été dépassé po
 abstractReplicatedMap.mapMember.unavailable=Le membre [{0}] n''est pas encore 
disponible
 abstractReplicatedMap.mapMemberAdded.added=Le membre de la structure répliquée 
a été ajouté : [{0}]
 abstractReplicatedMap.mapMemberAdded.nullMember=Notifié que le membre n''est 
pas disponible dans le registre de membres : [{0}]
-abstractReplicatedMap.member.disappeared=Le membre [{0}] a disparu, les 
entrées correspondantes seront déplacées sur le nouveau nœud
 abstractReplicatedMap.ping.stateTransferredMember=L''état du membre [{0}] est 
transféré mais il n''est pas encore disponible
 abstractReplicatedMap.ping.timeout=Le membre [{0}] dans la carte répliquée 
[{1}] a fait un timeout lors du traitement d''un ping
 abstractReplicatedMap.relocate.complete=La relocation des entrées de la 
structure répliquée a été finie en [{0}] ms
diff --git 
a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings_fr.properties
index 17685fa584..3d40e40d20 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings_fr.properties
@@ -51,6 +51,8 @@ openssl.errMakeConf=Impossible de créer le contexte de 
OpenSSLConf
 openssl.errorAddingCertificate=Erreur lors de l''ajout du certificat à la 
chaîne: [{0}]
 openssl.errorConfiguringLocations=Erreur lors de la configuration des 
emplacements des certificats CA: [{0}]
 openssl.errorLoadingCertificate=Erreur lors du chargement du certificat: [{0}]
+openssl.errorLoadingCertificateRevocationListWithError=Erreur de chargement de 
la révocation des certificats [{0}] avec l''erreur [{1}]
+openssl.errorLoadingCertificateWithError=Erreur de chargement du certificat 
[{0}] avec l''erreur [{1}]
 openssl.errorLoadingPassword=Erreur lors du chargment du fichier mot de passe: 
[{0}]
 openssl.errorLoadingPrivateKey=Erreur lors du chargment de la clé privée: [{0}]
 openssl.errorPrivateKeyCheck=La clé privée ne correspond pas à la clé publique 
du certificat: [{0}]
diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
index 77e0529823..4cb10a86a7 100644
--- a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
@@ -19,3 +19,5 @@ threadPoolExecutor.invalidKeepAlive=Les threads principaux 
doivent avoir un temp
 threadPoolExecutor.queueFull=La file d'attente est pleine
 threadPoolExecutor.taskRejected=La tâche [{0}] a été rejetée par [{1}]
 threadPoolExecutor.threadStoppedToAvoidPotentialLeak=Arrêt du thread [{0}] 
pour éviter de potentielles fuites de mémoire après l''arrêt d''un contexte
+
+virtualThreadExecutor.taskRejected=La tâche [{0}] a été rejetée de [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 227c4cb3dc..83df531853 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -259,6 +259,9 @@
   
 Add strings for debug level messages. (remm)
   
+  
+Improvements to French translations. (remm)
+  
 
   
 


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

(tomcat) 03/03: Reove unused translation

[markt]

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

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

commit 10e3731f344cd0d018d4be2ee767c105d2832283
Author: Mark Thomas 
AuthorDate: Tue Feb 13 10:49:49 2024 +

Reove unused translation
---
 java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties| 1 -
 java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties | 1 -
 2 files changed, 2 deletions(-)

diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties 
b/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
index 8144318ca8..f4301207c7 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=PING 메시지가 제한 시간을 초과
 abstractReplicatedMap.mapMember.unavailable=멤버 [{0}]은(는) 아직 가용하지 않습니다.
 abstractReplicatedMap.mapMemberAdded.added=Map 멤버가 추가되었습니다:[{0}]
 abstractReplicatedMap.mapMemberAdded.nullMember=통지된 멤버는 멤버십에 등록되어 있지 않습니다: 
[{0}]
-abstractReplicatedMap.member.disappeared=멤버 [{0}]이(가) 사라졌습니다. 관련 Map 엔트리들은 새 
노드로 다시 위치시킬 것입니다.
 abstractReplicatedMap.ping.stateTransferredMember=멤버 [{0}]이(가), 상태가 이전된 상태이지만, 
아직 가용하지 않습니다.
 abstractReplicatedMap.ping.timeout=Map [{1}] 내의 멤버 [{0}]은(는) ping 처리 중에 제한 시간 
초과되었습니다.
 abstractReplicatedMap.relocate.complete=Map 엔트리들을 재위치시키는 작업이 [{0}] 밀리초에 
완료되었습니다.
diff --git 
a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
index 6d2631b652..575ff86e11 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=PING消息已超过超时时间。映射
 abstractReplicatedMap.mapMember.unavailable=Member[{0}]还不可用
 abstractReplicatedMap.mapMemberAdded.added=已添加映射成员：[{0}]
 abstractReplicatedMap.mapMemberAdded.nullMember=通知的成员未注册：[{0}]
-abstractReplicatedMap.member.disappeared=成员[{0}]已消失。相关的映射项将重新定位到新节点。
 abstractReplicatedMap.ping.stateTransferredMember=成员[{0}]已状态转移，但尚不可用。
 abstractReplicatedMap.ping.timeout=映射[{1}]中的成员[{0}]在ping处理中超时。
 abstractReplicatedMap.relocate.complete=已在[{0}]ms内完成映射项的重新定位。


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

(tomcat) branch main updated (5fb35e2f13 -> 10e3731f34)

[markt]

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

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


from 5fb35e2f13 Fix typo
 new 07c09f6dde Improvements to French translations. (remm)
 new c7ec4be26c Improvements to Japanese translations by tak7iji
 new 10e3731f34 Reove unused translation

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


Summary of changes:
 .../authenticator/LocalStrings_ja.properties   |  6 ++---
 .../jaspic/LocalStrings_ja.properties  |  4 ++--
 .../catalina/core/LocalStrings_ja.properties   |  4 ++--
 .../catalina/loader/LocalStrings_ja.properties |  2 +-
 .../catalina/servlets/LocalStrings_ja.properties   |  2 +-
 .../catalina/startup/LocalStrings_ja.properties|  6 ++---
 .../tribes/tipis/LocalStrings_fr.properties|  1 -
 .../tribes/tipis/LocalStrings_ja.properties|  1 -
 .../tribes/tipis/LocalStrings_ko.properties|  1 -
 .../tribes/tipis/LocalStrings_zh_CN.properties |  1 -
 .../catalina/util/LocalStrings_ja.properties   |  2 +-
 .../catalina/valves/LocalStrings_ja.properties |  4 ++--
 .../http11/upgrade/LocalStrings_ja.properties  |  2 +-
 .../apache/coyote/http2/LocalStrings_ja.properties | 27 +++---
 .../jasper/resources/LocalStrings_ja.properties|  7 +++---
 .../util/net/openssl/LocalStrings_ja.properties|  4 ++--
 .../net/openssl/panama/LocalStrings_fr.properties  |  2 ++
 .../net/openssl/panama/LocalStrings_ja.properties  |  8 ---
 .../tomcat/util/threads/LocalStrings_fr.properties |  2 ++
 .../tomcat/util/threads/LocalStrings_ja.properties |  2 ++
 .../websocket/pojo/LocalStrings_ja.properties  | 22 +-
 webapps/docs/changelog.xml |  6 +
 22 files changed, 64 insertions(+), 52 deletions(-)


-
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 (a206601da3 -> ad1a93f2dc)

[markt]

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

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


from a206601da3 Add entry for the debug strings
 new 7b8d5cd4dc Rename prior to extending with additional tests
 new 3631adb134 Refactor WebSocket close for suspend/resume
 new 810af66c15 Rename in preparation for adding server session expiration 
test
 new 54797e4d34 Add a server equivalent of the session expiration test
 new ad1a93f2dc Fix typo

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


Summary of changes:
 .../catalina/core/LocalStrings_fr.properties   |   2 +-
 .../catalina/core/LocalStrings_ja.properties   |   2 +-
 .../catalina/core/LocalStrings_ko.properties   |   2 +-
 .../catalina/core/LocalStrings_zh_CN.properties|   2 +-
 java/org/apache/tomcat/websocket/Constants.java|   6 +
 java/org/apache/tomcat/websocket/WsSession.java|  67 +++-
 .../tomcat/websocket/WsWebSocketContainer.java |   9 +-
 .../tomcat/websocket/server/WsServerContainer.java |   2 +-
 .../websocket/TestWsSessionSuspendResume.java  | 121 +++--
 ...cketContainerSessionExpiryContainerClient.java} |   6 +-
 ...cketContainerSessionExpiryContainerServer.java} |  35 --
 webapps/docs/changelog.xml |   5 +
 webapps/docs/web-socket-howto.xml  |   7 ++
 13 files changed, 237 insertions(+), 29 deletions(-)
 copy 
test/org/apache/tomcat/websocket/{TestWsWebSocketContainerSessionExpiryContainer.java
 => TestWsWebSocketContainerSessionExpiryContainerClient.java} (94%)
 rename 
test/org/apache/tomcat/websocket/{TestWsWebSocketContainerSessionExpiryContainer.java
 => TestWsWebSocketContainerSessionExpiryContainerServer.java} (73%)


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

(tomcat) 03/05: Rename in preparation for adding server session expiration test

[markt]

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

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

commit 810af66c15dd5635128346e442799c21c68f621c
Author: Mark Thomas 
AuthorDate: Thu Jan 18 15:59:31 2024 +

Rename in preparation for adding server session expiration test
---
 ...va => TestWsWebSocketContainerSessionExpiryContainerClient.java} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
 
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
similarity index 94%
rename from 
test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
rename to 
test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
index ee5b232ee2..aad99b46f7 100644
--- 
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
+++ 
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
@@ -35,7 +35,7 @@ import 
org.apache.tomcat.websocket.TestWsWebSocketContainer.EndpointA;
  * significantly extends the length of a test run when using multiple test
  * threads.
  */
-public class TestWsWebSocketContainerSessionExpiryContainer extends 
WsWebSocketContainerBaseTest {
+public class TestWsWebSocketContainerSessionExpiryContainerClient extends 
WsWebSocketContainerBaseTest {
 
 @Test
 public void testSessionExpiryContainer() throws Exception {
@@ -67,9 +67,9 @@ public class TestWsWebSocketContainerSessionExpiryContainer 
extends WsWebSocketC
 
 int count = 0;
 boolean isOpen = true;
-while (isOpen && count < 8) {
+while (isOpen && count < 100) {
 count++;
-Thread.sleep(1000);
+Thread.sleep(100);
 isOpen = false;
 for (Session session : setA) {
 if (session.isOpen()) {


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

(tomcat) 05/05: 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

commit ad1a93f2dc3c63bd5394e0074a7bad22cdfe7a1b
Author: Mark Thomas 
AuthorDate: Tue Feb 13 10:24:21 2024 +

Fix typo
---
 java/org/apache/catalina/core/LocalStrings_fr.properties| 2 +-
 java/org/apache/catalina/core/LocalStrings_ja.properties| 2 +-
 java/org/apache/catalina/core/LocalStrings_ko.properties| 2 +-
 java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index c3c63b60fa..97df1c63d8 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -268,7 +268,7 @@ standardHost.notContext=Le fils d'un hôte (child of a Host) 
doit être un conte
 standardHost.nullName=Le nom d'hôte est requis
 standardHost.problematicAppBase=Utiliser une chaîne vide pour l''appBase de 
l''hôte [{0}] la fera correspondre à CATALINA_BASE, ce qui causera des problèmes
 
-standardHostValue.customStatusFailed=La page d''erreur personnalisée [{0}] 
n''a pu être redirigée correctement
+standardHostValve.customStatusFailed=La page d''erreur personnalisée [{0}] 
n''a pu être redirigée correctement
 
 standardPipeline.basic.start=Erreur lors du démarrage de la nouvelle valve de 
base
 standardPipeline.basic.stop=Erreur lors de l'arrêt de l'ancienne valve de base
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties 
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 9057f78537..3b8845b830 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -268,7 +268,7 @@ standardHost.notContext=Host の子供はContextでなければいけません
 standardHost.nullName=ホスト名が必要です
 standardHost.problematicAppBase=ホスト [{0}] 
のappBaseに空の文字列を使用すると、CATALINA_BASEに設定されますが、これは悪い考えです
 
-standardHostValue.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
+standardHostValve.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
 
 standardPipeline.basic.start=新しい基本 Valve を開始できません。
 standardPipeline.basic.stop=古い基本 Valve を停止できません。
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties 
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index d0e3884015..caa8803a4b 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -258,7 +258,7 @@ standardHost.notContext=호스트의 자식은 반드시 컨텍스트이어야 
 standardHost.nullName=호스트 이름이 필수적입니다.
 standardHost.problematicAppBase=호스트 [{0}]에서 appBase를 위해 빈 문자열을 사용하는 것은, 결국 
appBase를 CATALINA_BASE로 설정하게 되는데, 이는 좋은 생각이 아닙니다.
 
-standardHostValue.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
+standardHostValve.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
 
 standardPipeline.basic.start=새로운 기본 Valve를 시작하는 중 오류 발생
 standardPipeline.basic.stop=이전 기본 Valve를 중지시키는 중 오류 발생
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 29702fd15c..e419e5ff7b 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -262,7 +262,7 @@ standardHost.notContext=主机的子节点必须有上下文
 standardHost.nullName=主机名是必需的
 
standardHost.problematicAppBase=在主机[{0}]上为appBase使用空字符串会将其设置为CATALINA_BASE，这是一个坏主意
 
-standardHostValue.customStatusFailed=无法正确调度自定义错误页[{0}]
+standardHostValve.customStatusFailed=无法正确调度自定义错误页[{0}]
 
 standardPipeline.basic.start=启动新基本阀时出错
 standardPipeline.basic.stop=停止旧基本阀时出错


-
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 1a410a8c78 Fix typo
1a410a8c78 is described below

commit 1a410a8c780480052be5b622edc98ef8e44cff31
Author: Mark Thomas 
AuthorDate: Tue Feb 13 10:24:21 2024 +

Fix typo
---
 java/org/apache/catalina/core/LocalStrings_fr.properties| 2 +-
 java/org/apache/catalina/core/LocalStrings_ja.properties| 2 +-
 java/org/apache/catalina/core/LocalStrings_ko.properties| 2 +-
 java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 19248e1b73..42d794692b 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -266,7 +266,7 @@ standardHost.notContext=Le fils d'un hôte (child of a Host) 
doit être un conte
 standardHost.nullName=Le nom d'hôte est requis
 standardHost.problematicAppBase=Utiliser une chaîne vide pour l''appBase de 
l''hôte [{0}] la fera correspondre à CATALINA_BASE, ce qui causera des problèmes
 
-standardHostValue.customStatusFailed=La page d''erreur personnalisée [{0}] 
n''a pu être redirigée correctement
+standardHostValve.customStatusFailed=La page d''erreur personnalisée [{0}] 
n''a pu être redirigée correctement
 
 standardPipeline.basic.start=Erreur lors du démarrage de la nouvelle valve de 
base
 standardPipeline.basic.stop=Erreur lors de l'arrêt de l'ancienne valve de base
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties 
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 77abb407b8..92588f7fb3 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -266,7 +266,7 @@ standardHost.notContext=Host の子供はContextでなければいけません
 standardHost.nullName=ホスト名が必要です
 standardHost.problematicAppBase=ホスト [{0}] 
のappBaseに空の文字列を使用すると、CATALINA_BASEに設定されますが、これは悪い考えです
 
-standardHostValue.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
+standardHostValve.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
 
 standardPipeline.basic.start=新しい基本 Valve を開始できません。
 standardPipeline.basic.stop=古い基本 Valve を停止できません。
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties 
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index ef6f975b83..a7f0494553 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -256,7 +256,7 @@ standardHost.notContext=호스트의 자식은 반드시 컨텍스트이어야 
 standardHost.nullName=호스트 이름이 필수적입니다.
 standardHost.problematicAppBase=호스트 [{0}]에서 appBase를 위해 빈 문자열을 사용하는 것은, 결국 
appBase를 CATALINA_BASE로 설정하게 되는데, 이는 좋은 생각이 아닙니다.
 
-standardHostValue.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
+standardHostValve.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
 
 standardPipeline.basic.start=새로운 기본 Valve를 시작하는 중 오류 발생
 standardPipeline.basic.stop=이전 기본 Valve를 중지시키는 중 오류 발생
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 857e4d8db9..ca67190cb1 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -261,7 +261,7 @@ standardHost.notContext=主机的子节点必须有上下文
 standardHost.nullName=主机名是必需的
 
standardHost.problematicAppBase=在主机[{0}]上为appBase使用空字符串会将其设置为CATALINA_BASE，这是一个坏主意
 
-standardHostValue.customStatusFailed=无法正确调度自定义错误页[{0}]
+standardHostValve.customStatusFailed=无法正确调度自定义错误页[{0}]
 
 standardPipeline.basic.start=启动新基本阀时出错
 standardPipeline.basic.stop=停止旧基本阀时出错


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

(tomcat) 02/05: Refactor WebSocket close for suspend/resume

[markt]

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

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

commit 3631adb1342d8bbd8598802a12b63ad02c37d591
Author: Mark Thomas 
AuthorDate: Thu Jan 18 11:32:43 2024 +

Refactor WebSocket close for suspend/resume

Ensure that WebSocket connection closure completes if the connection is
closed when the server side has used the proprietary suspend/resume
feature to suspend the connection.
---
 java/org/apache/tomcat/websocket/Constants.java|   6 ++
 java/org/apache/tomcat/websocket/WsSession.java|  67 +++--
 .../tomcat/websocket/WsWebSocketContainer.java |   9 +-
 .../tomcat/websocket/server/WsServerContainer.java |   2 +-
 .../websocket/TestWsSessionSuspendResume.java  | 107 +
 webapps/docs/changelog.xml |   5 +
 webapps/docs/web-socket-howto.xml  |   7 ++
 7 files changed, 195 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/Constants.java 
b/java/org/apache/tomcat/websocket/Constants.java
index 23bb378c3f..a912b0a5ab 100644
--- a/java/org/apache/tomcat/websocket/Constants.java
+++ b/java/org/apache/tomcat/websocket/Constants.java
@@ -19,6 +19,7 @@ package org.apache.tomcat.websocket;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import javax.websocket.Extension;
 
@@ -107,6 +108,11 @@ public class Constants {
 // Milliseconds so this is 20 seconds
 public static final long DEFAULT_BLOCKING_SEND_TIMEOUT = 20 * 1000;
 
+// Configuration for session close timeout
+public static final String SESSION_CLOSE_TIMEOUT_PROPERTY = 
"org.apache.tomcat.websocket.SESSION_CLOSE_TIMEOUT";
+// Default is 30 seconds - setting is in milliseconds
+public static final long DEFAULT_SESSION_CLOSE_TIMEOUT = 
TimeUnit.SECONDS.toMillis(30);
+
 // Configuration for read idle timeout on WebSocket session
 public static final String READ_IDLE_TIMEOUT_MS = 
"org.apache.tomcat.websocket.READ_IDLE_TIMEOUT_MS";
 
diff --git a/java/org/apache/tomcat/websocket/WsSession.java 
b/java/org/apache/tomcat/websocket/WsSession.java
index 907f93abc9..e71b719e27 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -114,6 +115,7 @@ public class WsSession implements Session {
 private volatile long lastActiveRead = System.currentTimeMillis();
 private volatile long lastActiveWrite = System.currentTimeMillis();
 private Map futures = new 
ConcurrentHashMap<>();
+private volatile Long sessionCloseTimeoutExpiry;
 
 
 /**
@@ -676,7 +678,14 @@ public class WsSession implements Session {
  */
 state.set(State.CLOSED);
 // ... and close the network connection.
-wsRemoteEndpoint.close();
+closeConnection();
+} else {
+/*
+ * Set close timeout. If the client fails to send a close message 
response within the timeout, the session
+ * and the connection will be closed when the timeout expires.
+ */
+sessionCloseTimeoutExpiry =
+Long.valueOf(System.nanoTime() + 
TimeUnit.MILLISECONDS.toNanos(getSessionCloseTimeout()));
 }
 
 // Fail any uncompleted messages.
@@ -715,7 +724,7 @@ public class WsSession implements Session {
 state.set(State.CLOSED);
 
 // Close the network connection.
-wsRemoteEndpoint.close();
+closeConnection();
 } else if (state.compareAndSet(State.OUTPUT_CLOSING, State.CLOSING)) {
 /*
  * The local endpoint sent a close message the the same time as 
the remote endpoint. The local close is
@@ -727,12 +736,55 @@ public class WsSession implements Session {
  * The local endpoint sent the first close message. The remote 
endpoint has now responded with its own close
  * message so mark the session as fully closed and close the 
network connection.
  */
-wsRemoteEndpoint.close();
+closeConnection();
 }
 // CLOSING and CLOSED are NO-OPs
 }
 
 
+private void closeConnection() {
+/*
+ * Close the network connection.
+ */
+wsRemoteEndpoint.close();
+/*
+ * Don't unregister the session until the connection is fully closed 
since webSocketContainer is responsible for
+ * tracking the session close timeout.
+ */
+webSocketC

(tomcat) 04/05: Add a server equivalent of the session expiration test

[markt]

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

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

commit 54797e4d3459c84271ff7130c70218dc48f01066
Author: Mark Thomas 
AuthorDate: Thu Jan 18 15:59:43 2024 +

Add a server equivalent of the session expiration test
---
 ...ocketContainerSessionExpiryContainerServer.java | 112 +
 1 file changed, 112 insertions(+)

diff --git 
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
 
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
new file mode 100644
index 00..11a1985bb5
--- /dev/null
+++ 
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.websocket;
+
+import java.util.Set;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.websocket.ContainerProvider;
+import javax.websocket.Session;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.servlets.DefaultServlet;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.tomcat.websocket.TestWsWebSocketContainer.EndpointA;
+import org.apache.tomcat.websocket.server.Constants;
+import org.apache.tomcat.websocket.server.WsServerContainer;
+
+/*
+ * Moved to separate test class to improve test concurrency. These tests are
+ * some of the last tests to start and having them all in a single class
+ * significantly extends the length of a test run when using multiple test
+ * threads.
+ */
+public class TestWsWebSocketContainerSessionExpiryContainerServer extends 
WsWebSocketContainerBaseTest {
+
+@Test
+public void testSessionExpiryContainer() throws Exception {
+
+Tomcat tomcat = getTomcatInstance();
+// No file system docBase required
+Context ctx = getProgrammaticRootContext();
+ctx.addApplicationListener(TesterEchoServer.Config.class.getName());
+Tomcat.addServlet(ctx, "default", new DefaultServlet());
+ctx.addServletMappingDecoded("/", "default");
+
+
ctx.addApplicationListener(WebSocketServerTimeoutConfig.class.getName());
+
+tomcat.start();
+
+// Need access to implementation methods for configuring unit tests
+WsWebSocketContainer wsContainer = (WsWebSocketContainer) 
ContainerProvider.getWebSocketContainer();
+
+EndpointA endpointA = new EndpointA();
+connectToEchoServer(wsContainer, endpointA, 
TesterEchoServer.Config.PATH_BASIC);
+connectToEchoServer(wsContainer, endpointA, 
TesterEchoServer.Config.PATH_BASIC);
+Session s3a = connectToEchoServer(wsContainer, endpointA, 
TesterEchoServer.Config.PATH_BASIC);
+
+// Check all three sessions are open
+Set setA = s3a.getOpenSessions();
+Assert.assertEquals(3, setA.size());
+
+int count = 0;
+boolean isOpen = true;
+while (isOpen && count < 100) {
+count++;
+Thread.sleep(100);
+isOpen = false;
+for (Session session : setA) {
+if (session.isOpen()) {
+isOpen = true;
+break;
+}
+}
+}
+
+if (isOpen) {
+for (Session session : setA) {
+if (session.isOpen()) {
+System.err.println("Session with ID [" + session.getId() + 
"] is open");
+}
+}
+Assert.fail("There were open sessions");
+}
+}
+
+
+public static class WebSocketServerTimeoutConfig implements 
ServletContextListener {
+
+@Override
+public void contextInitialized(ServletContextEvent sce) {
+WsServerContainer container = (WsServerContainer) 
sce.getServletContext().getAttribute(
+Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
+// Proce

(tomcat) 01/05: Rename prior to extending with additional tests

[markt]

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

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

commit 7b8d5cd4dc665d51bb5462ad99a57669d9cdaff7
Author: Mark Thomas 
AuthorDate: Wed Jan 17 15:20:59 2024 +

Rename prior to extending with additional tests
---
 .../tomcat/websocket/TestWsSessionSuspendResume.java   | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java 
b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
index 0ad56bd7a6..313411bd23 100644
--- a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
+++ b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
@@ -45,11 +45,11 @@ import 
org.apache.tomcat.websocket.server.TesterEndpointConfig;
 public class TestWsSessionSuspendResume extends WebSocketBaseTest {
 
 @Test
-public void test() throws Exception {
+public void testSuspendResume() throws Exception {
 Tomcat tomcat = getTomcatInstance();
 
 Context ctx = getProgrammaticRootContext();
-ctx.addApplicationListener(Config.class.getName());
+ctx.addApplicationListener(SuspendResumeConfig.class.getName());
 
 Tomcat.addServlet(ctx, "default", new DefaultServlet());
 ctx.addServletMappingDecoded("/", "default");
@@ -60,7 +60,7 @@ public class TestWsSessionSuspendResume extends 
WebSocketBaseTest {
 
 ClientEndpointConfig clientEndpointConfig = 
ClientEndpointConfig.Builder.create().build();
 Session wsSession = 
wsContainer.connectToServer(TesterProgrammaticEndpoint.class, 
clientEndpointConfig,
-new URI("ws://localhost:" + getPort() + Config.PATH));
+new URI("ws://localhost:" + getPort() + 
SuspendResumeConfig.PATH));
 
 final CountDownLatch latch = new CountDownLatch(2);
 wsSession.addMessageHandler(new MessageHandler.Whole() {
@@ -82,7 +82,7 @@ public class TestWsSessionSuspendResume extends 
WebSocketBaseTest {
 }
 
 
-public static final class Config extends TesterEndpointConfig {
+public static final class SuspendResumeConfig extends TesterEndpointConfig 
{
 private static final String PATH = "/echo";
 
 @Override
@@ -101,7 +101,7 @@ public class TestWsSessionSuspendResume extends 
WebSocketBaseTest {
 
 @Override
 public void onOpen(Session session, EndpointConfig epc) {
-final MessageProcessor processor = new MessageProcessor(session, 
3);
+final SuspendResumeMessageProcessor processor = new 
SuspendResumeMessageProcessor(session, 3);
 session.addMessageHandler(new MessageHandler.Whole() {
 
 @Override
@@ -127,12 +127,12 @@ public class TestWsSessionSuspendResume extends 
WebSocketBaseTest {
 }
 
 
-private static final class MessageProcessor {
+private static final class SuspendResumeMessageProcessor {
 private final Session session;
 private final int count;
 private final List messages = new ArrayList<>();
 
-MessageProcessor(Session session, int count) {
+SuspendResumeMessageProcessor(Session session, int count) {
 this.session = session;
 this.count = count;
 }


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

(tomcat) branch 10.1.x updated: Fix typo

[markt]

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

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


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

commit cd4b32ff34c2f0e3cb2cb74acd43c1d5d9399601
Author: Mark Thomas 
AuthorDate: Tue Feb 13 10:24:21 2024 +

Fix typo
---
 java/org/apache/catalina/core/LocalStrings_fr.properties| 2 +-
 java/org/apache/catalina/core/LocalStrings_ja.properties| 2 +-
 java/org/apache/catalina/core/LocalStrings_ko.properties| 2 +-
 java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index a3d557cba7..79b33d46b7 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -259,7 +259,7 @@ standardHost.nullName=Le nom d'hôte est requis
 standardHost.problematicAppBase=Utiliser une chaîne vide pour l''appBase de 
l''hôte [{0}] la fera correspondre à CATALINA_BASE, ce qui causera des problèmes
 standardHost.problematicLegacyAppBase=L''utilisation d''une chaîne vide pour 
legacyAppBase de l''hôte [{0}] le fixera à CATALINA_BASE, ce qui n''est pas 
judicieux
 
-standardHostValue.customStatusFailed=La page d''erreur personnalisée [{0}] 
n''a pu être redirigée correctement
+standardHostValve.customStatusFailed=La page d''erreur personnalisée [{0}] 
n''a pu être redirigée correctement
 
 standardPipeline.basic.start=Erreur lors du démarrage de la nouvelle valve de 
base
 standardPipeline.basic.stop=Erreur lors de l'arrêt de l'ancienne valve de base
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties 
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 675f70f1f9..f02937daf7 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -259,7 +259,7 @@ standardHost.nullName=ホスト名が必要です
 standardHost.problematicAppBase=ホスト [{0}] 
のappBaseに空の文字列を使用すると、CATALINA_BASEに設定されますが、これは悪い考えです
 standardHost.problematicLegacyAppBase=ホスト [{0}] 
のlegacyAppBaseに空の文字列を使用すると、CATALINA_BASEに設定されます。これは悪い考えです
 
-standardHostValue.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
+standardHostValve.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
 
 standardPipeline.basic.start=新しい基本 Valve を開始できません。
 standardPipeline.basic.stop=古い基本 Valve を停止できません。
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties 
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 1ff351337a..3a8d4d82d8 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -249,7 +249,7 @@ standardHost.nullName=호스트 이름이 필수적입니다.
 standardHost.problematicAppBase=호스트 [{0}]에서 appBase를 위해 빈 문자열을 사용하는 것은, 결국 
appBase를 CATALINA_BASE로 설정하게 되는데, 이는 좋은 생각이 아닙니다.
 standardHost.problematicLegacyAppBase=호스트 [{0}]에 legacyAppBase로 빈 문자열이 설정되어 
있는데, 이는 CATALINA_BASE로 재설정 할 것입니다만, 이는 좋지 않은 설정 방법입니다.
 
-standardHostValue.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
+standardHostValve.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
 
 standardPipeline.basic.start=새로운 기본 Valve를 시작하는 중 오류 발생
 standardPipeline.basic.stop=이전 기본 Valve를 중지시키는 중 오류 발생
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index eb47d6ab2f..a92755704c 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -254,7 +254,7 @@ standardHost.nullName=主机名是必需的
 
standardHost.problematicAppBase=在主机[{0}]上为appBase使用空字符串会将其设置为CATALINA_BASE，这是一个坏主意
 
standardHost.problematicLegacyAppBase=在主机[{0}]上为legacyAppBase使用空字符串会将其设置为CATALINA_BASE，这是个坏主意
 
-standardHostValue.customStatusFailed=无法正确调度自定义错误页[{0}]
+standardHostValve.customStatusFailed=无法正确调度自定义错误页[{0}]
 
 standardPipeline.basic.start=启动新基本阀时出错
 standardPipeline.basic.stop=停止旧基本阀时出错


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

(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 5fb35e2f13 Fix typo
5fb35e2f13 is described below

commit 5fb35e2f135693a402d76f78651458e61491416c
Author: Mark Thomas 
AuthorDate: Tue Feb 13 10:24:21 2024 +

Fix typo
---
 java/org/apache/catalina/core/LocalStrings_fr.properties| 2 +-
 java/org/apache/catalina/core/LocalStrings_ja.properties| 2 +-
 java/org/apache/catalina/core/LocalStrings_ko.properties| 2 +-
 java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index cfb5a81d3b..9ebcf43adb 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -259,7 +259,7 @@ standardHost.nullName=Le nom d'hôte est requis
 standardHost.problematicAppBase=Utiliser une chaîne vide pour l''appBase de 
l''hôte [{0}] la fera correspondre à CATALINA_BASE, ce qui causera des problèmes
 standardHost.problematicLegacyAppBase=L''utilisation d''une chaîne vide pour 
legacyAppBase de l''hôte [{0}] le fixera à CATALINA_BASE, ce qui n''est pas 
judicieux
 
-standardHostValue.customStatusFailed=La page d''erreur personnalisée [{0}] 
n''a pu être redirigée correctement
+standardHostValve.customStatusFailed=La page d''erreur personnalisée [{0}] 
n''a pu être redirigée correctement
 
 standardPipeline.basic.start=Erreur lors du démarrage de la nouvelle valve de 
base
 standardPipeline.basic.stop=Erreur lors de l'arrêt de l'ancienne valve de base
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties 
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 46197b2f35..abf26cabb6 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -259,7 +259,7 @@ standardHost.nullName=ホスト名が必要です
 standardHost.problematicAppBase=ホスト [{0}] 
のappBaseに空の文字列を使用すると、CATALINA_BASEに設定されますが、これは悪い考えです
 standardHost.problematicLegacyAppBase=ホスト [{0}] 
のlegacyAppBaseに空の文字列を使用すると、CATALINA_BASEに設定されます。これは悪い考えです
 
-standardHostValue.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
+standardHostValve.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
 
 standardPipeline.basic.start=新しい基本 Valve を開始できません。
 standardPipeline.basic.stop=古い基本 Valve を停止できません。
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties 
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index a2a79cccec..b4c94b9697 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -244,7 +244,7 @@ standardHost.nullName=호스트 이름이 필수적입니다.
 standardHost.problematicAppBase=호스트 [{0}]에서 appBase를 위해 빈 문자열을 사용하는 것은, 결국 
appBase를 CATALINA_BASE로 설정하게 되는데, 이는 좋은 생각이 아닙니다.
 standardHost.problematicLegacyAppBase=호스트 [{0}]에 legacyAppBase로 빈 문자열이 설정되어 
있는데, 이는 CATALINA_BASE로 재설정 할 것입니다만, 이는 좋지 않은 설정 방법입니다.
 
-standardHostValue.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
+standardHostValve.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
 
 standardPipeline.basic.start=새로운 기본 Valve를 시작하는 중 오류 발생
 standardPipeline.basic.stop=이전 기본 Valve를 중지시키는 중 오류 발생
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 5cd9cab237..673d88d976 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -249,7 +249,7 @@ standardHost.nullName=主机名是必需的
 
standardHost.problematicAppBase=在主机[{0}]上为appBase使用空字符串会将其设置为CATALINA_BASE，这是一个坏主意
 
standardHost.problematicLegacyAppBase=在主机[{0}]上为legacyAppBase使用空字符串会将其设置为CATALINA_BASE，这是个坏主意
 
-standardHostValue.customStatusFailed=无法正确调度自定义错误页[{0}]
+standardHostValve.customStatusFailed=无法正确调度自定义错误页[{0}]
 
 standardPipeline.basic.start=启动新基本阀时出错
 standardPipeline.basic.stop=停止旧基本阀时出错


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

(tomcat) 02/04: Refactor WebSocket close for suspend/resume

[markt]

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

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

commit 52d6650e062d880704898d7d8c1b2b7a3efe8068
Author: Mark Thomas 
AuthorDate: Thu Jan 18 11:32:43 2024 +

Refactor WebSocket close for suspend/resume

Ensure that WebSocket connection closure completes if the connection is
closed when the server side has used the proprietary suspend/resume
feature to suspend the connection.
---
 java/org/apache/tomcat/websocket/Constants.java|  6 ++
 java/org/apache/tomcat/websocket/WsSession.java| 67 +--
 .../tomcat/websocket/WsWebSocketContainer.java |  9 +-
 .../tomcat/websocket/server/WsServerContainer.java |  2 +-
 .../websocket/TestWsSessionSuspendResume.java  | 99 ++
 webapps/docs/changelog.xml |  5 ++
 webapps/docs/web-socket-howto.xml  |  7 ++
 7 files changed, 187 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/Constants.java 
b/java/org/apache/tomcat/websocket/Constants.java
index d0a96e706d..d03e21abc8 100644
--- a/java/org/apache/tomcat/websocket/Constants.java
+++ b/java/org/apache/tomcat/websocket/Constants.java
@@ -19,6 +19,7 @@ package org.apache.tomcat.websocket;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import javax.websocket.Extension;
 
@@ -107,6 +108,11 @@ public class Constants {
 // Milliseconds so this is 20 seconds
 public static final long DEFAULT_BLOCKING_SEND_TIMEOUT = 20 * 1000;
 
+// Configuration for session close timeout
+public static final String SESSION_CLOSE_TIMEOUT_PROPERTY = 
"org.apache.tomcat.websocket.SESSION_CLOSE_TIMEOUT";
+// Default is 30 seconds - setting is in milliseconds
+public static final long DEFAULT_SESSION_CLOSE_TIMEOUT = 
TimeUnit.SECONDS.toMillis(30);
+
 // Configuration for read idle timeout on WebSocket session
 public static final String READ_IDLE_TIMEOUT_MS = 
"org.apache.tomcat.websocket.READ_IDLE_TIMEOUT_MS";
 
diff --git a/java/org/apache/tomcat/websocket/WsSession.java 
b/java/org/apache/tomcat/websocket/WsSession.java
index 907f93abc9..e71b719e27 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -114,6 +115,7 @@ public class WsSession implements Session {
 private volatile long lastActiveRead = System.currentTimeMillis();
 private volatile long lastActiveWrite = System.currentTimeMillis();
 private Map futures = new 
ConcurrentHashMap<>();
+private volatile Long sessionCloseTimeoutExpiry;
 
 
 /**
@@ -676,7 +678,14 @@ public class WsSession implements Session {
  */
 state.set(State.CLOSED);
 // ... and close the network connection.
-wsRemoteEndpoint.close();
+closeConnection();
+} else {
+/*
+ * Set close timeout. If the client fails to send a close message 
response within the timeout, the session
+ * and the connection will be closed when the timeout expires.
+ */
+sessionCloseTimeoutExpiry =
+Long.valueOf(System.nanoTime() + 
TimeUnit.MILLISECONDS.toNanos(getSessionCloseTimeout()));
 }
 
 // Fail any uncompleted messages.
@@ -715,7 +724,7 @@ public class WsSession implements Session {
 state.set(State.CLOSED);
 
 // Close the network connection.
-wsRemoteEndpoint.close();
+closeConnection();
 } else if (state.compareAndSet(State.OUTPUT_CLOSING, State.CLOSING)) {
 /*
  * The local endpoint sent a close message the the same time as 
the remote endpoint. The local close is
@@ -727,12 +736,55 @@ public class WsSession implements Session {
  * The local endpoint sent the first close message. The remote 
endpoint has now responded with its own close
  * message so mark the session as fully closed and close the 
network connection.
  */
-wsRemoteEndpoint.close();
+closeConnection();
 }
 // CLOSING and CLOSED are NO-OPs
 }
 
 
+private void closeConnection() {
+/*
+ * Close the network connection.
+ */
+wsRemoteEndpoint.close();
+/*
+ * Don't unregister the session until the connection is fully closed 
since webSocketContainer is responsible for
+ * tracking the session close timeout.
+ */
+webSocketC

(tomcat) 04/04: Add a server equivalent of the session expiration test

[markt]

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

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

commit cffbd7fc16bf394b4ac7b652a62dbbb60ef9a0f7
Author: Mark Thomas 
AuthorDate: Thu Jan 18 15:59:43 2024 +

Add a server equivalent of the session expiration test
---
 ...ocketContainerSessionExpiryContainerServer.java | 107 +
 1 file changed, 107 insertions(+)

diff --git 
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
 
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
new file mode 100644
index 00..c9651ed46b
--- /dev/null
+++ 
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.websocket;
+
+import java.util.Set;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.websocket.ContainerProvider;
+import javax.websocket.Session;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.servlets.DefaultServlet;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.tomcat.websocket.TestWsWebSocketContainer.EndpointA;
+import org.apache.tomcat.websocket.server.Constants;
+import org.apache.tomcat.websocket.server.WsServerContainer;
+
+/*
+ * Moved to separate test class to improve test concurrency. These tests are
+ * some of the last tests to start and having them all in a single class
+ * significantly extends the length of a test run when using multiple test
+ * threads.
+ */
+public class TestWsWebSocketContainerSessionExpiryContainerServer extends 
WsWebSocketContainerBaseTest {
+
+@Test
+public void testSessionExpiryContainer() throws Exception {
+
+Tomcat tomcat = getTomcatInstance();
+// No file system docBase required
+Context ctx = getProgrammaticRootContext();
+ctx.addApplicationListener(TesterEchoServer.Config.class.getName());
+Tomcat.addServlet(ctx, "default", new DefaultServlet());
+ctx.addServletMappingDecoded("/", "default");
+
+
ctx.addApplicationListener(WebSocketServerTimeoutConfig.class.getName());
+
+tomcat.start();
+
+// Need access to implementation methods for configuring unit tests
+WsWebSocketContainer wsContainer = (WsWebSocketContainer) 
ContainerProvider.getWebSocketContainer();
+
+EndpointA endpointA = new EndpointA();
+connectToEchoServer(wsContainer, endpointA, 
TesterEchoServer.Config.PATH_BASIC);
+connectToEchoServer(wsContainer, endpointA, 
TesterEchoServer.Config.PATH_BASIC);
+Session s3a = connectToEchoServer(wsContainer, endpointA, 
TesterEchoServer.Config.PATH_BASIC);
+
+// Check all three sessions are open
+Set setA = s3a.getOpenSessions();
+Assert.assertEquals(3, setA.size());
+
+int count = 0;
+boolean isOpen = true;
+while (isOpen && count < 100) {
+count++;
+Thread.sleep(100);
+isOpen = false;
+for (Session session : setA) {
+if (session.isOpen()) {
+isOpen = true;
+break;
+}
+}
+}
+
+if (isOpen) {
+for (Session session : setA) {
+if (session.isOpen()) {
+System.err.println("Session with ID [" + session.getId() + 
"] is open");
+}
+}
+Assert.fail("There were open sessions");
+}
+}
+
+
+public static class WebSocketServerTimeoutConfig implements 
ServletContextListener {
+
+@Override
+public void contextInitialized(ServletContextEvent sce) {
+WsServerContainer container = (WsServerContainer) 
sce.getServletContext().getAttribute(
+Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
+// Proce

(tomcat) 03/04: Rename in preparation for adding server session expiration test

[markt]

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

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

commit b42d224ca2c8758b7257406de0e2efe1068aa71a
Author: Mark Thomas 
AuthorDate: Thu Jan 18 15:59:31 2024 +

Rename in preparation for adding server session expiration test
---
 ...va => TestWsWebSocketContainerSessionExpiryContainerClient.java} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
 
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
similarity index 94%
rename from 
test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
rename to 
test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
index ee5b232ee2..aad99b46f7 100644
--- 
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
+++ 
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
@@ -35,7 +35,7 @@ import 
org.apache.tomcat.websocket.TestWsWebSocketContainer.EndpointA;
  * significantly extends the length of a test run when using multiple test
  * threads.
  */
-public class TestWsWebSocketContainerSessionExpiryContainer extends 
WsWebSocketContainerBaseTest {
+public class TestWsWebSocketContainerSessionExpiryContainerClient extends 
WsWebSocketContainerBaseTest {
 
 @Test
 public void testSessionExpiryContainer() throws Exception {
@@ -67,9 +67,9 @@ public class TestWsWebSocketContainerSessionExpiryContainer 
extends WsWebSocketC
 
 int count = 0;
 boolean isOpen = true;
-while (isOpen && count < 8) {
+while (isOpen && count < 100) {
 count++;
-Thread.sleep(1000);
+Thread.sleep(100);
 isOpen = false;
 for (Session session : setA) {
 if (session.isOpen()) {


-
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 (5b6fe1505c -> cffbd7fc16)

[markt]

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

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


from 5b6fe1505c Update Tomcat Native to 1.3.x
 new 23b88103e5 Rename prior to extending with additional tests
 new 52d6650e06 Refactor WebSocket close for suspend/resume
 new b42d224ca2 Rename in preparation for adding server session expiration 
test
 new cffbd7fc16 Add a server equivalent of the session expiration test

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


Summary of changes:
 java/org/apache/tomcat/websocket/Constants.java|   6 ++
 java/org/apache/tomcat/websocket/WsSession.java|  67 ++--
 .../tomcat/websocket/WsWebSocketContainer.java |   9 +-
 .../tomcat/websocket/server/WsServerContainer.java |   2 +-
 .../websocket/TestWsSessionSuspendResume.java  | 113 +++--
 ...cketContainerSessionExpiryContainerClient.java} |   6 +-
 ...cketContainerSessionExpiryContainerServer.java} |  30 --
 webapps/docs/changelog.xml |   5 +
 webapps/docs/web-socket-howto.xml  |   7 ++
 9 files changed, 220 insertions(+), 25 deletions(-)
 copy 
test/org/apache/tomcat/websocket/{TestWsWebSocketContainerSessionExpiryContainer.java
 => TestWsWebSocketContainerSessionExpiryContainerClient.java} (94%)
 rename 
test/org/apache/tomcat/websocket/{TestWsWebSocketContainerSessionExpiryContainer.java
 => TestWsWebSocketContainerSessionExpiryContainerServer.java} (75%)


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

(tomcat) 01/04: Rename prior to extending with additional tests

[markt]

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

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

commit 23b88103e5116064f52259e45b13c0f9c758e2fb
Author: Mark Thomas 
AuthorDate: Wed Jan 17 15:20:59 2024 +

Rename prior to extending with additional tests
---
 .../tomcat/websocket/TestWsSessionSuspendResume.java   | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java 
b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
index 26eff6645e..170222ad38 100644
--- a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
+++ b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
@@ -44,11 +44,11 @@ import 
org.apache.tomcat.websocket.server.TesterEndpointConfig;
 public class TestWsSessionSuspendResume extends WebSocketBaseTest {
 
 @Test
-public void test() throws Exception {
+public void testSuspendResume() throws Exception {
 Tomcat tomcat = getTomcatInstance();
 
 Context ctx = getProgrammaticRootContext();
-ctx.addApplicationListener(Config.class.getName());
+ctx.addApplicationListener(SuspendResumeConfig.class.getName());
 
 Tomcat.addServlet(ctx, "default", new DefaultServlet());
 ctx.addServletMappingDecoded("/", "default");
@@ -59,7 +59,7 @@ public class TestWsSessionSuspendResume extends 
WebSocketBaseTest {
 
 ClientEndpointConfig clientEndpointConfig = 
ClientEndpointConfig.Builder.create().build();
 Session wsSession = 
wsContainer.connectToServer(TesterProgrammaticEndpoint.class, 
clientEndpointConfig,
-new URI("ws://localhost:" + getPort() + Config.PATH));
+new URI("ws://localhost:" + getPort() + 
SuspendResumeConfig.PATH));
 
 CountDownLatch latch = new CountDownLatch(2);
 wsSession.addMessageHandler(String.class, message -> {
@@ -77,7 +77,7 @@ public class TestWsSessionSuspendResume extends 
WebSocketBaseTest {
 }
 
 
-public static final class Config extends TesterEndpointConfig {
+public static final class SuspendResumeConfig extends TesterEndpointConfig 
{
 private static final String PATH = "/echo";
 
 @Override
@@ -96,7 +96,7 @@ public class TestWsSessionSuspendResume extends 
WebSocketBaseTest {
 
 @Override
 public void onOpen(Session session, EndpointConfig epc) {
-MessageProcessor processor = new MessageProcessor(session, 3);
+SuspendResumeMessageProcessor processor = new 
SuspendResumeMessageProcessor(session, 3);
 session.addMessageHandler(String.class, message -> 
processor.addMessage(message));
 }
 
@@ -116,12 +116,12 @@ public class TestWsSessionSuspendResume extends 
WebSocketBaseTest {
 }
 
 
-private static final class MessageProcessor {
+private static final class SuspendResumeMessageProcessor {
 private final Session session;
 private final int count;
 private final List messages = new ArrayList<>();
 
-MessageProcessor(Session session, int count) {
+SuspendResumeMessageProcessor(Session session, int count) {
 this.session = session;
 this.count = count;
 }


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