Use Argeo TP v2.1.23

[lgpl/argeo-commons.git] / org.argeo.core / src / org / argeo / sync / fs / SshSync.java

diff --git a/org.argeo.core/src/org/argeo/sync/fs/SshSync.java b/org.argeo.core/src/org/argeo/sync/fs/SshSync.java
index 773f32d34e226dc3bbb70c3112c08c775f70eabe..7fe6670c9ef7627ad949b65ae0fdbbdb6cbca23e 100644 (file)
--- a/org.argeo.core/src/org/argeo/sync/fs/SshSync.java
+++ b/org.argeo.core/src/org/argeo/sync/fs/SshSync.java
@@ -27,8 +27,8 @@ import org.apache.sshd.client.channel.ClientChannelEvent;
 import org.apache.sshd.client.config.keys.ClientIdentityLoader;
 import org.apache.sshd.client.future.ConnectFuture;
 import org.apache.sshd.client.session.ClientSession;
-import org.apache.sshd.client.subsystem.sftp.SftpFileSystem;
-import org.apache.sshd.client.subsystem.sftp.SftpFileSystemProvider;
+import org.apache.sshd.client.subsystem.sftp.fs.SftpFileSystem;
+import org.apache.sshd.client.subsystem.sftp.fs.SftpFileSystemProvider;
 import org.apache.sshd.common.config.keys.FilePasswordProvider;
 import org.apache.sshd.common.util.io.NoCloseInputStream;
 import org.apache.sshd.common.util.io.NoCloseOutputStream;
@@ -40,7 +40,7 @@ public class SshSync {
 
                try (SshClient client = SshClient.setUpDefaultClient()) {
                        client.start();
-                       boolean osAgent = false;
+                       boolean osAgent = true;
                        SshAgentFactory agentFactory = osAgent ? new UnixAgentFactory() : new LocalAgentFactory();
                        // SshAgentFactory agentFactory = new LocalAgentFactory();
                        client.setAgentFactory(agentFactory);
@@ -55,15 +55,15 @@ public class SshSync {
                                System.out.print(keyPath + ": ");
                                Scanner s = new Scanner(System.in);
                                String password = s.next();
-                               KeyPair keyPair = ClientIdentityLoader.DEFAULT.loadClientIdentity(keyPath,
-                                               FilePasswordProvider.of(password));
-                               sshAgent.addIdentity(keyPair, "NO COMMENT");
+//                             KeyPair keyPair = ClientIdentityLoader.DEFAULT.loadClientIdentity(keyPath,
+//                                             FilePasswordProvider.of(password));
+//                             sshAgent.addIdentity(keyPair, "NO COMMENT");
                        }
 
-                       List<? extends Map.Entry<PublicKey, String>> identities = sshAgent.getIdentities();
-                       for (Map.Entry<PublicKey, String> entry : identities) {
-                               System.out.println(entry.getValue() + " : " + entry.getKey());
-                       }
+//                     List<? extends Map.Entry<PublicKey, String>> identities = sshAgent.getIdentities();
+//                     for (Map.Entry<PublicKey, String> entry : identities) {
+//                             System.out.println(entry.getValue() + " : " + entry.getKey());
+//                     }
 
                        ConnectFuture connectFuture = client.connect(login, host, port);
                        connectFuture.await();