This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 9406b85 First pass at deprecation in org.apache.tomcat.jni
9406b85 is described below
commit 9406b8501abd6caf507f10aecbcdcc2fca110f81
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Dec 1 12:56:46 2020 +0000
First pass at deprecation in org.apache.tomcat.jni
The intention is to deprecate everything that is not used by the
NIO/NIO2 OpenSSL support. There may still be individual methods within
the remaining classes that are not used.
---
java/org/apache/tomcat/jni/Address.java | 5 +++
java/org/apache/tomcat/jni/Directory.java | 5 +++
java/org/apache/tomcat/jni/File.java | 5 +++
java/org/apache/tomcat/jni/FileInfo.java | 5 +++
java/org/apache/tomcat/jni/Global.java | 5 +++
java/org/apache/tomcat/jni/Local.java | 5 +++
java/org/apache/tomcat/jni/Lock.java | 5 +++
java/org/apache/tomcat/jni/Mmap.java | 5 +++
java/org/apache/tomcat/jni/Multicast.java | 5 +++
java/org/apache/tomcat/jni/OS.java | 5 +++
java/org/apache/tomcat/jni/Poll.java | 5 +++
java/org/apache/tomcat/jni/PoolCallback.java | 5 +++
java/org/apache/tomcat/jni/Proc.java | 5 +++
java/org/apache/tomcat/jni/ProcErrorCallback.java | 5 +++
java/org/apache/tomcat/jni/Procattr.java | 5 +++
java/org/apache/tomcat/jni/Registry.java | 5 +++
java/org/apache/tomcat/jni/SSLSocket.java | 5 +++
java/org/apache/tomcat/jni/Shm.java | 5 +++
java/org/apache/tomcat/jni/Sockaddr.java | 5 +++
java/org/apache/tomcat/jni/Socket.java | 5 +++
java/org/apache/tomcat/jni/Status.java | 5 +++
java/org/apache/tomcat/jni/Stdlib.java | 5 +++
java/org/apache/tomcat/jni/Thread.java | 5 +++
java/org/apache/tomcat/jni/Time.java | 5 +++
java/org/apache/tomcat/jni/User.java | 5 +++
test/org/apache/tomcat/jni/TestFile.java | 7 +++-
test/org/apache/tomcat/jni/TestSocketServer.java | 5 +++
.../jni/TestSocketServerAnyLocalAddress.java | 5 +++
.../apache/tomcat/util/net/TestXxxEndpoint.java | 45 ++++++++++++++--------
29 files changed, 169 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/tomcat/jni/Address.java
b/java/org/apache/tomcat/jni/Address.java
index 2310367..cabaabc 100644
--- a/java/org/apache/tomcat/jni/Address.java
+++ b/java/org/apache/tomcat/jni/Address.java
@@ -19,7 +19,12 @@ 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 onwards to only 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 8a94972..8eb6087 100644
--- a/java/org/apache/tomcat/jni/Directory.java
+++ b/java/org/apache/tomcat/jni/Directory.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 4ae5523..9128b62 100644
--- a/java/org/apache/tomcat/jni/File.java
+++ b/java/org/apache/tomcat/jni/File.java
@@ -22,7 +22,12 @@ import java.nio.ByteBuffer;
/** File
*
* @author Mladen Turk
+ *
+ * @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 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 9fb6bd3..9eeba1a 100644
--- a/java/org/apache/tomcat/jni/FileInfo.java
+++ b/java/org/apache/tomcat/jni/FileInfo.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 c1d1eb5..2a84f6b 100644
--- a/java/org/apache/tomcat/jni/Global.java
+++ b/java/org/apache/tomcat/jni/Global.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 50ed955..70eb500 100644
--- a/java/org/apache/tomcat/jni/Local.java
+++ b/java/org/apache/tomcat/jni/Local.java
@@ -21,7 +21,12 @@ 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 onwards to only 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 6bb789a..9e6c0fe 100644
--- a/java/org/apache/tomcat/jni/Lock.java
+++ b/java/org/apache/tomcat/jni/Lock.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 08bc795..b571be0 100644
--- a/java/org/apache/tomcat/jni/Mmap.java
+++ b/java/org/apache/tomcat/jni/Mmap.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 44d123b..315f1b6 100644
--- a/java/org/apache/tomcat/jni/Multicast.java
+++ b/java/org/apache/tomcat/jni/Multicast.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 c93a07b..eaa6faf 100644
--- a/java/org/apache/tomcat/jni/OS.java
+++ b/java/org/apache/tomcat/jni/OS.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 112d02e..0aa5c54 100644
--- a/java/org/apache/tomcat/jni/Poll.java
+++ b/java/org/apache/tomcat/jni/Poll.java
@@ -19,7 +19,12 @@ 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 onwards to only 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 5075a3e..4a2b3a0 100644
--- a/java/org/apache/tomcat/jni/PoolCallback.java
+++ b/java/org/apache/tomcat/jni/PoolCallback.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 cbae420..44c0ab7 100644
--- a/java/org/apache/tomcat/jni/Proc.java
+++ b/java/org/apache/tomcat/jni/Proc.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 60f53c8..a993a9a 100644
--- a/java/org/apache/tomcat/jni/ProcErrorCallback.java
+++ b/java/org/apache/tomcat/jni/ProcErrorCallback.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 88e97c6..d335063 100644
--- a/java/org/apache/tomcat/jni/Procattr.java
+++ b/java/org/apache/tomcat/jni/Procattr.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 209e02f..959e23f 100644
--- a/java/org/apache/tomcat/jni/Registry.java
+++ b/java/org/apache/tomcat/jni/Registry.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 2cc42f7..e8b221d 100644
--- a/java/org/apache/tomcat/jni/SSLSocket.java
+++ b/java/org/apache/tomcat/jni/SSLSocket.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 43c662c..bdf322c 100644
--- a/java/org/apache/tomcat/jni/Shm.java
+++ b/java/org/apache/tomcat/jni/Shm.java
@@ -22,7 +22,12 @@ import java.nio.ByteBuffer;
/** Shm
*
* @author Mladen Turk
+ *
+ * @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 Shm {
/**
diff --git a/java/org/apache/tomcat/jni/Sockaddr.java
b/java/org/apache/tomcat/jni/Sockaddr.java
index f5262a7..8e2ff60 100644
--- a/java/org/apache/tomcat/jni/Sockaddr.java
+++ b/java/org/apache/tomcat/jni/Sockaddr.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 976dd38..c02a843 100644
--- a/java/org/apache/tomcat/jni/Socket.java
+++ b/java/org/apache/tomcat/jni/Socket.java
@@ -23,7 +23,12 @@ import java.nio.ByteBuffer;
/** Socket
*
* @author Mladen Turk
+ *
+ * @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 Socket {
/* Standard socket defines */
diff --git a/java/org/apache/tomcat/jni/Status.java
b/java/org/apache/tomcat/jni/Status.java
index 56d9445..0440e80 100644
--- a/java/org/apache/tomcat/jni/Status.java
+++ b/java/org/apache/tomcat/jni/Status.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 b2fa630..e5a0412 100644
--- a/java/org/apache/tomcat/jni/Stdlib.java
+++ b/java/org/apache/tomcat/jni/Stdlib.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 7435bf3..0fb961b 100644
--- a/java/org/apache/tomcat/jni/Thread.java
+++ b/java/org/apache/tomcat/jni/Thread.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 22aeb25..7796d4e 100644
--- a/java/org/apache/tomcat/jni/Time.java
+++ b/java/org/apache/tomcat/jni/Time.java
@@ -20,7 +20,12 @@ 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 onwards to only 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 20bb762..7177ecc 100644
--- a/java/org/apache/tomcat/jni/User.java
+++ b/java/org/apache/tomcat/jni/User.java
@@ -20,7 +20,12 @@ 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 onwards to only those components required to provide
+ * OpenSSL integration with the NIO and NIO2 connectors.
*/
+@Deprecated
public class User {
/**
diff --git a/test/org/apache/tomcat/jni/TestFile.java
b/test/org/apache/tomcat/jni/TestFile.java
index 433939f..95bb10f 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
diff --git a/test/org/apache/tomcat/jni/TestSocketServer.java
b/test/org/apache/tomcat/jni/TestSocketServer.java
index 059add3..1a6d4d6 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 c983608..8739a19 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 ab08bf7..2db184f 100644
--- a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
+++ b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
@@ -26,12 +26,9 @@ 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.Error;
import org.apache.tomcat.jni.Library;
-import org.apache.tomcat.jni.OS;
import org.apache.tomcat.jni.Pool;
-import org.apache.tomcat.jni.Socket;
/**
* Test case for the Endpoint implementations. The testing framework will
ensure
@@ -50,6 +47,12 @@ public class TestXxxEndpoint extends TomcatBaseTest {
}
}
+ /*
+ * @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 {
/**
@@ -60,32 +63,34 @@ public class TestXxxEndpoint extends TomcatBaseTest {
String address = InetAddress.getByName("localhost").getHostAddress();
// Create the APR address that will be bound
- int family = Socket.APR_INET;
+ int family = org.apache.tomcat.jni.Socket.APR_INET;
if (Library.APR_HAVE_IPV6) {
- if (!OS.IS_BSD && !OS.IS_WIN32 && !OS.IS_WIN64)
- family = Socket.APR_UNSPEC;
+ if (!org.apache.tomcat.jni.OS.IS_BSD &&
!org.apache.tomcat.jni.OS.IS_WIN32 &&
+ !org.apache.tomcat.jni.OS.IS_WIN64) {
+ 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: " + Error.strerror(ret));
throw (new Exception(Error.strerror(ret)));
@@ -93,11 +98,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
