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-native.git
The following commit(s) were added to refs/heads/master by this push:
new 8d75b7a Update java code to align with 10.0.x
8d75b7a is described below
commit 8d75b7a8f64d76eaac963ec361317d28b49c211f
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Dec 10 14:05:43 2020 +0000
Update java code to align with 10.0.x
---
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 ++++++
25 files changed, 150 insertions(+)
diff --git a/java/org/apache/tomcat/jni/Address.java
b/java/org/apache/tomcat/jni/Address.java
index 38a08f8..acac800 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 8a94972..2b3e081 100644
--- a/java/org/apache/tomcat/jni/Directory.java
+++ b/java/org/apache/tomcat/jni/Directory.java
@@ -20,7 +20,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 4ae5523..e86c282 100644
--- a/java/org/apache/tomcat/jni/File.java
+++ b/java/org/apache/tomcat/jni/File.java
@@ -22,7 +22,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 9fb6bd3..8bd8549 100644
--- a/java/org/apache/tomcat/jni/FileInfo.java
+++ b/java/org/apache/tomcat/jni/FileInfo.java
@@ -20,7 +20,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 c1d1eb5..05a85f3 100644
--- a/java/org/apache/tomcat/jni/Global.java
+++ b/java/org/apache/tomcat/jni/Global.java
@@ -20,7 +20,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 50ed955..8676c4f 100644
--- a/java/org/apache/tomcat/jni/Local.java
+++ b/java/org/apache/tomcat/jni/Local.java
@@ -21,7 +21,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 6bb789a..eb2da79 100644
--- a/java/org/apache/tomcat/jni/Lock.java
+++ b/java/org/apache/tomcat/jni/Lock.java
@@ -20,7 +20,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 08bc795..c1cce36 100644
--- a/java/org/apache/tomcat/jni/Mmap.java
+++ b/java/org/apache/tomcat/jni/Mmap.java
@@ -20,7 +20,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 44d123b..cebd111 100644
--- a/java/org/apache/tomcat/jni/Multicast.java
+++ b/java/org/apache/tomcat/jni/Multicast.java
@@ -20,7 +20,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 c93a07b..6473137 100644
--- a/java/org/apache/tomcat/jni/OS.java
+++ b/java/org/apache/tomcat/jni/OS.java
@@ -20,7 +20,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 112d02e..54f4221 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 5075a3e..501bb8a 100644
--- a/java/org/apache/tomcat/jni/PoolCallback.java
+++ b/java/org/apache/tomcat/jni/PoolCallback.java
@@ -20,7 +20,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 cbae420..64a4334 100644
--- a/java/org/apache/tomcat/jni/Proc.java
+++ b/java/org/apache/tomcat/jni/Proc.java
@@ -20,7 +20,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 60f53c8..0b5390f 100644
--- a/java/org/apache/tomcat/jni/ProcErrorCallback.java
+++ b/java/org/apache/tomcat/jni/ProcErrorCallback.java
@@ -20,7 +20,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 88e97c6..2bdb934 100644
--- a/java/org/apache/tomcat/jni/Procattr.java
+++ b/java/org/apache/tomcat/jni/Procattr.java
@@ -20,7 +20,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 209e02f..9b57ecd 100644
--- a/java/org/apache/tomcat/jni/Registry.java
+++ b/java/org/apache/tomcat/jni/Registry.java
@@ -20,7 +20,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 2cc42f7..0a63916 100644
--- a/java/org/apache/tomcat/jni/SSLSocket.java
+++ b/java/org/apache/tomcat/jni/SSLSocket.java
@@ -20,7 +20,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 43c662c..6b01675 100644
--- a/java/org/apache/tomcat/jni/Shm.java
+++ b/java/org/apache/tomcat/jni/Shm.java
@@ -22,7 +22,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 f5262a7..cbe31d0 100644
--- a/java/org/apache/tomcat/jni/Sockaddr.java
+++ b/java/org/apache/tomcat/jni/Sockaddr.java
@@ -20,7 +20,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 8882f3b..6d64ec0 100644
--- a/java/org/apache/tomcat/jni/Socket.java
+++ b/java/org/apache/tomcat/jni/Socket.java
@@ -23,7 +23,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 56d9445..e62f9c9 100644
--- a/java/org/apache/tomcat/jni/Status.java
+++ b/java/org/apache/tomcat/jni/Status.java
@@ -20,7 +20,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 b2fa630..bb8fdf9 100644
--- a/java/org/apache/tomcat/jni/Stdlib.java
+++ b/java/org/apache/tomcat/jni/Stdlib.java
@@ -20,7 +20,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 7435bf3..447c93a 100644
--- a/java/org/apache/tomcat/jni/Thread.java
+++ b/java/org/apache/tomcat/jni/Thread.java
@@ -20,7 +20,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 22aeb25..ad19dd1 100644
--- a/java/org/apache/tomcat/jni/Time.java
+++ b/java/org/apache/tomcat/jni/Time.java
@@ -20,7 +20,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 20bb762..71894fe 100644
--- a/java/org/apache/tomcat/jni/User.java
+++ b/java/org/apache/tomcat/jni/User.java
@@ -20,7 +20,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 {
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
