Re: [VOTE] Release Apache Tomcat 9.0.56
On Fri, Dec 3, 2021 at 10:50 AM Rémy Maucherat wrote: > The proposed Apache Tomcat 9.0.56 release is now available for voting. > > The notable changes compared to 9.0.56 are: > > - Provide protection against a known OS bug that causes the acceptor to >report an incoming connection more than once. > > - Implement a workaround for a JVM bug that can trigger a file >descriptor leak when using multi-part upload and the application does >not explicitly close an input stream for an uploaded file that was >cached on disk. > > - Fix exceptions when the security manager is enabled and the first >request received after starting is an HTTP request to a TLS enabled >NIO2 connector. > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.56/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1344 > The tag is: > https://github.com/apache/tomcat/tree/9.0.56 > af2a7a4fb2db07390362af12d0020d550abd8785 > > The proposed 9.0.56 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 9.0.56 (stable) > Regards, Martin > > Rémy > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [VOTE] Release Apache Tomcat 10.0.14
On Fri, Dec 3, 2021 at 12:22 AM Mark Thomas wrote: > The proposed Apache Tomcat 10.0.14 release is now available for > voting. > > Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary > package for all the specification APIs has changed from javax.* to > jakarta.* > > Applications that run on Tomcat 9 will not run on Tomcat 10 without > changes. Java EE applications designed for Tomcat 9 and earlier may be > placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will > automatically convert them to Jakarta EE and copy them to the webapps > directory > > The notable changes compared to 10.0.13 are: > > - Provide protection against a known OS bug that causes the acceptor to >report an incoming connection more than once. > > - Implement a workaround for a JVM bug that can trigger a file >descriptor leak when using multi-part upload and the application does >not explicitly close an input stream for an uploaded file that was >cached on disk. > > - Fix exceptions when the security manager is enabled and the first >request received after starting is an HTTP request to a TLS enabled >NIO2 connector. > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://nightlies.apache.org/tomcat/tomcat-10.0.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.14/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1345 > > The tag is: > https://github.com/apache/tomcat/tree/10.0.14 > 3bb5b5fcf02e25ae627e480937e755e0a99c82d7 > > The proposed 10.0.14 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 10.0.14 (stable) > Regards, Martin > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [VOTE] Release Apache Tomcat 10.1.0-M8
On Thu, Dec 2, 2021 at 4:44 PM Mark Thomas wrote: > The proposed Apache Tomcat 10.1.0-M8 release is now available for > voting. > > Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 > without changes. Java EE applications designed for Tomcat 9 and earlier > may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat > will automatically convert them to Jakarta EE and copy them to the > webapps directory. > > The notable changes compared to 10.1.0-M7 are: > > - Limit cookie support to RFC 6265 to align with recent updates to the >Servlet specification > > - Update the WebSocket API packaging to remove the copy of the client >API from the server API and replace it with a dependency on the client >API. This aligns Tomcat with changes in the WebSocket 2.1 >specification. > > - Provide protection against a known OS bug that causes the acceptor to >report an incoming connection more than once. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat-10.1.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M8/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1343 > > The tag is: > https://github.com/apache/tomcat/tree/10.1.0-M8 > cd53876fefaa370c31466b0f615e9ad026541a27 > > > The proposed 10.1.0-M8 release is: > [ ] Broken - do not release > [X] Alpha - go ahead and release as 10.1.0-M8 (alpha) > Regards, Martin > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[Bug 65726] NullPointerException while reading request input with H2C upgraded exchanges
https://bz.apache.org/bugzilla/show_bug.cgi?id=65726 --- Comment #1 from Mark Thomas --- Thanks for the report. There are a couple of TODOs for support for request bodies during HTTP/1.1 upgrade in the code. The NPE is caused by the current lack of support. I have a patch for this. Just need to do a little more testing. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #461: Add null check for BaseNCodec decodning
markt-asf commented on pull request #461: URL: https://github.com/apache/tomcat/pull/461#issuecomment-987195865 Why? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 10.1.0-M8
On Thu, Dec 2, 2021 at 9:45 AM Mark Thomas wrote: > The proposed Apache Tomcat 10.1.0-M8 release is now available for > voting. > > Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 > without changes. Java EE applications designed for Tomcat 9 and earlier > may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat > will automatically convert them to Jakarta EE and copy them to the > webapps directory. > > The notable changes compared to 10.1.0-M7 are: > > - Limit cookie support to RFC 6265 to align with recent updates to the >Servlet specification > > - Update the WebSocket API packaging to remove the copy of the client >API from the server API and replace it with a dependency on the client >API. This aligns Tomcat with changes in the WebSocket 2.1 >specification. > > - Provide protection against a known OS bug that causes the acceptor to >report an incoming connection more than once. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat-10.1.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M8/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1343 > > The tag is: > https://github.com/apache/tomcat/tree/10.1.0-M8 > cd53876fefaa370c31466b0f615e9ad026541a27 > > > The proposed 10.1.0-M8 release is: > [ ] Broken - do not release > [x] Alpha - go ahead and release as 10.1.0-M8 (alpha) > +1 on F34 with openjdk 11. > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [VOTE] Release Apache Tomcat 9.0.56
On Fri, Dec 3, 2021 at 3:50 AM Rémy Maucherat wrote: > The proposed Apache Tomcat 9.0.56 release is now available for voting. > > The notable changes compared to 9.0.56 are: > > - Provide protection against a known OS bug that causes the acceptor to >report an incoming connection more than once. > > - Implement a workaround for a JVM bug that can trigger a file >descriptor leak when using multi-part upload and the application does >not explicitly close an input stream for an uploaded file that was >cached on disk. > > - Fix exceptions when the security manager is enabled and the first >request received after starting is an HTTP request to a TLS enabled >NIO2 connector. > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.56/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1344 > The tag is: > https://github.com/apache/tomcat/tree/9.0.56 > af2a7a4fb2db07390362af12d0020d550abd8785 > > The proposed 9.0.56 release is: > [ ] Broken - do not release > [x] Stable - go ahead and release as 9.0.56 (stable) > +1 No issues on Fedora 34 with openjdk 11. > Rémy > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [VOTE] Release Apache Tomcat 9.0.56
On Mon, Dec 6, 2021 at 10:57 AM Rémy Maucherat wrote: > On Mon, Dec 6, 2021 at 4:42 PM jean-frederic clere > wrote: > > > > On 06/12/2021 15:19, jean-frederic clere wrote: > > > On 03/12/2021 09:49, Rémy Maucherat wrote: > > >> [X] Stable - go ahead and release as 9.0.56 (stable) > > > > > > Tested on fedora33 with openjdk 11.0.13. > > > > > > > Same results for adoptium jdk8u302-b08 looks good to me. > > It's a good plan to double check Java 8, thanks. I'm super careful > about verifying I built with Java 8 though, so surprises there are > unlikely. > > Both of Fedora's Ant and Maven packages are back to working again with > the value JAVA_HOME, so things are easy again. > Yay! That was an annoying bug :) > Rémy > > > -- > > Cheers > > > > Jean-Frederic > > > > > > - > > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > > For additional commands, e-mail: dev-h...@tomcat.apache.org > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[GitHub] [tomcat] Mikhail2048 opened a new pull request #461: Add null check for BaseNCodec decodning
Mikhail2048 opened a new pull request #461: URL: https://github.com/apache/tomcat/pull/461 Add null check for BaseNCodec decodning -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.56
On Mon, Dec 6, 2021 at 4:42 PM jean-frederic clere wrote: > > On 06/12/2021 15:19, jean-frederic clere wrote: > > On 03/12/2021 09:49, Rémy Maucherat wrote: > >> [X] Stable - go ahead and release as 9.0.56 (stable) > > > > Tested on fedora33 with openjdk 11.0.13. > > > > Same results for adoptium jdk8u302-b08 looks good to me. It's a good plan to double check Java 8, thanks. I'm super careful about verifying I built with Java 8 though, so surprises there are unlikely. Both of Fedora's Ant and Maven packages are back to working again with the value JAVA_HOME, so things are easy again. Rémy > -- > Cheers > > Jean-Frederic > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.56
On 06/12/2021 15:19, jean-frederic clere wrote: On 03/12/2021 09:49, Rémy Maucherat wrote: [X] Stable - go ahead and release as 9.0.56 (stable) Tested on fedora33 with openjdk 11.0.13. Same results for adoptium jdk8u302-b08 looks good to me. -- Cheers Jean-Frederic - 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 tests to reduce running time when using multiple threads
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 a054f4f Refactor tests to reduce running time when using multiple
threads
a054f4f is described below
commit a054f4fe290538fc8015dab79c000404b5371e7c
Author: Mark Thomas
AuthorDate: Mon Dec 6 11:54:52 2021 +
Refactor tests to reduce running time when using multiple threads
Splits up long running tests into multiple tests to improve concurrency
towards the end of the test run where a small number of long running
tests were dominating the test execution time. Generally, the more
threads the test use, the more pronounced this effect.
---
.../el/TestImportHandlerStandardPackages.java | 2 +-
...tDoHead.java => HttpServletDoHeadBaseTest.java} | 37 +-
.../http/TestHttpServletDoHeadValidWrite0.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite1.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite1023.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite1024.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite1025.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite511.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite512.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite513.java | 50 +++
...java => TestWebdavServletOptionCollection.java} | 15 +-
...ions.java => TestWebdavServletOptionsFile.java} | 15 +-
...s.java => TestWebdavServletOptionsUnknown.java} | 15 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 372 +
...WsWebSocketContainerSessionExpiryContainer.java | 96 ++
...stWsWebSocketContainerSessionExpirySession.java | 100 ++
.../TestWsWebSocketContainerTimeoutClient.java | 123 +++
.../TestWsWebSocketContainerTimeoutServer.java | 201 +++
.../websocket/WsWebSocketContainerBaseTest.java| 48 +++
19 files changed, 1002 insertions(+), 422 deletions(-)
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java
b/test/javax/el/TestImportHandlerStandardPackages.java
index 2f40de8..47332b8 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -113,7 +113,7 @@ public class TestImportHandlerStandardPackages {
// Skip non-class resources
continue;
}
-if (file.startsWith("Test")) {
+if (file.startsWith("Test") ||
file.endsWith("BaseTest.class")) {
// Skip test resources
continue;
}
diff --git a/test/javax/servlet/http/TestHttpServletDoHead.java
b/test/javax/servlet/http/HttpServletDoHeadBaseTest.java
similarity index 84%
rename from test/javax/servlet/http/TestHttpServletDoHead.java
rename to test/javax/servlet/http/HttpServletDoHeadBaseTest.java
index 74bff5d..b93b749 100644
--- a/test/javax/servlet/http/TestHttpServletDoHead.java
+++ b/test/javax/servlet/http/HttpServletDoHeadBaseTest.java
@@ -20,8 +20,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,8 +28,6 @@ import javax.servlet.ServletException;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.apache.catalina.core.StandardContext;
@@ -40,8 +36,11 @@ import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
-@RunWith(Parameterized.class)
-public class TestHttpServletDoHead extends TomcatBaseTest {
+/*
+ * Split into multiple tests as a single test takes so long it impacts the time
+ * of an entire test run.
+ */
+public class HttpServletDoHeadBaseTest extends TomcatBaseTest {
// Tomcat has a minimum output buffer size of 8 * 1024.
// (8 * 1024) /16 = 512
@@ -49,32 +48,12 @@ public class TestHttpServletDoHead extends TomcatBaseTest {
private static final String VALID = "** valid data **";
private static final String INVALID = "* invalid data *";
-private static final Integer BUFFERS[] = new Integer[] { Integer.valueOf
(16), Integer.valueOf(8 * 1024), Integer.valueOf(16 * 1024) };
+protected static final Integer BUFFERS[] = new Integer[] { Integer.valueOf
(16), Integer.valueOf(8 * 1024), Integer.valueOf(16 * 1024) };
-private static final Integer COUNTS[] = new Integer[] {
Integer.valueOf(0), Integer.valueOf(1),
+protected static final Integer COUNTS[] = new Integer[] {
[Bug 65726] NullPointerException while reading request input with H2C upgraded exchanges
https://bz.apache.org/bugzilla/show_bug.cgi?id=65726 bclozel changed: What|Removed |Added CC||bclo...@vmware.com -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.56
On 03/12/2021 09:49, Rémy Maucherat wrote: [X] Stable - go ahead and release as 9.0.56 (stable) Tested on fedora33 with openjdk 11.0.13. -- Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65726] New: NullPointerException while reading request input with H2C upgraded exchanges
https://bz.apache.org/bugzilla/show_bug.cgi?id=65726 Bug ID: 65726 Summary: NullPointerException while reading request input with H2C upgraded exchanges Product: Tomcat 9 Version: 9.0.55 Hardware: PC OS: Mac OS X 10.1 Status: NEW Severity: normal Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: bclo...@vmware.com Target Milestone: - See https://github.com/spring-projects/spring-boot/issues/28912 for original issue. It looks like trying to read the request body with an H2C-upgraded request fails with an NPE, while this doesn't fail with H2C prior-knowledge or HTTP 1.1. Here is the stacktrace: java.lang.NullPointerException: Cannot invoke "org.apache.coyote.InputBuffer.doRead(org.apache.tomcat.util.net.ApplicationBufferHandler)" because "this.inputBuffer" is null at org.apache.coyote.Request.doRead(Request.java:640) at org.apache.catalina.connector.InputBuffer.realReadBytes(InputBuffer.java:317) at org.apache.catalina.connector.InputBuffer.checkByteBufferEof(InputBuffer.java:600) at org.apache.catalina.connector.InputBuffer.read(InputBuffer.java:340) at org.apache.catalina.connector.CoyoteInputStream.read(CoyoteInputStream.java:132) at java.base/java.io.InputStream.readNBytes(InputStream.java:409) at java.base/java.io.InputStream.readAllBytes(InputStream.java:346) at h2c.H2cServlet.doGet(H2cServlet.java:18) at javax.servlet.http.HttpServlet.service(HttpServlet.java:655) at javax.servlet.http.HttpServlet.service(HttpServlet.java:764) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:227) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:197) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:97) at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:540) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:135) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:357) at org.apache.coyote.http2.StreamProcessor.service(StreamProcessor.java:413) at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65) at org.apache.coyote.http2.StreamProcessor.process(StreamProcessor.java:74) at org.apache.coyote.http2.StreamRunnable.run(StreamRunnable.java:35) at org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191) at org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.base/java.lang.Thread.run(Thread.java:833) A sample application can be found here: https://github.com/bclozel/h2c-tomcat -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Refactor tests to reduce running time when using multiple threads
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 a7390da Refactor tests to reduce running time when using multiple
threads
a7390da is described below
commit a7390dad476a7669cb0f71cae28720ee9593c7e3
Author: Mark Thomas
AuthorDate: Mon Dec 6 11:54:52 2021 +
Refactor tests to reduce running time when using multiple threads
Splits up long running tests into multiple tests to improve concurrency
towards the end of the test run where a small number of long running
tests were dominating the test execution time. Generally, the more
threads the test use, the more pronounced this effect.
---
.../el/TestImportHandlerStandardPackages.java | 2 +-
...tDoHead.java => HttpServletDoHeadBaseTest.java} | 37 +-
.../http/TestHttpServletDoHeadValidWrite0.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite1.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite1023.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite1024.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite1025.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite511.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite512.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite513.java | 50 +++
...java => TestWebdavServletOptionCollection.java} | 15 +-
...ions.java => TestWebdavServletOptionsFile.java} | 15 +-
...s.java => TestWebdavServletOptionsUnknown.java} | 15 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 372 +
...WsWebSocketContainerSessionExpiryContainer.java | 96 ++
...stWsWebSocketContainerSessionExpirySession.java | 100 ++
.../TestWsWebSocketContainerTimeoutClient.java | 123 +++
.../TestWsWebSocketContainerTimeoutServer.java | 201 +++
.../websocket/WsWebSocketContainerBaseTest.java| 48 +++
19 files changed, 1002 insertions(+), 422 deletions(-)
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java
b/test/javax/el/TestImportHandlerStandardPackages.java
index bf7e2d8..32303fe 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -106,7 +106,7 @@ public class TestImportHandlerStandardPackages {
// Skip non-class resources
continue;
}
-if (file.startsWith("Test")) {
+if (file.startsWith("Test") ||
file.endsWith("BaseTest.class")) {
// Skip test resources
continue;
}
diff --git a/test/javax/servlet/http/TestHttpServletDoHead.java
b/test/javax/servlet/http/HttpServletDoHeadBaseTest.java
similarity index 84%
rename from test/javax/servlet/http/TestHttpServletDoHead.java
rename to test/javax/servlet/http/HttpServletDoHeadBaseTest.java
index 74bff5d..b93b749 100644
--- a/test/javax/servlet/http/TestHttpServletDoHead.java
+++ b/test/javax/servlet/http/HttpServletDoHeadBaseTest.java
@@ -20,8 +20,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,8 +28,6 @@ import javax.servlet.ServletException;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.apache.catalina.core.StandardContext;
@@ -40,8 +36,11 @@ import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
-@RunWith(Parameterized.class)
-public class TestHttpServletDoHead extends TomcatBaseTest {
+/*
+ * Split into multiple tests as a single test takes so long it impacts the time
+ * of an entire test run.
+ */
+public class HttpServletDoHeadBaseTest extends TomcatBaseTest {
// Tomcat has a minimum output buffer size of 8 * 1024.
// (8 * 1024) /16 = 512
@@ -49,32 +48,12 @@ public class TestHttpServletDoHead extends TomcatBaseTest {
private static final String VALID = "** valid data **";
private static final String INVALID = "* invalid data *";
-private static final Integer BUFFERS[] = new Integer[] { Integer.valueOf
(16), Integer.valueOf(8 * 1024), Integer.valueOf(16 * 1024) };
+protected static final Integer BUFFERS[] = new Integer[] { Integer.valueOf
(16), Integer.valueOf(8 * 1024), Integer.valueOf(16 * 1024) };
-private static final Integer COUNTS[] = new Integer[] {
Integer.valueOf(0), Integer.valueOf(1),
+protected static final Integer COUNTS[] = new Integer[] {
[tomcat] branch 10.0.x updated: Refactor tests to reduce running time when using multiple threads
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 5822574 Refactor tests to reduce running time when using multiple
threads
5822574 is described below
commit 58225742e397d49a9d7a41993fbdc736f82bbe28
Author: Mark Thomas
AuthorDate: Mon Dec 6 11:54:52 2021 +
Refactor tests to reduce running time when using multiple threads
Splits up long running tests into multiple tests to improve concurrency
towards the end of the test run where a small number of long running
tests were dominating the test execution time. Generally, the more
threads the test use, the more pronounced this effect.
---
.../el/TestImportHandlerStandardPackages.java | 2 +-
...tDoHead.java => HttpServletDoHeadBaseTest.java} | 37 +-
.../http/TestHttpServletDoHeadValidWrite0.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite1.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite1023.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite1024.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite1025.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite511.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite512.java | 50 +++
.../http/TestHttpServletDoHeadValidWrite513.java | 50 +++
...java => TestWebdavServletOptionCollection.java} | 15 +-
...ions.java => TestWebdavServletOptionsFile.java} | 15 +-
...s.java => TestWebdavServletOptionsUnknown.java} | 15 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 372 +
...WsWebSocketContainerSessionExpiryContainer.java | 96 ++
...stWsWebSocketContainerSessionExpirySession.java | 100 ++
.../TestWsWebSocketContainerTimeoutClient.java | 123 +++
.../TestWsWebSocketContainerTimeoutServer.java | 201 +++
.../websocket/WsWebSocketContainerBaseTest.java| 48 +++
19 files changed, 1002 insertions(+), 422 deletions(-)
diff --git a/test/jakarta/el/TestImportHandlerStandardPackages.java
b/test/jakarta/el/TestImportHandlerStandardPackages.java
index a895030..ea6d8f7 100644
--- a/test/jakarta/el/TestImportHandlerStandardPackages.java
+++ b/test/jakarta/el/TestImportHandlerStandardPackages.java
@@ -106,7 +106,7 @@ public class TestImportHandlerStandardPackages {
// Skip non-class resources
continue;
}
-if (file.startsWith("Test")) {
+if (file.startsWith("Test") ||
file.endsWith("BaseTest.class")) {
// Skip test resources
continue;
}
diff --git a/test/jakarta/servlet/http/TestHttpServletDoHead.java
b/test/jakarta/servlet/http/HttpServletDoHeadBaseTest.java
similarity index 84%
rename from test/jakarta/servlet/http/TestHttpServletDoHead.java
rename to test/jakarta/servlet/http/HttpServletDoHeadBaseTest.java
index 31f4b91..6d199f7 100644
--- a/test/jakarta/servlet/http/TestHttpServletDoHead.java
+++ b/test/jakarta/servlet/http/HttpServletDoHeadBaseTest.java
@@ -20,8 +20,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,8 +28,6 @@ import jakarta.servlet.ServletException;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.apache.catalina.core.StandardContext;
@@ -40,8 +36,11 @@ import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
-@RunWith(Parameterized.class)
-public class TestHttpServletDoHead extends TomcatBaseTest {
+/*
+ * Split into multiple tests as a single test takes so long it impacts the time
+ * of an entire test run.
+ */
+public class HttpServletDoHeadBaseTest extends TomcatBaseTest {
// Tomcat has a minimum output buffer size of 8 * 1024.
// (8 * 1024) /16 = 512
@@ -49,32 +48,12 @@ public class TestHttpServletDoHead extends TomcatBaseTest {
private static final String VALID = "** valid data **";
private static final String INVALID = "* invalid data *";
-private static final Integer BUFFERS[] = new Integer[] { Integer.valueOf
(16), Integer.valueOf(8 * 1024), Integer.valueOf(16 * 1024) };
+protected static final Integer BUFFERS[] = new Integer[] { Integer.valueOf
(16), Integer.valueOf(8 * 1024), Integer.valueOf(16 * 1024) };
-private static final Integer COUNTS[] = new Integer[] {
Integer.valueOf(0), Integer.valueOf(1),
+protected static final Integer COUNTS[] = new
[tomcat] branch main updated: Refactor tests to reduce running time when using multiple threads
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 28f5e29 Refactor tests to reduce running time when using multiple
threads
28f5e29 is described below
commit 28f5e2967824d67a85b0fab4370e3dc25bf9b07e
Author: Mark Thomas
AuthorDate: Mon Dec 6 11:54:52 2021 +
Refactor tests to reduce running time when using multiple threads
Splits up long running tests into multiple tests to improve concurrency
towards the end of the test run where a small number of long running
tests were dominating the test execution time. Generally, the more
threads the test use, the more pronounced this effect.
---
.../el/TestImportHandlerStandardPackages.java | 2 +-
...tDoHead.java => HttpServletDoHeadBaseTest.java} | 39 +--
.../http/TestHttpServletDoHeadValidWrite0.java | 52 +++
.../http/TestHttpServletDoHeadValidWrite1.java | 52 +++
.../http/TestHttpServletDoHeadValidWrite1023.java | 52 +++
.../http/TestHttpServletDoHeadValidWrite1024.java | 52 +++
.../http/TestHttpServletDoHeadValidWrite1025.java | 52 +++
.../http/TestHttpServletDoHeadValidWrite511.java | 52 +++
.../http/TestHttpServletDoHeadValidWrite512.java | 52 +++
.../http/TestHttpServletDoHeadValidWrite513.java | 52 +++
...java => TestWebdavServletOptionCollection.java} | 15 +-
...ions.java => TestWebdavServletOptionsFile.java} | 15 +-
...s.java => TestWebdavServletOptionsUnknown.java} | 15 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 372 +
...WsWebSocketContainerSessionExpiryContainer.java | 96 ++
...stWsWebSocketContainerSessionExpirySession.java | 100 ++
.../TestWsWebSocketContainerTimeoutClient.java | 123 +++
.../TestWsWebSocketContainerTimeoutServer.java | 201 +++
.../websocket/WsWebSocketContainerBaseTest.java| 48 +++
19 files changed, 1018 insertions(+), 424 deletions(-)
diff --git a/test/jakarta/el/TestImportHandlerStandardPackages.java
b/test/jakarta/el/TestImportHandlerStandardPackages.java
index 5a8ca7f..28ba400 100644
--- a/test/jakarta/el/TestImportHandlerStandardPackages.java
+++ b/test/jakarta/el/TestImportHandlerStandardPackages.java
@@ -98,7 +98,7 @@ public class TestImportHandlerStandardPackages {
// Skip non-class resources
continue;
}
-if (file.startsWith("Test")) {
+if (file.startsWith("Test") ||
file.endsWith("BaseTest.class")) {
// Skip test resources
continue;
}
diff --git a/test/jakarta/servlet/http/TestHttpServletDoHead.java
b/test/jakarta/servlet/http/HttpServletDoHeadBaseTest.java
similarity index 87%
rename from test/jakarta/servlet/http/TestHttpServletDoHead.java
rename to test/jakarta/servlet/http/HttpServletDoHeadBaseTest.java
index 973c9cd..51516ad 100644
--- a/test/jakarta/servlet/http/TestHttpServletDoHead.java
+++ b/test/jakarta/servlet/http/HttpServletDoHeadBaseTest.java
@@ -21,8 +21,6 @@ import java.io.OutputStream;
import java.io.PrintWriter;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -31,8 +29,6 @@ import jakarta.servlet.ServletException;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.apache.catalina.LifecycleException;
@@ -43,8 +39,11 @@ import org.apache.coyote.http2.Http2TestBase;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
-@RunWith(Parameterized.class)
-public class TestHttpServletDoHead extends Http2TestBase {
+/*
+ * Split into multiple tests as a single test takes so long it impacts the time
+ * of an entire test run.
+ */
+public class HttpServletDoHeadBaseTest extends Http2TestBase {
// Tomcat has a minimum output buffer size of 8 * 1024.
// (8 * 1024) /16 = 512
@@ -52,34 +51,12 @@ public class TestHttpServletDoHead extends Http2TestBase {
private static final String VALID = "** valid data **";
private static final String INVALID = "* invalid data *";
-private static final Integer BUFFERS[] = new Integer[] { Integer.valueOf
(16), Integer.valueOf(8 * 1024), Integer.valueOf(16 * 1024) };
+protected static final Integer BUFFERS[] = new Integer[] { Integer.valueOf
(16), Integer.valueOf(8 * 1024), Integer.valueOf(16 * 1024) };
-private static final Integer COUNTS[] = new Integer[] {
Integer.valueOf(0), Integer.valueOf(1),
+protected static final Integer COUNTS[] = new Integer[] {
[Bug 65724] Can not found 'resolverNotWriteable' in jakarta.el Resource Bundle LocalStrings
https://bz.apache.org/bugzilla/show_bug.cgi?id=65724 Mark Thomas changed: What|Removed |Added OS||All Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #3 from Mark Thomas --- Fixed in: - 10.1.x for 10.1.0-M9 onwards - 10.0.x for 10.0.15 onwards - 9.0.x for 9.0.57 onwards - 8.5.x for 8.5.74 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Add change log entry for BZ 65724
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 fe54abb Add change log entry for BZ 65724 fe54abb is described below commit fe54abb5a5be56cc80f95094f36c467780ab2b05 Author: Mark Thomas AuthorDate: Mon Dec 6 08:40:01 2021 + Add change log entry for BZ 65724 --- webapps/docs/changelog.xml | 9 + 1 file changed, 9 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 821a316..6308058 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -178,6 +178,15 @@ + + + +65724: Fix missing messages for some +PropertyNotWtriableExceptions caused by a typo in the name +used for a resource string. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Add change log entry for BZ 65724
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 ca36780 Add change log entry for BZ 65724 ca36780 is described below commit ca36780cd9c2c9e90ef4079338e046c95e55be1b Author: Mark Thomas AuthorDate: Mon Dec 6 08:40:01 2021 + Add change log entry for BZ 65724 --- webapps/docs/changelog.xml | 9 + 1 file changed, 9 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index f61445e..3e0f7b7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,6 +105,15 @@ issues do not "pop up" wrt. others). --> + + + +65724: Fix missing messages for some +PropertyNotWtriableExceptions caused by a typo in the name +used for a resource string. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Add change log entry for BZ 65724
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new c2d4bc0 Add change log entry for BZ 65724 c2d4bc0 is described below commit c2d4bc06285fbfcb1f5b26305dbf18e0c77486f0 Author: Mark Thomas AuthorDate: Mon Dec 6 08:40:01 2021 + Add change log entry for BZ 65724 --- webapps/docs/changelog.xml | 9 + 1 file changed, 9 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 3e74120..182e714 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,6 +105,15 @@ issues do not "pop up" wrt. others). --> + + + +65724: Fix missing messages for some +PropertyNotWtriableExceptions caused by a typo in the name +used for a resource string. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Add change log entry for BZ 65724
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 9423340 Add change log entry for BZ 65724 9423340 is described below commit 9423340fef454c1cb865d374a62a68d7697d2fa2 Author: Mark Thomas AuthorDate: Mon Dec 6 08:40:01 2021 + Add change log entry for BZ 65724 --- webapps/docs/changelog.xml | 9 + 1 file changed, 9 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 9d578b3..3c5631a 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -114,6 +114,15 @@ + + + +65724: Fix missing messages for some +PropertyNotWtriableExceptions caused by a typo in the name +used for a resource string. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: writeable -> writable - rename public method
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 0b3cbb5a60049248c0a5a48b6b8258b59b1b38d3
Author: Mark Thomas
AuthorDate: Mon Dec 6 08:02:04 2021 +
writeable -> writable - rename public method
---
java/org/apache/catalina/users/MemoryUserDatabase.java | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java
b/java/org/apache/catalina/users/MemoryUserDatabase.java
index b4662f7..05b7d5e 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabase.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabase.java
@@ -543,8 +543,23 @@ public class MemoryUserDatabase implements UserDatabase {
* location.
*
* @return true if the database is writable
+ *
+ * @deprecated Use {@link #isWritable()}. This method will be removed in
+ * Tomcat 10.1.x onwards.
*/
+@Deprecated
public boolean isWriteable() {
+return isWritable();
+}
+
+
+/**
+ * Check for permissions to save this user database to persistent storage
+ * location.
+ *
+ * @return true if the database is writable
+ */
+public boolean isWritable() {
File file = new File(pathname);
if (!file.isAbsolute()) {
@@ -569,7 +584,7 @@ public class MemoryUserDatabase implements UserDatabase {
return;
}
-if (!isWriteable()) {
+if (!isWritable()) {
log.warn(sm.getString("memoryUserDatabase.notPersistable"));
return;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: writeable -> writable for consistency
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 22740949763e0e00aefc45f9ab39a885e568afa7
Author: Mark Thomas
AuthorDate: Mon Dec 6 08:00:30 2021 +
writeable -> writable for consistency
Excludes MBean descriptors as DTD uses writeable
---
java/javax/el/ArrayELResolver.java | 2 +-
java/javax/el/BeanELResolver.java | 2 +-
java/javax/el/ListELResolver.java | 2 +-
java/javax/el/LocalStrings.properties | 2 +-
java/javax/el/LocalStrings_fr.properties| 2 +-
java/javax/el/LocalStrings_ja.properties| 2 +-
java/javax/el/LocalStrings_ko.properties| 2 +-
java/javax/el/LocalStrings_zh_CN.properties | 2 +-
java/javax/el/MapELResolver.java| 2 +-
java/javax/el/ResourceBundleELResolver.java | 2 +-
java/javax/el/StaticFieldELResolver.java| 2 +-
java/org/apache/catalina/users/mbeans-descriptors.xml | 4 ++--
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 ++--
java/org/apache/tomcat/util/net/SecureNioChannel.java | 6 +++---
.../apache/catalina/webresources/AbstractTestFileResourceSet.java | 2 +-
test/org/apache/catalina/webresources/AbstractTestResourceSet.java | 6 +++---
test/org/apache/catalina/webresources/TestDirResourceSet.java | 2 +-
.../apache/catalina/webresources/TestDirResourceSetInternal.java| 2 +-
test/org/apache/catalina/webresources/TestDirResourceSetMount.java | 2 +-
.../apache/catalina/webresources/TestDirResourceSetReadOnly.java| 2 +-
.../org/apache/catalina/webresources/TestDirResourceSetVirtual.java | 2 +-
test/org/apache/catalina/webresources/TestJarResourceSet.java | 2 +-
.../apache/catalina/webresources/TestJarResourceSetInternal.java| 2 +-
test/org/apache/catalina/webresources/TestJarResourceSetMount.java | 2 +-
webapps/docs/jndi-resources-howto.xml | 2 +-
25 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/java/javax/el/ArrayELResolver.java
b/java/javax/el/ArrayELResolver.java
index d5e221a..c143a6d 100644
--- a/java/javax/el/ArrayELResolver.java
+++ b/java/javax/el/ArrayELResolver.java
@@ -77,7 +77,7 @@ public class ArrayELResolver extends ELResolver {
if (this.readOnly) {
throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
}
int idx = coerce(property);
diff --git a/java/javax/el/BeanELResolver.java
b/java/javax/el/BeanELResolver.java
index 7299c2f..3e7e1cf 100644
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -111,7 +111,7 @@ public class BeanELResolver extends ELResolver {
if (this.readOnly) {
throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
}
Method m = this.property(context, base, property).write(context, base);
diff --git a/java/javax/el/ListELResolver.java
b/java/javax/el/ListELResolver.java
index 52ea1f0..1c18baa 100644
--- a/java/javax/el/ListELResolver.java
+++ b/java/javax/el/ListELResolver.java
@@ -84,7 +84,7 @@ public class ListELResolver extends ELResolver {
if (this.readOnly) {
throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
}
int idx = coerce(property);
diff --git a/java/javax/el/LocalStrings.properties
b/java/javax/el/LocalStrings.properties
index cead8de..3c51085 100644
--- a/java/javax/el/LocalStrings.properties
+++ b/java/javax/el/LocalStrings.properties
@@ -46,7 +46,7 @@ propertyWriteError=Error writing [{1}] on type [{0}]
staticFieldELResolver.methodNotFound=No matching public static method named
[{0}] found on class [{1}]
staticFieldELResolver.notFound=No public static field named [{0}] was found on
(exported for Java 9+) class [{1}]
-staticFieldELResolver.notWriteable=Writing to static fields (in this case
field [{0}] on class [{1}]) is not permitted
+staticFieldELResolver.notWritable=Writing to static fields (in this case field
[{0}] on class [{1}]) is not permitted
util.method.ambiguous=Unable to find unambiguous method: {0}.{1}({2})
util.method.notfound=Method not
[tomcat] branch 8.5.x updated (f660c28 -> 0b3cbb5)
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 f660c28 Add additional tests with pooling new 2274094 writeable -> writable for consistency new 0b3cbb5 writeable -> writable - rename public method 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/javax/el/ArrayELResolver.java | 2 +- java/javax/el/BeanELResolver.java | 2 +- java/javax/el/ListELResolver.java | 2 +- java/javax/el/LocalStrings.properties | 2 +- java/javax/el/LocalStrings_fr.properties| 2 +- java/javax/el/LocalStrings_ja.properties| 2 +- java/javax/el/LocalStrings_ko.properties| 2 +- java/javax/el/LocalStrings_zh_CN.properties | 2 +- java/javax/el/MapELResolver.java| 2 +- java/javax/el/ResourceBundleELResolver.java | 2 +- java/javax/el/StaticFieldELResolver.java| 2 +- java/org/apache/catalina/users/MemoryUserDatabase.java | 17 - java/org/apache/catalina/users/mbeans-descriptors.xml | 4 ++-- java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 ++-- java/org/apache/tomcat/util/net/SecureNioChannel.java | 6 +++--- .../webresources/AbstractTestFileResourceSet.java | 2 +- .../catalina/webresources/AbstractTestResourceSet.java | 6 +++--- .../catalina/webresources/TestDirResourceSet.java | 2 +- .../webresources/TestDirResourceSetInternal.java| 2 +- .../catalina/webresources/TestDirResourceSetMount.java | 2 +- .../webresources/TestDirResourceSetReadOnly.java| 2 +- .../webresources/TestDirResourceSetVirtual.java | 2 +- .../catalina/webresources/TestJarResourceSet.java | 2 +- .../webresources/TestJarResourceSetInternal.java| 2 +- .../catalina/webresources/TestJarResourceSetMount.java | 2 +- webapps/docs/jndi-resources-howto.xml | 2 +- 26 files changed, 47 insertions(+), 32 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: writeable -> writable for consistency
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 451ab4deb34c63f01c7f850ad7102a7d2734a487
Author: Mark Thomas
AuthorDate: Mon Dec 6 08:00:30 2021 +
writeable -> writable for consistency
Excludes MBean descriptors as DTD uses writeable
---
java/javax/el/ArrayELResolver.java | 2 +-
java/javax/el/BeanELResolver.java| 2 +-
java/javax/el/ListELResolver.java| 2 +-
java/javax/el/LocalStrings.properties| 2 +-
java/javax/el/LocalStrings_fr.properties | 2 +-
java/javax/el/LocalStrings_ja.properties | 2 +-
java/javax/el/LocalStrings_ko.properties | 2 +-
java/javax/el/LocalStrings_zh_CN.properties | 2 +-
java/javax/el/MapELResolver.java | 2 +-
java/javax/el/ResourceBundleELResolver.java | 2 +-
java/javax/el/StaticFieldELResolver.java | 2 +-
java/org/apache/catalina/users/mbeans-descriptors.xml| 4 ++--
java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java | 12 ++--
java/org/apache/coyote/http2/Http2UpgradeHandler.java| 4 ++--
java/org/apache/tomcat/util/net/SecureNioChannel.java| 6 +++---
.../catalina/webresources/AbstractTestFileResourceSet.java | 2 +-
.../catalina/webresources/AbstractTestResourceSet.java | 6 +++---
.../org/apache/catalina/webresources/TestDirResourceSet.java | 2 +-
.../catalina/webresources/TestDirResourceSetInternal.java| 2 +-
.../catalina/webresources/TestDirResourceSetMount.java | 2 +-
.../catalina/webresources/TestDirResourceSetReadOnly.java| 2 +-
.../catalina/webresources/TestDirResourceSetVirtual.java | 2 +-
.../org/apache/catalina/webresources/TestJarResourceSet.java | 2 +-
.../catalina/webresources/TestJarResourceSetInternal.java| 2 +-
.../catalina/webresources/TestJarResourceSetMount.java | 2 +-
test/org/apache/tomcat/util/net/TestSocketBufferHandler.java | 4 ++--
webapps/docs/jndi-resources-howto.xml| 4 ++--
27 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/java/javax/el/ArrayELResolver.java
b/java/javax/el/ArrayELResolver.java
index d5e221a..c143a6d 100644
--- a/java/javax/el/ArrayELResolver.java
+++ b/java/javax/el/ArrayELResolver.java
@@ -77,7 +77,7 @@ public class ArrayELResolver extends ELResolver {
if (this.readOnly) {
throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
}
int idx = coerce(property);
diff --git a/java/javax/el/BeanELResolver.java
b/java/javax/el/BeanELResolver.java
index d8e9489..b4372e0 100644
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -105,7 +105,7 @@ public class BeanELResolver extends ELResolver {
if (this.readOnly) {
throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
}
Method m = this.property(context, base, property).write(context, base);
diff --git a/java/javax/el/ListELResolver.java
b/java/javax/el/ListELResolver.java
index 52ea1f0..1c18baa 100644
--- a/java/javax/el/ListELResolver.java
+++ b/java/javax/el/ListELResolver.java
@@ -84,7 +84,7 @@ public class ListELResolver extends ELResolver {
if (this.readOnly) {
throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
}
int idx = coerce(property);
diff --git a/java/javax/el/LocalStrings.properties
b/java/javax/el/LocalStrings.properties
index cead8de..3c51085 100644
--- a/java/javax/el/LocalStrings.properties
+++ b/java/javax/el/LocalStrings.properties
@@ -46,7 +46,7 @@ propertyWriteError=Error writing [{1}] on type [{0}]
staticFieldELResolver.methodNotFound=No matching public static method named
[{0}] found on class [{1}]
staticFieldELResolver.notFound=No public static field named [{0}] was found on
(exported for Java 9+) class [{1}]
-staticFieldELResolver.notWriteable=Writing to static fields (in this case
field [{0}] on class [{1}]) is not permitted
+staticFieldELResolver.notWritable=Writing to static fields (in this case field
[{0}] on class [{1}]) is not permitted
util.method.ambiguous=Unable to find unambiguous method: {0}.{1}({2})
util.method.notfound=Method not
[tomcat] 02/02: writeable -> writable - rename public method
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 1f8f49e8c44cf1df6c5ae59e3cdeb3593cdde592
Author: Mark Thomas
AuthorDate: Mon Dec 6 08:02:04 2021 +
writeable -> writable - rename public method
---
java/org/apache/catalina/users/MemoryUserDatabase.java | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java
b/java/org/apache/catalina/users/MemoryUserDatabase.java
index 03e9fdd..207dec3 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabase.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabase.java
@@ -527,8 +527,23 @@ public class MemoryUserDatabase implements UserDatabase {
* location.
*
* @return true if the database is writable
+ *
+ * @deprecated Use {@link #isWritable()}. This method will be removed in
+ * Tomcat 10.1.x onwards.
*/
+@Deprecated
public boolean isWriteable() {
+return isWritable();
+}
+
+
+/**
+ * Check for permissions to save this user database to persistent storage
+ * location.
+ *
+ * @return true if the database is writable
+ */
+public boolean isWritable() {
File file = new File(pathname);
if (!file.isAbsolute()) {
@@ -553,7 +568,7 @@ public class MemoryUserDatabase implements UserDatabase {
return;
}
-if (!isWriteable()) {
+if (!isWritable()) {
log.warn(sm.getString("memoryUserDatabase.notPersistable"));
return;
}
-
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 (2149631 -> 1f8f49e)
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 2149631 Add additional tests with pooling new 451ab4d writeable -> writable for consistency new 1f8f49e writeable -> writable - rename public method 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/javax/el/ArrayELResolver.java | 2 +- java/javax/el/BeanELResolver.java | 2 +- java/javax/el/ListELResolver.java | 2 +- java/javax/el/LocalStrings.properties | 2 +- java/javax/el/LocalStrings_fr.properties| 2 +- java/javax/el/LocalStrings_ja.properties| 2 +- java/javax/el/LocalStrings_ko.properties| 2 +- java/javax/el/LocalStrings_zh_CN.properties | 2 +- java/javax/el/MapELResolver.java| 2 +- java/javax/el/ResourceBundleELResolver.java | 2 +- java/javax/el/StaticFieldELResolver.java| 2 +- java/org/apache/catalina/users/MemoryUserDatabase.java | 17 - java/org/apache/catalina/users/mbeans-descriptors.xml | 4 ++-- .../apache/coyote/http2/Http2AsyncUpgradeHandler.java | 12 ++-- java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 ++-- java/org/apache/tomcat/util/net/SecureNioChannel.java | 6 +++--- .../webresources/AbstractTestFileResourceSet.java | 2 +- .../catalina/webresources/AbstractTestResourceSet.java | 6 +++--- .../catalina/webresources/TestDirResourceSet.java | 2 +- .../webresources/TestDirResourceSetInternal.java| 2 +- .../catalina/webresources/TestDirResourceSetMount.java | 2 +- .../webresources/TestDirResourceSetReadOnly.java| 2 +- .../webresources/TestDirResourceSetVirtual.java | 2 +- .../catalina/webresources/TestJarResourceSet.java | 2 +- .../webresources/TestJarResourceSetInternal.java| 2 +- .../catalina/webresources/TestJarResourceSetMount.java | 2 +- .../apache/tomcat/util/net/TestSocketBufferHandler.java | 4 ++-- webapps/docs/jndi-resources-howto.xml | 4 ++-- 28 files changed, 56 insertions(+), 41 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Do need one update in an MBean descriptor file
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new 8737d46 Do need one update in an MBean descriptor file 8737d46 is described below commit 8737d46ba8ed90ec986686e60c19b1b9158adae9 Author: Mark Thomas AuthorDate: Mon Dec 6 08:08:49 2021 + Do need one update in an MBean descriptor file --- java/org/apache/catalina/users/mbeans-descriptors.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/users/mbeans-descriptors.xml b/java/org/apache/catalina/users/mbeans-descriptors.xml index e73df9e..d0dd524 100644 --- a/java/org/apache/catalina/users/mbeans-descriptors.xml +++ b/java/org/apache/catalina/users/mbeans-descriptors.xml @@ -50,8 +50,8 @@ type="boolean" writeable="false"/> - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Do need one update in an MBean descriptor file
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 38f54b9 Do need one update in an MBean descriptor file 38f54b9 is described below commit 38f54b96cdc178c2442387cc0a1483729f8c4ba0 Author: Mark Thomas AuthorDate: Mon Dec 6 08:08:49 2021 + Do need one update in an MBean descriptor file --- java/org/apache/catalina/users/mbeans-descriptors.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/users/mbeans-descriptors.xml b/java/org/apache/catalina/users/mbeans-descriptors.xml index e73df9e..d0dd524 100644 --- a/java/org/apache/catalina/users/mbeans-descriptors.xml +++ b/java/org/apache/catalina/users/mbeans-descriptors.xml @@ -50,8 +50,8 @@ type="boolean" writeable="false"/> - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: writeable -> writable - rename public method
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ae9e558d1a786ba34f152755b07692dda1af7574
Author: Mark Thomas
AuthorDate: Mon Dec 6 08:02:04 2021 +
writeable -> writable - rename public method
---
java/org/apache/catalina/users/MemoryUserDatabase.java | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java
b/java/org/apache/catalina/users/MemoryUserDatabase.java
index 03e9fdd..207dec3 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabase.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabase.java
@@ -527,8 +527,23 @@ public class MemoryUserDatabase implements UserDatabase {
* location.
*
* @return true if the database is writable
+ *
+ * @deprecated Use {@link #isWritable()}. This method will be removed in
+ * Tomcat 10.1.x onwards.
*/
+@Deprecated
public boolean isWriteable() {
+return isWritable();
+}
+
+
+/**
+ * Check for permissions to save this user database to persistent storage
+ * location.
+ *
+ * @return true if the database is writable
+ */
+public boolean isWritable() {
File file = new File(pathname);
if (!file.isAbsolute()) {
@@ -553,7 +568,7 @@ public class MemoryUserDatabase implements UserDatabase {
return;
}
-if (!isWriteable()) {
+if (!isWritable()) {
log.warn(sm.getString("memoryUserDatabase.notPersistable"));
return;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: writeable -> writable for consistency
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit fbc43337ac851bdd21a4d5d7a7b327d89202bc98
Author: Mark Thomas
AuthorDate: Mon Dec 6 08:00:30 2021 +
writeable -> writable for consistency
Excludes MBean descriptors as DTD uses writeable
---
java/jakarta/el/ArrayELResolver.java | 2 +-
java/jakarta/el/BeanELResolver.java | 2 +-
java/jakarta/el/ListELResolver.java | 2 +-
java/jakarta/el/LocalStrings.properties | 2 +-
java/jakarta/el/LocalStrings_fr.properties | 2 +-
java/jakarta/el/LocalStrings_ja.properties | 2 +-
java/jakarta/el/LocalStrings_ko.properties | 2 +-
java/jakarta/el/LocalStrings_zh_CN.properties| 2 +-
java/jakarta/el/MapELResolver.java | 2 +-
java/jakarta/el/ResourceBundleELResolver.java| 2 +-
java/jakarta/el/StaticFieldELResolver.java | 2 +-
java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java | 12 ++--
java/org/apache/coyote/http2/Http2UpgradeHandler.java| 4 ++--
java/org/apache/tomcat/util/net/SecureNioChannel.java| 6 +++---
.../catalina/webresources/AbstractTestFileResourceSet.java | 2 +-
.../catalina/webresources/AbstractTestResourceSet.java | 6 +++---
.../org/apache/catalina/webresources/TestDirResourceSet.java | 2 +-
.../catalina/webresources/TestDirResourceSetInternal.java| 2 +-
.../catalina/webresources/TestDirResourceSetMount.java | 2 +-
.../catalina/webresources/TestDirResourceSetReadOnly.java| 2 +-
.../catalina/webresources/TestDirResourceSetVirtual.java | 2 +-
.../org/apache/catalina/webresources/TestJarResourceSet.java | 2 +-
.../catalina/webresources/TestJarResourceSetInternal.java| 2 +-
.../catalina/webresources/TestJarResourceSetMount.java | 2 +-
test/org/apache/tomcat/util/net/TestSocketBufferHandler.java | 4 ++--
webapps/docs/jndi-resources-howto.xml| 4 ++--
26 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/java/jakarta/el/ArrayELResolver.java
b/java/jakarta/el/ArrayELResolver.java
index ce3d95b..7626deb 100644
--- a/java/jakarta/el/ArrayELResolver.java
+++ b/java/jakarta/el/ArrayELResolver.java
@@ -77,7 +77,7 @@ public class ArrayELResolver extends ELResolver {
if (this.readOnly) {
throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
}
int idx = coerce(property);
diff --git a/java/jakarta/el/BeanELResolver.java
b/java/jakarta/el/BeanELResolver.java
index 7deca77..8057784 100644
--- a/java/jakarta/el/BeanELResolver.java
+++ b/java/jakarta/el/BeanELResolver.java
@@ -105,7 +105,7 @@ public class BeanELResolver extends ELResolver {
if (this.readOnly) {
throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
}
Method m = this.property(context, base, property).write(context, base);
diff --git a/java/jakarta/el/ListELResolver.java
b/java/jakarta/el/ListELResolver.java
index 0184bdf..45006ba 100644
--- a/java/jakarta/el/ListELResolver.java
+++ b/java/jakarta/el/ListELResolver.java
@@ -84,7 +84,7 @@ public class ListELResolver extends ELResolver {
if (this.readOnly) {
throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
}
int idx = coerce(property);
diff --git a/java/jakarta/el/LocalStrings.properties
b/java/jakarta/el/LocalStrings.properties
index cead8de..3c51085 100644
--- a/java/jakarta/el/LocalStrings.properties
+++ b/java/jakarta/el/LocalStrings.properties
@@ -46,7 +46,7 @@ propertyWriteError=Error writing [{1}] on type [{0}]
staticFieldELResolver.methodNotFound=No matching public static method named
[{0}] found on class [{1}]
staticFieldELResolver.notFound=No public static field named [{0}] was found on
(exported for Java 9+) class [{1}]
-staticFieldELResolver.notWriteable=Writing to static fields (in this case
field [{0}] on class [{1}]) is not permitted
+staticFieldELResolver.notWritable=Writing to static fields (in this case field
[{0}] on class [{1}]) is not permitted
util.method.ambiguous=Unable to find unambiguous method: {0}.{1}({2})
util.method.notfound=Method not found: {0}.{1}({2})
diff --git
[tomcat] branch 10.0.x updated (03c7985 -> ae9e558)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 03c7985 Add additional tests with pooling new fbc4333 writeable -> writable for consistency new ae9e558 writeable -> writable - rename public method 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/jakarta/el/ArrayELResolver.java| 2 +- java/jakarta/el/BeanELResolver.java | 2 +- java/jakarta/el/ListELResolver.java | 2 +- java/jakarta/el/LocalStrings.properties | 2 +- java/jakarta/el/LocalStrings_fr.properties | 2 +- java/jakarta/el/LocalStrings_ja.properties | 2 +- java/jakarta/el/LocalStrings_ko.properties | 2 +- java/jakarta/el/LocalStrings_zh_CN.properties | 2 +- java/jakarta/el/MapELResolver.java | 2 +- java/jakarta/el/ResourceBundleELResolver.java | 2 +- java/jakarta/el/StaticFieldELResolver.java | 2 +- java/org/apache/catalina/users/MemoryUserDatabase.java | 17 - .../apache/coyote/http2/Http2AsyncUpgradeHandler.java | 12 ++-- java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 ++-- java/org/apache/tomcat/util/net/SecureNioChannel.java | 6 +++--- .../webresources/AbstractTestFileResourceSet.java | 2 +- .../catalina/webresources/AbstractTestResourceSet.java | 6 +++--- .../catalina/webresources/TestDirResourceSet.java | 2 +- .../webresources/TestDirResourceSetInternal.java| 2 +- .../catalina/webresources/TestDirResourceSetMount.java | 2 +- .../webresources/TestDirResourceSetReadOnly.java| 2 +- .../webresources/TestDirResourceSetVirtual.java | 2 +- .../catalina/webresources/TestJarResourceSet.java | 2 +- .../webresources/TestJarResourceSetInternal.java| 2 +- .../catalina/webresources/TestJarResourceSetMount.java | 2 +- .../apache/tomcat/util/net/TestSocketBufferHandler.java | 4 ++-- webapps/docs/jndi-resources-howto.xml | 4 ++-- 27 files changed, 54 insertions(+), 39 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Remove deprecated code
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 b2154c7b618c9fa9dc6c8a169ce076bf0b3b53f8
Author: Mark Thomas
AuthorDate: Mon Dec 6 08:02:42 2021 +
Remove deprecated code
---
java/org/apache/catalina/users/MemoryUserDatabase.java | 15 ---
1 file changed, 15 deletions(-)
diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java
b/java/org/apache/catalina/users/MemoryUserDatabase.java
index 207dec3..f8bad5c 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabase.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabase.java
@@ -527,21 +527,6 @@ public class MemoryUserDatabase implements UserDatabase {
* location.
*
* @return true if the database is writable
- *
- * @deprecated Use {@link #isWritable()}. This method will be removed in
- * Tomcat 10.1.x onwards.
- */
-@Deprecated
-public boolean isWriteable() {
-return isWritable();
-}
-
-
-/**
- * Check for permissions to save this user database to persistent storage
- * location.
- *
- * @return true if the database is writable
*/
public boolean isWritable() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/03: writeable -> writable - rename public method
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 31c88c79a8bcd8dea4bcdfc0258f7933edecf62a
Author: Mark Thomas
AuthorDate: Mon Dec 6 08:02:04 2021 +
writeable -> writable - rename public method
---
java/org/apache/catalina/users/MemoryUserDatabase.java | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java
b/java/org/apache/catalina/users/MemoryUserDatabase.java
index 03e9fdd..207dec3 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabase.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabase.java
@@ -527,8 +527,23 @@ public class MemoryUserDatabase implements UserDatabase {
* location.
*
* @return true if the database is writable
+ *
+ * @deprecated Use {@link #isWritable()}. This method will be removed in
+ * Tomcat 10.1.x onwards.
*/
+@Deprecated
public boolean isWriteable() {
+return isWritable();
+}
+
+
+/**
+ * Check for permissions to save this user database to persistent storage
+ * location.
+ *
+ * @return true if the database is writable
+ */
+public boolean isWritable() {
File file = new File(pathname);
if (!file.isAbsolute()) {
@@ -553,7 +568,7 @@ public class MemoryUserDatabase implements UserDatabase {
return;
}
-if (!isWriteable()) {
+if (!isWritable()) {
log.warn(sm.getString("memoryUserDatabase.notPersistable"));
return;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (ecda61a -> b2154c7)
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 ecda61a Add missing state check new 29c45d7 writeable -> writable for consistency new 31c88c7 writeable -> writable - rename public method new b2154c7 Remove deprecated code 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/ArrayELResolver.java | 2 +- java/jakarta/el/BeanELResolver.java | 2 +- java/jakarta/el/ListELResolver.java | 2 +- java/jakarta/el/LocalStrings.properties | 2 +- java/jakarta/el/LocalStrings_fr.properties | 2 +- java/jakarta/el/LocalStrings_ja.properties | 2 +- java/jakarta/el/LocalStrings_ko.properties | 2 +- java/jakarta/el/LocalStrings_zh_CN.properties| 2 +- java/jakarta/el/MapELResolver.java | 2 +- java/jakarta/el/ResourceBundleELResolver.java| 2 +- java/jakarta/el/StaticFieldELResolver.java | 2 +- java/org/apache/catalina/users/MemoryUserDatabase.java | 4 ++-- java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java | 12 ++-- java/org/apache/coyote/http2/Http2UpgradeHandler.java| 4 ++-- java/org/apache/tomcat/util/net/SecureNioChannel.java| 6 +++--- .../catalina/webresources/AbstractTestFileResourceSet.java | 2 +- .../catalina/webresources/AbstractTestResourceSet.java | 6 +++--- .../org/apache/catalina/webresources/TestDirResourceSet.java | 2 +- .../catalina/webresources/TestDirResourceSetInternal.java| 2 +- .../catalina/webresources/TestDirResourceSetMount.java | 2 +- .../catalina/webresources/TestDirResourceSetReadOnly.java| 2 +- .../catalina/webresources/TestDirResourceSetVirtual.java | 2 +- .../org/apache/catalina/webresources/TestJarResourceSet.java | 2 +- .../catalina/webresources/TestJarResourceSetInternal.java| 2 +- .../catalina/webresources/TestJarResourceSetMount.java | 2 +- test/org/apache/tomcat/util/net/TestSocketBufferHandler.java | 4 ++-- webapps/docs/jndi-resources-howto.xml| 4 ++-- 27 files changed, 40 insertions(+), 40 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/03: writeable -> writable for consistency
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 29c45d750fbfce7f474f3011ba0772310f366dba
Author: Mark Thomas
AuthorDate: Mon Dec 6 08:00:30 2021 +
writeable -> writable for consistency
Excludes MBean descriptors as DTD uses writeable
---
java/jakarta/el/ArrayELResolver.java | 2 +-
java/jakarta/el/BeanELResolver.java | 2 +-
java/jakarta/el/ListELResolver.java | 2 +-
java/jakarta/el/LocalStrings.properties | 2 +-
java/jakarta/el/LocalStrings_fr.properties | 2 +-
java/jakarta/el/LocalStrings_ja.properties | 2 +-
java/jakarta/el/LocalStrings_ko.properties | 2 +-
java/jakarta/el/LocalStrings_zh_CN.properties| 2 +-
java/jakarta/el/MapELResolver.java | 2 +-
java/jakarta/el/ResourceBundleELResolver.java| 2 +-
java/jakarta/el/StaticFieldELResolver.java | 2 +-
java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java | 12 ++--
java/org/apache/coyote/http2/Http2UpgradeHandler.java| 4 ++--
java/org/apache/tomcat/util/net/SecureNioChannel.java| 6 +++---
.../catalina/webresources/AbstractTestFileResourceSet.java | 2 +-
.../catalina/webresources/AbstractTestResourceSet.java | 6 +++---
.../org/apache/catalina/webresources/TestDirResourceSet.java | 2 +-
.../catalina/webresources/TestDirResourceSetInternal.java| 2 +-
.../catalina/webresources/TestDirResourceSetMount.java | 2 +-
.../catalina/webresources/TestDirResourceSetReadOnly.java| 2 +-
.../catalina/webresources/TestDirResourceSetVirtual.java | 2 +-
.../org/apache/catalina/webresources/TestJarResourceSet.java | 2 +-
.../catalina/webresources/TestJarResourceSetInternal.java| 2 +-
.../catalina/webresources/TestJarResourceSetMount.java | 2 +-
test/org/apache/tomcat/util/net/TestSocketBufferHandler.java | 4 ++--
webapps/docs/jndi-resources-howto.xml| 4 ++--
26 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/java/jakarta/el/ArrayELResolver.java
b/java/jakarta/el/ArrayELResolver.java
index c9a0aff..d8d4ff9 100644
--- a/java/jakarta/el/ArrayELResolver.java
+++ b/java/jakarta/el/ArrayELResolver.java
@@ -84,7 +84,7 @@ public class ArrayELResolver extends ELResolver {
if (this.readOnly) {
throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
}
int idx = coerce(property);
diff --git a/java/jakarta/el/BeanELResolver.java
b/java/jakarta/el/BeanELResolver.java
index 81a229b..b39fa6d 100644
--- a/java/jakarta/el/BeanELResolver.java
+++ b/java/jakarta/el/BeanELResolver.java
@@ -111,7 +111,7 @@ public class BeanELResolver extends ELResolver {
if (this.readOnly) {
throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
}
Method m = this.property(context, base, property).write(context, base);
diff --git a/java/jakarta/el/ListELResolver.java
b/java/jakarta/el/ListELResolver.java
index de50fdf..c894bea 100644
--- a/java/jakarta/el/ListELResolver.java
+++ b/java/jakarta/el/ListELResolver.java
@@ -95,7 +95,7 @@ public class ListELResolver extends ELResolver {
if (this.readOnly) {
throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
}
int idx = coerce(property);
diff --git a/java/jakarta/el/LocalStrings.properties
b/java/jakarta/el/LocalStrings.properties
index 2d3f492..068877d 100644
--- a/java/jakarta/el/LocalStrings.properties
+++ b/java/jakarta/el/LocalStrings.properties
@@ -46,7 +46,7 @@ propertyWriteError=Error writing [{1}] on type [{0}]
staticFieldELResolver.methodNotFound=No matching public static method named
[{0}] found on class [{1}]
staticFieldELResolver.notFound=No public static field named [{0}] was found on
exported class [{1}]
-staticFieldELResolver.notWriteable=Writing to static fields (in this case
field [{0}] on class [{1}]) is not permitted
+staticFieldELResolver.notWritable=Writing to static fields (in this case field
[{0}] on class [{1}]) is not permitted
util.method.ambiguous=Unable to find unambiguous method: {0}.{1}({2})
util.method.notfound=Method not found: {0}.{1}({2})
diff --git
