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 a6b6781 Update deprecation as code is shared between Tomcat 10 and
Tomcat Native
a6b6781 is described below
commit a6b67811ef62d475d095166c63f4d9bcab54f15b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 10 13:53:17 2020 +0000
Update deprecation as code is shared between Tomcat 10 and Tomcat Native
---
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 +++--
25 files changed, 75 insertions(+), 50 deletions(-)
diff --git a/java/org/apache/tomcat/jni/Address.java
b/java/org/apache/tomcat/jni/Address.java
index cabaabc..87eba9e 100644
--- a/java/org/apache/tomcat/jni/Address.java
+++ b/java/org/apache/tomcat/jni/Address.java
@@ -21,8 +21,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 {
diff --git a/java/org/apache/tomcat/jni/Directory.java
b/java/org/apache/tomcat/jni/Directory.java
index 8eb6087..2b3e081 100644
--- a/java/org/apache/tomcat/jni/Directory.java
+++ b/java/org/apache/tomcat/jni/Directory.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 9128b62..e86c282 100644
--- a/java/org/apache/tomcat/jni/File.java
+++ b/java/org/apache/tomcat/jni/File.java
@@ -24,8 +24,9 @@ import java.nio.ByteBuffer;
* @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.
+ * 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 {
diff --git a/java/org/apache/tomcat/jni/FileInfo.java
b/java/org/apache/tomcat/jni/FileInfo.java
index 9eeba1a..8bd8549 100644
--- a/java/org/apache/tomcat/jni/FileInfo.java
+++ b/java/org/apache/tomcat/jni/FileInfo.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 {
diff --git a/java/org/apache/tomcat/jni/Global.java
b/java/org/apache/tomcat/jni/Global.java
index 2a84f6b..05a85f3 100644
--- a/java/org/apache/tomcat/jni/Global.java
+++ b/java/org/apache/tomcat/jni/Global.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 70eb500..8676c4f 100644
--- a/java/org/apache/tomcat/jni/Local.java
+++ b/java/org/apache/tomcat/jni/Local.java
@@ -23,8 +23,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 9e6c0fe..eb2da79 100644
--- a/java/org/apache/tomcat/jni/Lock.java
+++ b/java/org/apache/tomcat/jni/Lock.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 b571be0..c1cce36 100644
--- a/java/org/apache/tomcat/jni/Mmap.java
+++ b/java/org/apache/tomcat/jni/Mmap.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 {
diff --git a/java/org/apache/tomcat/jni/Multicast.java
b/java/org/apache/tomcat/jni/Multicast.java
index 315f1b6..cebd111 100644
--- a/java/org/apache/tomcat/jni/Multicast.java
+++ b/java/org/apache/tomcat/jni/Multicast.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 eaa6faf..6473137 100644
--- a/java/org/apache/tomcat/jni/OS.java
+++ b/java/org/apache/tomcat/jni/OS.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 {
diff --git a/java/org/apache/tomcat/jni/Poll.java
b/java/org/apache/tomcat/jni/Poll.java
index 0aa5c54..54f4221 100644
--- a/java/org/apache/tomcat/jni/Poll.java
+++ b/java/org/apache/tomcat/jni/Poll.java
@@ -21,8 +21,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 4a2b3a0..501bb8a 100644
--- a/java/org/apache/tomcat/jni/PoolCallback.java
+++ b/java/org/apache/tomcat/jni/PoolCallback.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 44c0ab7..64a4334 100644
--- a/java/org/apache/tomcat/jni/Proc.java
+++ b/java/org/apache/tomcat/jni/Proc.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 a993a9a..0b5390f 100644
--- a/java/org/apache/tomcat/jni/ProcErrorCallback.java
+++ b/java/org/apache/tomcat/jni/ProcErrorCallback.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 d335063..2bdb934 100644
--- a/java/org/apache/tomcat/jni/Procattr.java
+++ b/java/org/apache/tomcat/jni/Procattr.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 959e23f..9b57ecd 100644
--- a/java/org/apache/tomcat/jni/Registry.java
+++ b/java/org/apache/tomcat/jni/Registry.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 {
diff --git a/java/org/apache/tomcat/jni/SSLSocket.java
b/java/org/apache/tomcat/jni/SSLSocket.java
index e8b221d..0a63916 100644
--- a/java/org/apache/tomcat/jni/SSLSocket.java
+++ b/java/org/apache/tomcat/jni/SSLSocket.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 bdf322c..6b01675 100644
--- a/java/org/apache/tomcat/jni/Shm.java
+++ b/java/org/apache/tomcat/jni/Shm.java
@@ -24,8 +24,9 @@ import java.nio.ByteBuffer;
* @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.
+ * 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 8e2ff60..cbe31d0 100644
--- a/java/org/apache/tomcat/jni/Sockaddr.java
+++ b/java/org/apache/tomcat/jni/Sockaddr.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 {
diff --git a/java/org/apache/tomcat/jni/Socket.java
b/java/org/apache/tomcat/jni/Socket.java
index c02a843..bfed4e2 100644
--- a/java/org/apache/tomcat/jni/Socket.java
+++ b/java/org/apache/tomcat/jni/Socket.java
@@ -25,8 +25,9 @@ import java.nio.ByteBuffer;
* @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.
+ * 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 {
diff --git a/java/org/apache/tomcat/jni/Status.java
b/java/org/apache/tomcat/jni/Status.java
index 0440e80..e62f9c9 100644
--- a/java/org/apache/tomcat/jni/Status.java
+++ b/java/org/apache/tomcat/jni/Status.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 e5a0412..bb8fdf9 100644
--- a/java/org/apache/tomcat/jni/Stdlib.java
+++ b/java/org/apache/tomcat/jni/Stdlib.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 0fb961b..447c93a 100644
--- a/java/org/apache/tomcat/jni/Thread.java
+++ b/java/org/apache/tomcat/jni/Thread.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 7796d4e..ad19dd1 100644
--- a/java/org/apache/tomcat/jni/Time.java
+++ b/java/org/apache/tomcat/jni/Time.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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 {
diff --git a/java/org/apache/tomcat/jni/User.java
b/java/org/apache/tomcat/jni/User.java
index 7177ecc..71894fe 100644
--- a/java/org/apache/tomcat/jni/User.java
+++ b/java/org/apache/tomcat/jni/User.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
* @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.
+ * 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
