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 f59e6ab4a5 Backport the Tomcat Native deprecation warnings
f59e6ab4a5 is described below
commit f59e6ab4a55dc244d14582c0458f01b0f6a790a1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue May 31 10:09:33 2022 +0100
Backport the Tomcat Native deprecation warnings
Once 10.1.x is stable and 10.0.x is EOL, 9.0.x will be the version
before 10.1.x so it needs to deprecate the APR/Native functionality that
will be removed between 9.0.x and 10.1.x
---
java/org/apache/catalina/connector/Connector.java | 2 ++
java/org/apache/coyote/ProtocolHandler.java | 4 +++
java/org/apache/coyote/ajp/AjpAprProtocol.java | 4 +++
.../apache/coyote/http11/Http11AprProtocol.java | 4 +++
java/org/apache/tomcat/jni/Address.java | 6 ++++
java/org/apache/tomcat/jni/Directory.java | 6 ++++
java/org/apache/tomcat/jni/File.java | 6 ++++
java/org/apache/tomcat/jni/FileInfo.java | 6 ++++
java/org/apache/tomcat/jni/Global.java | 6 ++++
java/org/apache/tomcat/jni/Local.java | 6 ++++
java/org/apache/tomcat/jni/Lock.java | 6 ++++
java/org/apache/tomcat/jni/Mmap.java | 6 ++++
java/org/apache/tomcat/jni/Multicast.java | 6 ++++
java/org/apache/tomcat/jni/OS.java | 6 ++++
java/org/apache/tomcat/jni/Poll.java | 6 ++++
java/org/apache/tomcat/jni/PoolCallback.java | 6 ++++
java/org/apache/tomcat/jni/Proc.java | 6 ++++
java/org/apache/tomcat/jni/ProcErrorCallback.java | 6 ++++
java/org/apache/tomcat/jni/Procattr.java | 6 ++++
java/org/apache/tomcat/jni/Registry.java | 6 ++++
java/org/apache/tomcat/jni/SSLSocket.java | 6 ++++
java/org/apache/tomcat/jni/Shm.java | 6 ++++
java/org/apache/tomcat/jni/Sockaddr.java | 6 ++++
java/org/apache/tomcat/jni/Socket.java | 6 ++++
java/org/apache/tomcat/jni/Status.java | 6 ++++
java/org/apache/tomcat/jni/Stdlib.java | 6 ++++
java/org/apache/tomcat/jni/Thread.java | 6 ++++
java/org/apache/tomcat/jni/Time.java | 6 ++++
java/org/apache/tomcat/jni/User.java | 6 ++++
java/org/apache/tomcat/util/net/AprEndpoint.java | 4 +++
java/org/apache/tomcat/util/net/AprSSLSupport.java | 4 +++
test/org/apache/tomcat/jni/TestFile.java | 9 +++--
test/org/apache/tomcat/jni/TestSocketServer.java | 5 +++
.../jni/TestSocketServerAnyLocalAddress.java | 5 +++
.../apache/tomcat/util/net/TestXxxEndpoint.java | 40 +++++++++++++---------
35 files changed, 213 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index 4c661f0d3d..9148495f0b 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -624,6 +624,7 @@ public class Connector extends LifecycleMBeanBase {
/**
* @return the Coyote protocol handler in use.
*/
+ @SuppressWarnings("deprecation")
public String getProtocol() {
boolean apr = AprStatus.getUseAprConnector();
if ((!apr &&
org.apache.coyote.http11.Http11NioProtocol.class.getName().equals(protocolHandlerClassName))
@@ -1001,6 +1002,7 @@ public class Connector extends LifecycleMBeanBase {
}
+ @SuppressWarnings("deprecation")
@Override
protected void initInternal() throws LifecycleException {
diff --git a/java/org/apache/coyote/ProtocolHandler.java
b/java/org/apache/coyote/ProtocolHandler.java
index 5c7a9f9896..36d7eac602 100644
--- a/java/org/apache/coyote/ProtocolHandler.java
+++ b/java/org/apache/coyote/ProtocolHandler.java
@@ -153,7 +153,10 @@ public interface ProtocolHandler {
*
* @return <code>true</code> if this Protocol Handler requires the
* APR/native library, otherwise <code>false</code>
+ *
+ * @deprecated This method will be removed in Tomcat 10.1.x onwards
*/
+ @Deprecated
public boolean isAprRequired();
@@ -230,6 +233,7 @@ public interface ProtocolHandler {
* @throws NoSuchMethodException Exception occurred
* @throws SecurityException Exception occurred
*/
+ @SuppressWarnings("deprecation")
public static ProtocolHandler create(String protocol, boolean apr)
throws ClassNotFoundException, InstantiationException,
IllegalAccessException,
IllegalArgumentException, InvocationTargetException,
NoSuchMethodException, SecurityException {
diff --git a/java/org/apache/coyote/ajp/AjpAprProtocol.java
b/java/org/apache/coyote/ajp/AjpAprProtocol.java
index 92ad9c0504..34e34ebe42 100644
--- a/java/org/apache/coyote/ajp/AjpAprProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpAprProtocol.java
@@ -23,7 +23,11 @@ import org.apache.tomcat.util.net.AprEndpoint;
/**
* This the APR/native based protocol handler implementation for AJP.
+ *
+ * @deprecated The APR/Native Connector will be removed in Tomcat 10.1.x
+ * onwards.
*/
+@Deprecated
public class AjpAprProtocol extends AbstractAjpProtocol<Long> {
private static final Log log = LogFactory.getLog(AjpAprProtocol.class);
diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java
b/java/org/apache/coyote/http11/Http11AprProtocol.java
index 0311fb48af..b3e681d4f0 100644
--- a/java/org/apache/coyote/http11/Http11AprProtocol.java
+++ b/java/org/apache/coyote/http11/Http11AprProtocol.java
@@ -28,7 +28,11 @@ import org.apache.tomcat.util.net.AprEndpoint;
*
* @author Remy Maucherat
* @author Costin Manolache
+ *
+ * @deprecated The APR/Native Connector will be removed in Tomcat 10.1.x
+ * onwards.
*/
+@Deprecated
public class Http11AprProtocol extends AbstractHttp11Protocol<Long> {
private static final Log log = LogFactory.getLog(Http11AprProtocol.class);
diff --git a/java/org/apache/tomcat/jni/Address.java
b/java/org/apache/tomcat/jni/Address.java
index 38a08f8ded..acac8008aa 100644
--- a/java/org/apache/tomcat/jni/Address.java
+++ b/java/org/apache/tomcat/jni/Address.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** Address
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Address {
public static final String APR_ANYADDR = "0.0.0.0";
diff --git a/java/org/apache/tomcat/jni/Directory.java
b/java/org/apache/tomcat/jni/Directory.java
index 2f1f87dd56..473b87b71a 100644
--- a/java/org/apache/tomcat/jni/Directory.java
+++ b/java/org/apache/tomcat/jni/Directory.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** Directory
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Directory {
/**
diff --git a/java/org/apache/tomcat/jni/File.java
b/java/org/apache/tomcat/jni/File.java
index af40c9c2f0..3e0c3b1bc7 100644
--- a/java/org/apache/tomcat/jni/File.java
+++ b/java/org/apache/tomcat/jni/File.java
@@ -21,7 +21,13 @@ import java.nio.ByteBuffer;
/** File
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class File {
/** Open the file for reading */
diff --git a/java/org/apache/tomcat/jni/FileInfo.java
b/java/org/apache/tomcat/jni/FileInfo.java
index d5aa0e08f5..34b67ff01c 100644
--- a/java/org/apache/tomcat/jni/FileInfo.java
+++ b/java/org/apache/tomcat/jni/FileInfo.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** Fileinfo
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class FileInfo {
/** Allocates memory and closes lingering handles in the specified pool */
diff --git a/java/org/apache/tomcat/jni/Global.java
b/java/org/apache/tomcat/jni/Global.java
index a5e922818d..7da6740f88 100644
--- a/java/org/apache/tomcat/jni/Global.java
+++ b/java/org/apache/tomcat/jni/Global.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** Global
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Global {
/**
diff --git a/java/org/apache/tomcat/jni/Local.java
b/java/org/apache/tomcat/jni/Local.java
index 0e2fdd098c..fd0f3bb064 100644
--- a/java/org/apache/tomcat/jni/Local.java
+++ b/java/org/apache/tomcat/jni/Local.java
@@ -20,7 +20,13 @@ package org.apache.tomcat.jni;
* Local socket.
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Local {
/**
diff --git a/java/org/apache/tomcat/jni/Lock.java
b/java/org/apache/tomcat/jni/Lock.java
index 166727c25d..9803197cf3 100644
--- a/java/org/apache/tomcat/jni/Lock.java
+++ b/java/org/apache/tomcat/jni/Lock.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** Lock
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Lock {
/**
diff --git a/java/org/apache/tomcat/jni/Mmap.java
b/java/org/apache/tomcat/jni/Mmap.java
index aae41888f3..16a88a151d 100644
--- a/java/org/apache/tomcat/jni/Mmap.java
+++ b/java/org/apache/tomcat/jni/Mmap.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** Mmap
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Mmap {
/** MMap opened for reading */
public static final int APR_MMAP_READ = 1;
diff --git a/java/org/apache/tomcat/jni/Multicast.java
b/java/org/apache/tomcat/jni/Multicast.java
index c983c8305a..fd090fdc2e 100644
--- a/java/org/apache/tomcat/jni/Multicast.java
+++ b/java/org/apache/tomcat/jni/Multicast.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** Multicast
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Multicast {
/**
diff --git a/java/org/apache/tomcat/jni/OS.java
b/java/org/apache/tomcat/jni/OS.java
index dc13210c7e..48f7192c9b 100644
--- a/java/org/apache/tomcat/jni/OS.java
+++ b/java/org/apache/tomcat/jni/OS.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** OS
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class OS {
/* OS Enums */
diff --git a/java/org/apache/tomcat/jni/Poll.java
b/java/org/apache/tomcat/jni/Poll.java
index 112d02eb64..54f422168a 100644
--- a/java/org/apache/tomcat/jni/Poll.java
+++ b/java/org/apache/tomcat/jni/Poll.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** Poll
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Poll {
/**
diff --git a/java/org/apache/tomcat/jni/PoolCallback.java
b/java/org/apache/tomcat/jni/PoolCallback.java
index aa42e4e699..c709979fce 100644
--- a/java/org/apache/tomcat/jni/PoolCallback.java
+++ b/java/org/apache/tomcat/jni/PoolCallback.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** PoolCallback Interface
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public interface PoolCallback {
/**
diff --git a/java/org/apache/tomcat/jni/Proc.java
b/java/org/apache/tomcat/jni/Proc.java
index 545e2dd685..4ea678b6ac 100644
--- a/java/org/apache/tomcat/jni/Proc.java
+++ b/java/org/apache/tomcat/jni/Proc.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** Proc
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Proc {
/*
diff --git a/java/org/apache/tomcat/jni/ProcErrorCallback.java
b/java/org/apache/tomcat/jni/ProcErrorCallback.java
index 9ad83cb4c0..a9421bc034 100644
--- a/java/org/apache/tomcat/jni/ProcErrorCallback.java
+++ b/java/org/apache/tomcat/jni/ProcErrorCallback.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** ProcErrorCallback Interface
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public interface ProcErrorCallback {
/**
diff --git a/java/org/apache/tomcat/jni/Procattr.java
b/java/org/apache/tomcat/jni/Procattr.java
index 8a4be2c37b..40800d1184 100644
--- a/java/org/apache/tomcat/jni/Procattr.java
+++ b/java/org/apache/tomcat/jni/Procattr.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** Procattr
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Procattr {
/**
diff --git a/java/org/apache/tomcat/jni/Registry.java
b/java/org/apache/tomcat/jni/Registry.java
index 7726357aee..7a535f9747 100644
--- a/java/org/apache/tomcat/jni/Registry.java
+++ b/java/org/apache/tomcat/jni/Registry.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** Windows Registry support
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Registry {
/* Registry Enums */
diff --git a/java/org/apache/tomcat/jni/SSLSocket.java
b/java/org/apache/tomcat/jni/SSLSocket.java
index c1cd328430..2e1b316ed0 100644
--- a/java/org/apache/tomcat/jni/SSLSocket.java
+++ b/java/org/apache/tomcat/jni/SSLSocket.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** SSL Socket
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class SSLSocket {
/**
diff --git a/java/org/apache/tomcat/jni/Shm.java
b/java/org/apache/tomcat/jni/Shm.java
index 27e4902b43..f62d4aa39c 100644
--- a/java/org/apache/tomcat/jni/Shm.java
+++ b/java/org/apache/tomcat/jni/Shm.java
@@ -21,7 +21,13 @@ import java.nio.ByteBuffer;
/** Shm
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Shm {
/**
diff --git a/java/org/apache/tomcat/jni/Sockaddr.java
b/java/org/apache/tomcat/jni/Sockaddr.java
index dd15af887d..9d138ec36e 100644
--- a/java/org/apache/tomcat/jni/Sockaddr.java
+++ b/java/org/apache/tomcat/jni/Sockaddr.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** Sockaddr
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Sockaddr {
/** The pool to use... */
diff --git a/java/org/apache/tomcat/jni/Socket.java
b/java/org/apache/tomcat/jni/Socket.java
index dbf27624ea..cbc2a01c2d 100644
--- a/java/org/apache/tomcat/jni/Socket.java
+++ b/java/org/apache/tomcat/jni/Socket.java
@@ -22,7 +22,13 @@ import java.nio.ByteBuffer;
/** Socket
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Socket {
/* Standard socket defines */
diff --git a/java/org/apache/tomcat/jni/Status.java
b/java/org/apache/tomcat/jni/Status.java
index eee9588006..004340cdae 100644
--- a/java/org/apache/tomcat/jni/Status.java
+++ b/java/org/apache/tomcat/jni/Status.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** Status
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Status {
/**
diff --git a/java/org/apache/tomcat/jni/Stdlib.java
b/java/org/apache/tomcat/jni/Stdlib.java
index fbc8cfd5ea..18e8fb2173 100644
--- a/java/org/apache/tomcat/jni/Stdlib.java
+++ b/java/org/apache/tomcat/jni/Stdlib.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** Stdlib
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Stdlib {
/**
diff --git a/java/org/apache/tomcat/jni/Thread.java
b/java/org/apache/tomcat/jni/Thread.java
index f05fdb681f..277cfb61a0 100644
--- a/java/org/apache/tomcat/jni/Thread.java
+++ b/java/org/apache/tomcat/jni/Thread.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** Thread
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Thread {
/**
diff --git a/java/org/apache/tomcat/jni/Time.java
b/java/org/apache/tomcat/jni/Time.java
index af9107aa10..24b054020a 100644
--- a/java/org/apache/tomcat/jni/Time.java
+++ b/java/org/apache/tomcat/jni/Time.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** Time
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class Time {
/** number of microseconds per second */
diff --git a/java/org/apache/tomcat/jni/User.java
b/java/org/apache/tomcat/jni/User.java
index b5fadfbc48..b9a0547e89 100644
--- a/java/org/apache/tomcat/jni/User.java
+++ b/java/org/apache/tomcat/jni/User.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
/** User
*
* @author Mladen Turk
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x / Tomcat Native 2.x onwards to only include those
+ * components required to provide OpenSSL integration with the NIO
+ * and NIO2 connectors.
*/
+@Deprecated
public class User {
/**
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index c02e90fc09..5b7c457880 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -80,7 +80,11 @@ import org.apache.tomcat.util.net.openssl.OpenSSLUtil;
*
* @author Mladen Turk
* @author Remy Maucherat
+ *
+ * @deprecated The APR/Native Connector will be removed in Tomcat 10.1.x
+ * onwards.
*/
+@Deprecated
public class AprEndpoint extends AbstractEndpoint<Long,Long> implements
SNICallBack {
// -------------------------------------------------------------- Constants
diff --git a/java/org/apache/tomcat/util/net/AprSSLSupport.java
b/java/org/apache/tomcat/util/net/AprSSLSupport.java
index f36eaf4903..3262df9123 100644
--- a/java/org/apache/tomcat/util/net/AprSSLSupport.java
+++ b/java/org/apache/tomcat/util/net/AprSSLSupport.java
@@ -28,7 +28,11 @@ import org.apache.tomcat.jni.SSL;
* <p>
* TODO: Add a mechanism (or figure out how to use what we already have) to
* invalidate the session.
+ *
+ * @deprecated The APR/Native Connector will be removed in Tomcat 10.1.x
+ * onwards.
*/
+@Deprecated
public class AprSSLSupport implements SSLSupport {
private final AprEndpoint.AprSocketWrapper socketWrapper;
diff --git a/test/org/apache/tomcat/jni/TestFile.java
b/test/org/apache/tomcat/jni/TestFile.java
index 433939f226..ca72e65294 100644
--- a/test/org/apache/tomcat/jni/TestFile.java
+++ b/test/org/apache/tomcat/jni/TestFile.java
@@ -19,7 +19,12 @@ package org.apache.tomcat.jni;
import org.junit.Assert;
import org.junit.Test;
-
+/*
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x onwards to only those components required to provide
+ * OpenSSL integration with the NIO and NIO2 connectors.
+ */
+@Deprecated
public class TestFile extends AbstractJniTest {
@Test
@@ -64,4 +69,4 @@ public class TestFile extends AbstractJniTest {
"\n}";
return result;
}
-}
\ No newline at end of file
+}
diff --git a/test/org/apache/tomcat/jni/TestSocketServer.java
b/test/org/apache/tomcat/jni/TestSocketServer.java
index 059add30fb..1a6d4d6ada 100644
--- a/test/org/apache/tomcat/jni/TestSocketServer.java
+++ b/test/org/apache/tomcat/jni/TestSocketServer.java
@@ -34,7 +34,12 @@ import org.junit.Test;
* It is known that this larger error margin is required for Windows 10. It may
* be worth revisiting the choice of error margin once that platform is no
* longer supported.
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x onwards to only those components required to provide
+ * OpenSSL integration with the NIO and NIO2 connectors.
*/
+@Deprecated
public class TestSocketServer extends AbstractJniTest {
private static final String HOST = "localhost";
diff --git a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
index c983608fbe..8739a1953a 100644
--- a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
+++ b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
@@ -30,7 +30,12 @@ import org.junit.Test;
/**
* Tests for server-side sockets using any local address (0.0.0.0 or ::).
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x onwards to only those components required to provide
+ * OpenSSL integration with the NIO and NIO2 connectors.
*/
+@Deprecated
public class TestSocketServerAnyLocalAddress extends AbstractJniTest {
// Excessive but allows for slow systems
diff --git a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
index 19cd4ce214..f9777b085f 100644
--- a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
+++ b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
@@ -30,10 +30,7 @@ import org.junit.Test;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.tomcat.jni.Address;
-import org.apache.tomcat.jni.OS;
import org.apache.tomcat.jni.Pool;
-import org.apache.tomcat.jni.Socket;
import org.apache.tomcat.util.compat.JreCompat;
/**
@@ -53,7 +50,12 @@ public class TestXxxEndpoint extends TomcatBaseTest {
}
}
- @SuppressWarnings("deprecation")
+ /*
+ * @deprecated The scope of the APR/Native Library will be reduced in
Tomcat
+ * 10.1.x onwards to only those components required to provide
+ * OpenSSL integration with the NIO and NIO2 connectors.
+ */
+ @Deprecated
private long createAprSocket(int port, long pool)
throws Exception {
/**
@@ -64,28 +66,28 @@ public class TestXxxEndpoint extends TomcatBaseTest {
String address = InetAddress.getByName("localhost").getHostAddress();
// Create the APR address that will be bound
- int family = Socket.APR_UNSPEC;
+ int family = org.apache.tomcat.jni.Socket.APR_UNSPEC;
long inetAddress = 0;
try {
- inetAddress = Address.info(address, family,
+ inetAddress = org.apache.tomcat.jni.Address.info(address, family,
port, 0, pool);
// Create the APR server socket
- serverSock = Socket.create(Address.getInfo(inetAddress).family,
- Socket.SOCK_STREAM,
- Socket.APR_PROTO_TCP, pool);
+ serverSock =
org.apache.tomcat.jni.Socket.create(org.apache.tomcat.jni.Address.getInfo(inetAddress).family,
+ org.apache.tomcat.jni.Socket.SOCK_STREAM,
+ org.apache.tomcat.jni.Socket.APR_PROTO_TCP, pool);
} catch (Exception ex) {
log.error("Could not create socket for address '" + address + "'");
return 0;
}
- if (OS.IS_UNIX) {
- Socket.optSet(serverSock, Socket.APR_SO_REUSEADDR, 1);
+ if (org.apache.tomcat.jni.OS.IS_UNIX) {
+ org.apache.tomcat.jni.Socket.optSet(serverSock,
org.apache.tomcat.jni.Socket.APR_SO_REUSEADDR, 1);
}
// Deal with the firewalls that tend to drop the inactive sockets
- Socket.optSet(serverSock, Socket.APR_SO_KEEPALIVE, 1);
+ org.apache.tomcat.jni.Socket.optSet(serverSock,
org.apache.tomcat.jni.Socket.APR_SO_KEEPALIVE, 1);
// Bind the server socket
- int ret = Socket.bind(serverSock, inetAddress);
+ int ret = org.apache.tomcat.jni.Socket.bind(serverSock, inetAddress);
if (ret != 0) {
log.error("Could not bind: " +
org.apache.tomcat.jni.Error.strerror(ret));
throw (new Exception(org.apache.tomcat.jni.Error.strerror(ret)));
@@ -93,11 +95,17 @@ public class TestXxxEndpoint extends TomcatBaseTest {
return serverSock;
}
+ /*
+ * @deprecated The scope of the APR/Native Library will be reduced in
Tomcat
+ * 10.1.x onwards to only those components required to provide
+ * OpenSSL integration with the NIO and NIO2 connectors.
+ */
+ @Deprecated
private void destroyAprSocket(long serverSock, long pool) {
if (serverSock != 0) {
- Socket.shutdown(serverSock, Socket.APR_SHUTDOWN_READWRITE);
- Socket.close(serverSock);
- Socket.destroy(serverSock);
+ org.apache.tomcat.jni.Socket.shutdown(serverSock,
org.apache.tomcat.jni.Socket.APR_SHUTDOWN_READWRITE);
+ org.apache.tomcat.jni.Socket.close(serverSock);
+ org.apache.tomcat.jni.Socket.destroy(serverSock);
}
if (pool != 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
