This is an automated email from the ASF dual-hosted git repository.
markt-asf 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 3656001bae Move TribesSslContext to transport package
3656001bae is described below
commit 3656001bae3b148be023bd654a79d065fb329937
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Oct 29 12:37:04 2026 +0000
Move TribesSslContext to transport package
---
java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
java/org/apache/catalina/tribes/group/GroupChannel.java | 1 +
java/org/apache/catalina/tribes/transport/AbstractSender.java | 1 -
.../apache/catalina/tribes/{group => transport}/TribesSslContext.java | 2 +-
java/org/apache/catalina/tribes/transport/nio/NioReceiver.java | 2 +-
test/org/apache/catalina/tribes/transport/TestAbstractSender.java | 1 -
test/org/apache/catalina/tribes/transport/nio/TestTlsChannel.java | 2 +-
7 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 732f9dfe1a..06fe4adbf4 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -78,7 +78,7 @@ public class AprLifecycleListener implements
LifecycleListener {
/** Recommended minor version of Tomcat Native. */
protected static final int TCN_RECOMMENDED_MINOR = 0;
/** Recommended patch version of Tomcat Native. */
- protected static final int TCN_RECOMMENDED_PV = 16;
+ protected static final int TCN_RECOMMENDED_PV = 17;
// ---------------------------------------------- Properties
diff --git a/java/org/apache/catalina/tribes/group/GroupChannel.java
b/java/org/apache/catalina/tribes/group/GroupChannel.java
index 43ab667428..0fedaaf46b 100644
--- a/java/org/apache/catalina/tribes/group/GroupChannel.java
+++ b/java/org/apache/catalina/tribes/group/GroupChannel.java
@@ -53,6 +53,7 @@ import org.apache.catalina.tribes.io.BufferPool;
import org.apache.catalina.tribes.io.ChannelData;
import org.apache.catalina.tribes.io.XByteBuffer;
import org.apache.catalina.tribes.jmx.JmxRegistry;
+import org.apache.catalina.tribes.transport.TribesSslContext;
import org.apache.catalina.tribes.util.Arrays;
import org.apache.catalina.tribes.util.Logs;
import org.apache.catalina.tribes.util.StringManager;
diff --git a/java/org/apache/catalina/tribes/transport/AbstractSender.java
b/java/org/apache/catalina/tribes/transport/AbstractSender.java
index 7a1aa935f6..b8e6d1bf3f 100644
--- a/java/org/apache/catalina/tribes/transport/AbstractSender.java
+++ b/java/org/apache/catalina/tribes/transport/AbstractSender.java
@@ -20,7 +20,6 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import org.apache.catalina.tribes.Member;
-import org.apache.catalina.tribes.group.TribesSslContext;
/** Abstract base implementation of a data sender. */
public abstract class AbstractSender implements DataSender {
diff --git a/java/org/apache/catalina/tribes/group/TribesSslContext.java
b/java/org/apache/catalina/tribes/transport/TribesSslContext.java
similarity index 99%
rename from java/org/apache/catalina/tribes/group/TribesSslContext.java
rename to java/org/apache/catalina/tribes/transport/TribesSslContext.java
index 42fd41366b..2c152f8385 100644
--- a/java/org/apache/catalina/tribes/group/TribesSslContext.java
+++ b/java/org/apache/catalina/tribes/transport/TribesSslContext.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.tribes.group;
+package org.apache.catalina.tribes.transport;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
index e6668a3470..b34b66535a 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
@@ -40,13 +40,13 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.group.GroupChannel;
-import org.apache.catalina.tribes.group.TribesSslContext;
import org.apache.catalina.tribes.io.ChannelData;
import org.apache.catalina.tribes.io.ObjectReader;
import org.apache.catalina.tribes.transport.AbstractRxTask;
import org.apache.catalina.tribes.transport.Constants;
import org.apache.catalina.tribes.transport.ReceiverBase;
import org.apache.catalina.tribes.transport.RxTaskPool;
+import org.apache.catalina.tribes.transport.TribesSslContext;
import org.apache.catalina.tribes.util.ExceptionUtils;
import org.apache.catalina.tribes.util.StringManager;
import org.apache.juli.logging.Log;
diff --git a/test/org/apache/catalina/tribes/transport/TestAbstractSender.java
b/test/org/apache/catalina/tribes/transport/TestAbstractSender.java
index 9f682f0526..564ae0cb43 100644
--- a/test/org/apache/catalina/tribes/transport/TestAbstractSender.java
+++ b/test/org/apache/catalina/tribes/transport/TestAbstractSender.java
@@ -22,7 +22,6 @@ import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
-import org.apache.catalina.tribes.group.TribesSslContext;
import org.apache.catalina.tribes.membership.MemberImpl;
import org.apache.catalina.tribes.transport.nio.NioSender;
import org.apache.catalina.tribes.transport.nio.PooledParallelSender;
diff --git a/test/org/apache/catalina/tribes/transport/nio/TestTlsChannel.java
b/test/org/apache/catalina/tribes/transport/nio/TestTlsChannel.java
index 50e0290f5f..dec997c544 100644
--- a/test/org/apache/catalina/tribes/transport/nio/TestTlsChannel.java
+++ b/test/org/apache/catalina/tribes/transport/nio/TestTlsChannel.java
@@ -30,7 +30,7 @@ import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
-import org.apache.catalina.tribes.group.TribesSslContext;
+import org.apache.catalina.tribes.transport.TribesSslContext;
public class TestTlsChannel {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
