This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push: new ac55dd6e7c Fix remaining issues from Mina SSHD Upgrade ac55dd6e7c is described below commit ac55dd6e7ca3eaac5c7f43d9693eba5a13957e1d Author: Richard Zowalla <r...@apache.org> AuthorDate: Tue Apr 30 11:40:57 2024 +0200 Fix remaining issues from Mina SSHD Upgrade --- .../org/apache/openejb/server/ssh/OpenEJBShellFactory.java | 11 ++++++----- .../java/org/apache/openejb/server/ssh/SSHServerTest.java | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBShellFactory.java b/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBShellFactory.java index 55b67ad2ef..9971e80f7b 100644 --- a/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBShellFactory.java +++ b/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBShellFactory.java @@ -16,12 +16,13 @@ */ package org.apache.openejb.server.ssh; -import org.apache.sshd.common.Factory; +import org.apache.sshd.server.channel.ChannelSession; import org.apache.sshd.server.command.Command; +import org.apache.sshd.server.shell.ShellFactory; -public class OpenEJBShellFactory implements Factory<Command> { - private String bind; - private int port; +public class OpenEJBShellFactory implements ShellFactory { + private final String bind; + private final int port; public OpenEJBShellFactory(String bind, int port) { this.bind = bind; @@ -29,7 +30,7 @@ public class OpenEJBShellFactory implements Factory<Command> { } @Override - public Command create() { + public Command createShell(ChannelSession channelSession) { return new OpenEJBCommands(bind, port); } } diff --git a/server/openejb-ssh/src/test/java/org/apache/openejb/server/ssh/SSHServerTest.java b/server/openejb-ssh/src/test/java/org/apache/openejb/server/ssh/SSHServerTest.java index 1ea451d556..25d4c7593c 100644 --- a/server/openejb-ssh/src/test/java/org/apache/openejb/server/ssh/SSHServerTest.java +++ b/server/openejb-ssh/src/test/java/org/apache/openejb/server/ssh/SSHServerTest.java @@ -67,7 +67,7 @@ public class SSHServerTest { try { final ClientSession session = client.connect("jonathan", "localhost", 4222).verify().getSession(); session.addPasswordIdentity("secret"); - session.auth().verify(FactoryManager.DEFAULT_AUTH_TIMEOUT); + session.auth().verify(); final ClientChannel channel = session.createChannel("shell"); ByteArrayOutputStream sent = new ByteArrayOutputStream();