Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint
Am 2021-05-25 um 10:06 schrieb Mark Thomas: On 25/05/2021 09:03, Michael Osipov wrote: Am 2021-05-25 um 09:44 schrieb Mark Thomas: On 25/05/2021 08:27, Michael Osipov wrote: Am 2021-05-24 um 20:55 schrieb Mark Thomas: On 24/05/2021 18:43, Rémy Maucherat wrote: On Mon, May 24, 2021 at 6:34 PM wrote: This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 620e06c Remove code deprecated in 10.1.x apart from the APR Endpoint 620e06c is described below commit 620e06c468a02ca98dc4beacf556dd12d2440877 Author: Mark Thomas AuthorDate: Mon May 24 17:34:09 2021 +0100 Remove code deprecated in 10.1.x apart from the APR Endpoint Ah, it's *that* APR time again :) Indeed. My plan was to give it a few days now folks have been reminded that this is going to happen and then do the APR removal in a separate commit. I have an important fix for APR on Windows which affects also Tomcat as well. A very subtile one. Can you hold off for a moment? I will prepare a decent decription for dev@tomcat.a.o today and already have a suitable fix for it. What is the benefit of holding off on the removal of the APR endpoint from 10.1.x? Just for clarification, 10.x on main will move to 10.1.x and APR will only run on 9 and 8.5? Correct. 10.1.x will continue to support the use of the Tomcat Native Connector (i.e. the native library) to provide OpenSSL support for NIO and NIO2. The plan is that version 2 of that library will be significantly reduced in scope to only provide the functionality necessary to hook into OpenSSL. Alright, please decide yourself whether this should go into 10.x [1] for those who want branch off/retain APR here. Otherwise I will provide a polished patch for < 10. Michael [1] https://github.com/michael-o/tomcat/commit/5393bcb991b924a18169ba34264ec2bc5c009b22 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint
On 25/05/2021 09:03, Michael Osipov wrote: Am 2021-05-25 um 09:44 schrieb Mark Thomas: On 25/05/2021 08:27, Michael Osipov wrote: Am 2021-05-24 um 20:55 schrieb Mark Thomas: On 24/05/2021 18:43, Rémy Maucherat wrote: On Mon, May 24, 2021 at 6:34 PM wrote: This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 620e06c Remove code deprecated in 10.1.x apart from the APR Endpoint 620e06c is described below commit 620e06c468a02ca98dc4beacf556dd12d2440877 Author: Mark Thomas AuthorDate: Mon May 24 17:34:09 2021 +0100 Remove code deprecated in 10.1.x apart from the APR Endpoint Ah, it's *that* APR time again :) Indeed. My plan was to give it a few days now folks have been reminded that this is going to happen and then do the APR removal in a separate commit. I have an important fix for APR on Windows which affects also Tomcat as well. A very subtile one. Can you hold off for a moment? I will prepare a decent decription for dev@tomcat.a.o today and already have a suitable fix for it. What is the benefit of holding off on the removal of the APR endpoint from 10.1.x? Just for clarification, 10.x on main will move to 10.1.x and APR will only run on 9 and 8.5? Correct. 10.1.x will continue to support the use of the Tomcat Native Connector (i.e. the native library) to provide OpenSSL support for NIO and NIO2. The plan is that version 2 of that library will be significantly reduced in scope to only provide the functionality necessary to hook into OpenSSL. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint
Am 2021-05-25 um 09:44 schrieb Mark Thomas: On 25/05/2021 08:27, Michael Osipov wrote: Am 2021-05-24 um 20:55 schrieb Mark Thomas: On 24/05/2021 18:43, Rémy Maucherat wrote: On Mon, May 24, 2021 at 6:34 PM wrote: This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 620e06c Remove code deprecated in 10.1.x apart from the APR Endpoint 620e06c is described below commit 620e06c468a02ca98dc4beacf556dd12d2440877 Author: Mark Thomas AuthorDate: Mon May 24 17:34:09 2021 +0100 Remove code deprecated in 10.1.x apart from the APR Endpoint Ah, it's *that* APR time again :) Indeed. My plan was to give it a few days now folks have been reminded that this is going to happen and then do the APR removal in a separate commit. I have an important fix for APR on Windows which affects also Tomcat as well. A very subtile one. Can you hold off for a moment? I will prepare a decent decription for dev@tomcat.a.o today and already have a suitable fix for it. What is the benefit of holding off on the removal of the APR endpoint from 10.1.x? Just for clarification, 10.x on main will move to 10.1.x and APR will only run on 9 and 8.5? M - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint
On 25/05/2021 08:27, Michael Osipov wrote: Am 2021-05-24 um 20:55 schrieb Mark Thomas: On 24/05/2021 18:43, Rémy Maucherat wrote: On Mon, May 24, 2021 at 6:34 PM wrote: This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 620e06c Remove code deprecated in 10.1.x apart from the APR Endpoint 620e06c is described below commit 620e06c468a02ca98dc4beacf556dd12d2440877 Author: Mark Thomas AuthorDate: Mon May 24 17:34:09 2021 +0100 Remove code deprecated in 10.1.x apart from the APR Endpoint Ah, it's *that* APR time again :) Indeed. My plan was to give it a few days now folks have been reminded that this is going to happen and then do the APR removal in a separate commit. I have an important fix for APR on Windows which affects also Tomcat as well. A very subtile one. Can you hold off for a moment? I will prepare a decent decription for dev@tomcat.a.o today and already have a suitable fix for it. What is the benefit of holding off on the removal of the APR endpoint from 10.1.x? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint
Am 2021-05-24 um 20:55 schrieb Mark Thomas: On 24/05/2021 18:43, Rémy Maucherat wrote: On Mon, May 24, 2021 at 6:34 PM wrote: This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 620e06c Remove code deprecated in 10.1.x apart from the APR Endpoint 620e06c is described below commit 620e06c468a02ca98dc4beacf556dd12d2440877 Author: Mark Thomas AuthorDate: Mon May 24 17:34:09 2021 +0100 Remove code deprecated in 10.1.x apart from the APR Endpoint Ah, it's *that* APR time again :) Indeed. My plan was to give it a few days now folks have been reminded that this is going to happen and then do the APR removal in a separate commit. I have an important fix for APR on Windows which affects also Tomcat as well. A very subtile one. Can you hold off for a moment? I will prepare a decent decription for dev@tomcat.a.o today and already have a suitable fix for it. Michael - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint
On 24/05/2021 18:43, Rémy Maucherat wrote: On Mon, May 24, 2021 at 6:34 PM wrote: This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 620e06c Remove code deprecated in 10.1.x apart from the APR Endpoint 620e06c is described below commit 620e06c468a02ca98dc4beacf556dd12d2440877 Author: Mark Thomas AuthorDate: Mon May 24 17:34:09 2021 +0100 Remove code deprecated in 10.1.x apart from the APR Endpoint Ah, it's *that* APR time again :) Indeed. My plan was to give it a few days now folks have been reminded that this is going to happen and then do the APR removal in a separate commit. Also another question is if this branch moves to Java 11. Has it been decided officially for Jakarta 10 ? No formal decision as far as I am aware. I think the conversation is heading towards Java 11 minimum. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint
On Mon, May 24, 2021 at 6:34 PM wrote: > This is an automated email from the ASF dual-hosted git repository. > > markt pushed a commit to branch main > in repository https://gitbox.apache.org/repos/asf/tomcat.git > > > The following commit(s) were added to refs/heads/main by this push: > new 620e06c Remove code deprecated in 10.1.x apart from the APR > Endpoint > 620e06c is described below > > commit 620e06c468a02ca98dc4beacf556dd12d2440877 > Author: Mark Thomas > AuthorDate: Mon May 24 17:34:09 2021 +0100 > > Remove code deprecated in 10.1.x apart from the APR Endpoint > > Ah, it's *that* APR time again :) Also another question is if this branch moves to Java 11. Has it been decided officially for Jakarta 10 ? Rémy
[tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint
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 620e06c Remove code deprecated in 10.1.x apart from the APR Endpoint
620e06c is described below
commit 620e06c468a02ca98dc4beacf556dd12d2440877
Author: Mark Thomas
AuthorDate: Mon May 24 17:34:09 2021 +0100
Remove code deprecated in 10.1.x apart from the APR Endpoint
---
.../apache/catalina/ha/deploy/FarmWarDeployer.java | 30 ---
.../apache/catalina/manager/ManagerServlet.java| 36 -
java/org/apache/catalina/realm/JNDIRealm.java | 24 --
java/org/apache/catalina/startup/HostConfig.java | 51
java/org/apache/tomcat/util/net/Acceptor.java | 14
.../apache/tomcat/util/net/SSLImplementation.java | 17 +---
.../tomcat/util/net/jsse/JSSEImplementation.java | 6 --
.../apache/tomcat/util/net/jsse/JSSESupport.java | 11 ---
.../util/net/openssl/OpenSSLImplementation.java| 6 --
java/org/apache/tomcat/websocket/Util.java | 19 -
java/org/apache/tomcat/websocket/WsSession.java| 94 --
.../tomcat/websocket/pojo/PojoMethodMapping.java | 19 -
webapps/docs/changelog.xml | 3 +
13 files changed, 4 insertions(+), 326 deletions(-)
diff --git a/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
b/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
index 4912b7f..c16c3e0 100644
--- a/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
+++ b/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
@@ -584,36 +584,6 @@ public class FarmWarDeployer extends ClusterListener
}
/**
- * Verified if a context is being services.
- * @param name The context name
- * @return true if the context is being serviced
- * @throws Exception Error invoking the deployer
- * @deprecated Unused. Will be removed in Tomcat 10.1.x onwards.
- */
-@Deprecated
-protected boolean isServiced(String name) throws Exception {
-String[] params = { name };
-String[] signature = { "java.lang.String" };
-Boolean result = (Boolean) mBeanServer.invoke(oname, "isServiced",
-params, signature);
-return result.booleanValue();
-}
-
-/**
- * Mark a context as being services.
- * @param name The context name
- * @throws Exception Error invoking the deployer
- * @deprecated Unused. Will be removed in Tomcat 10.1.x onwards.
- * Use {@link #tryAddServiced}
- */
-@Deprecated
-protected void addServiced(String name) throws Exception {
-String[] params = { name };
-String[] signature = { "java.lang.String" };
-mBeanServer.invoke(oname, "addServiced", params, signature);
-}
-
-/**
* Attempt to mark a context as being serviced
* @param name The context name
* @return {@code true} if the application was marked as being serviced and
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java
b/java/org/apache/catalina/manager/ManagerServlet.java
index 37cff7b..1b97692 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -1572,42 +1572,6 @@ public class ManagerServlet extends HttpServlet
implements ContainerServlet {
/**
- * Invoke the isServiced method on the deployer.
- *
- * @param name The webapp name
- * @return true if a webapp with that name is being serviced
- * @throws Exception Propagate JMX invocation error
- * @deprecated Unused. Will be removed in Tomcat 10.1.x onwards.
- */
-@Deprecated
-protected boolean isServiced(String name)
-throws Exception {
-String[] params = { name };
-String[] signature = { "java.lang.String" };
-Boolean result =
-(Boolean) mBeanServer.invoke(oname, "isServiced", params,
signature);
-return result.booleanValue();
-}
-
-
-/**
- * Invoke the addServiced method on the deployer.
- *
- * @param name The webapp name
- * @throws Exception Propagate JMX invocation error
- * @deprecated Unused. Will be removed in Tomcat 10.1.x onwards.
- * Use {@link #tryAddServiced}
- */
-@Deprecated
-protected void addServiced(String name)
-throws Exception {
-String[] params = { name };
-String[] signature = { "java.lang.String" };
-mBeanServer.invoke(oname, "addServiced", params, signature);
-}
-
-
-/**
* Attempt to mark a context as being serviced
* @param name The context name
* @return {@code true} if the application was marked as being serviced and
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java
b/java/org/apache/catalina/realm/JNDIRealm.java
index b6318b4..7650c4e 100644
