This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git.
from 4f4a752 [SSHD-1039] Fix support for some basic options in ssh/sshd cli new 5cbae28 [SSHD-1038] Refactor packages from a module into a cleaner hierarchy new e040cb4 [SSHD-1038] Refactor packages from a module into a cleaner hierarchy The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.md | 1 + docs/cli.md | 2 +- docs/sftp.md | 2 +- .../org/apache/sshd/cli/client/ScpCommandMain.java | 10 ++-- .../apache/sshd/cli/client/SftpCommandMain.java | 22 ++++---- .../sshd/cli/server/SshServerCliSupport.java | 6 +-- .../org/apache/sshd/cli/server/SshServerMain.java | 2 +- .../helper/SftpServerSubSystemEventListener.java | 4 +- .../org/apache/sshd/cli/server/SshFsMounter.java | 4 +- .../scp/SimpleAccessControlScpEventListener.java | 2 +- .../sftp/DetailedSftpErrorStatusDataHandler.java | 4 +- .../sftp/SimpleAccessControlSftpEventListener.java | 4 ++ .../SimpleAccessControlScpEventListenerTest.java | 9 ++-- .../SimpleAccessControlSftpEventListenerTest.java | 15 +++--- sshd-git/pom.xml | 2 +- .../apache/sshd/git/pack/GitPackCommandTest.java | 2 +- .../org/apache/sshd/git/pgm/GitPgmCommandTest.java | 2 +- .../{server/auth => ldap}/LdapAuthenticator.java | 3 +- .../util/net => ldap}/LdapNetworkConnector.java | 3 +- .../LdapPasswordAuthenticator.java | 5 +- .../LdapPublickeyAuthenticator.java | 4 +- sshd-ldap/src/main/resources/.gitignore | 0 .../auth => ldap}/BaseAuthenticatorTest.java | 2 +- .../LdapPasswordAuthenticatorTest.java | 3 +- .../LdapPublickeyAuthenticatorTest.java | 3 +- .../sshd/{common/io => }/mina/MinaAcceptor.java | 2 +- .../sshd/{common/io => }/mina/MinaConnector.java | 2 +- .../sshd/{common/io => }/mina/MinaService.java | 2 +- .../{common/io => }/mina/MinaServiceFactory.java | 2 +- .../io => }/mina/MinaServiceFactoryFactory.java | 2 +- .../sshd/{common/io => }/mina/MinaSession.java | 2 +- .../sshd/{common/io => }/mina/MinaSupport.java | 2 +- ...g.apache.sshd.common.io.IoServiceFactoryFactory | 2 +- .../sshd/{common/io => }/mina/MinaSessionTest.java | 2 +- .../openpgp/PGPAuthorizedEntriesTracker.java | 2 +- .../openpgp/PGPAuthorizedKeyEntriesLoader.java | 2 +- .../loader => }/openpgp/PGPKeyFileWatcher.java | 2 +- .../keys/loader => }/openpgp/PGPKeyLoader.java | 2 +- .../openpgp/PGPKeyPairResourceParser.java | 2 +- .../openpgp/PGPPrivateKeyExtractor.java | 2 +- .../openpgp/PGPPublicKeyEntryDataResolver.java | 2 +- .../loader => }/openpgp/PGPPublicKeyExtractor.java | 2 +- .../openpgp/PGPPublicKeyFileWatcher.java | 2 +- .../loader => }/openpgp/PGPPublicRingWatcher.java | 2 +- .../config/keys/loader => }/openpgp/PGPUtils.java | 2 +- .../openpgp/PGPKeyPairResourceParserTest.java | 2 +- .../openpgp/PGPPublicRingWatcherTest.java | 2 +- .../openpgp/PGPUtilsKeyFingerprintTest.java | 2 +- .../loader => }/openpgp/DSA-2048-gpg4win-3.1.3.asc | 0 .../loader => }/openpgp/EC-256-gpg2-public.asc | 0 .../loader => }/openpgp/EC-348-v1p0-public.asc | 0 .../loader => }/openpgp/EC-521-gpg2-public.asc | 0 .../loader => }/openpgp/RSA-2048-v1p0-public.asc | 0 .../loader => }/openpgp/RSA-2048-v1p6p1-public.asc | 0 .../openpgp/RSA-4096-vp2p0p8-public.asc | 0 .../loader => }/openpgp/ed25519-gpg4win-3.1.3.asc | 0 ...er-secret-passphrase-DSA-2048-gpg4win-3.1.3.gpg | 0 ...super-secret-passphrase-EC-256-gpg2-private.gpg | 0 ...super-secret-passphrase-EC-384-v1p0-private.gpg | 0 ...super-secret-passphrase-EC-521-gpg2-private.gpg | 0 ...per-secret-passphrase-RSA-2048-v1p0-private.gpg | 0 ...r-secret-passphrase-RSA-2048-v1p6p1-private.gpg | 0 ...r-secret-passphrase-RSA-4096-v2p0p8-private.gpg | 0 ...per-secret-passphrase-ed25519-gpg4win-3.1.3.gpg | 0 .../loader => }/putty/AbstractPuttyKeyDecoder.java | 2 +- .../keys/loader => }/putty/DSSPuttyKeyDecoder.java | 2 +- .../loader => }/putty/ECDSAPuttyKeyDecoder.java | 2 +- .../loader => }/putty/EdDSAPuttyKeyDecoder.java | 2 +- .../putty/PuttyKeyPairResourceParser.java | 2 +- .../keys/loader => }/putty/PuttyKeyReader.java | 2 +- .../keys/loader => }/putty/PuttyKeyUtils.java | 2 +- .../keys/loader => }/putty/RSAPuttyKeyDecoder.java | 2 +- .../keys/loader => }/putty/PuttyKeyUtilsTest.java | 2 +- ...ttyKeyUtilsTest-ecdsa-sha2-nistp256-KeyPair.ppk | 0 ...ttyKeyUtilsTest-ecdsa-sha2-nistp384-KeyPair.ppk | 0 ...ttyKeyUtilsTest-ecdsa-sha2-nistp521-KeyPair.ppk | 0 .../putty/PuttyKeyUtilsTest-ssh-dss-KeyPair.ppk | 0 .../PuttyKeyUtilsTest-ssh-ed25519-KeyPair.ppk | 0 .../putty/PuttyKeyUtilsTest-ssh-rsa-KeyPair.ppk | 0 ...ase-AES-256-CBC-ecdsa-sha2-nistp256-KeyPair.ppk | 0 ...ase-AES-256-CBC-ecdsa-sha2-nistp384-KeyPair.ppk | 0 ...ase-AES-256-CBC-ecdsa-sha2-nistp521-KeyPair.ppk | 0 ...cret-passphrase-AES-256-CBC-ssh-dss-KeyPair.ppk | 0 ...-passphrase-AES-256-CBC-ssh-ed25519-KeyPair.ppk | 0 ...cret-passphrase-AES-256-CBC-ssh-rsa-KeyPair.ppk | 0 sshd-scp/pom.xml | 2 +- .../scp => scp/client}/AbstractScpClient.java | 6 +-- .../client}/AbstractScpClientCreator.java | 8 +-- .../scp => scp/client}/CloseableScpClient.java | 2 +- .../scp => scp/client}/DefaultScpClient.java | 12 ++--- .../client}/DefaultScpClientCreator.java | 6 +-- .../client}/DefaultScpStreamResolver.java | 6 +-- .../sshd/{client/scp => scp/client}/ScpClient.java | 6 +-- .../scp => scp/client}/ScpClientCreator.java | 8 +-- .../scp => scp/client}/SimpleScpClient.java | 2 +- .../scp => scp/client}/SimpleScpClientImpl.java | 2 +- .../AbstractScpTransferEventListenerAdapter.java | 2 +- .../{common/scp => scp/common}/ScpException.java | 2 +- .../{common/scp => scp/common}/ScpFileOpener.java | 2 +- .../scp => scp/common}/ScpFileOpenerHolder.java | 2 +- .../sshd/{common/scp => scp/common}/ScpHelper.java | 6 +-- .../{common/scp => scp/common}/ScpLocation.java | 2 +- .../scp => scp/common}/ScpReceiveLineHandler.java | 2 +- .../common}/ScpSourceStreamResolver.java | 2 +- .../common}/ScpTargetStreamResolver.java | 2 +- .../{common/scp => scp/common}/ScpTimestamp.java | 2 +- .../common}/ScpTransferEventListener.java | 2 +- .../common}/helpers/DefaultScpFileOpener.java | 8 +-- .../helpers/LocalFileScpSourceStreamResolver.java | 8 +-- .../helpers/LocalFileScpTargetStreamResolver.java | 8 +-- .../scp => scp/server}/InputStreamReader.java | 2 +- .../{server/scp => scp/server}/ScpCommand.java | 12 ++--- .../scp => scp/server}/ScpCommandFactory.java | 10 ++-- .../sshd/{server/scp => scp/server}/ScpShell.java | 12 ++--- .../sshd/{client/scp => scp/client}/ScpTest.java | 16 +++--- .../scp => scp/client}/SimpleScpClientTest.java | 6 +-- .../scp => scp/server}/ScpCommandFactoryTest.java | 10 ++-- sshd-sftp/pom.xml | 2 +- .../services/java.nio.file.spi.FileSystemProvider | 2 +- ...g.apache.sshd.server.subsystem.SubsystemFactory | 2 +- .../org/apache/sshd/sftp/SftpModuleProperties.java | 45 ++++++++-------- .../sftp => sftp/client}/RawSftpClient.java | 2 +- .../subsystem/sftp => sftp/client}/SftpClient.java | 8 +-- .../sftp => sftp/client}/SftpClientFactory.java | 6 +-- .../sftp => sftp/client}/SftpVersionSelector.java | 2 +- .../sftp => sftp/client}/SimpleSftpClient.java | 2 +- .../extensions/BuiltinSftpClientExtensions.java | 42 +++++++-------- .../extensions/CheckFileHandleExtension.java | 4 +- .../client}/extensions/CheckFileNameExtension.java | 2 +- .../client}/extensions/CopyDataExtension.java | 4 +- .../client}/extensions/CopyFileExtension.java | 2 +- .../client}/extensions/MD5FileExtension.java | 2 +- .../client}/extensions/MD5HandleExtension.java | 4 +- .../client}/extensions/SftpClientExtension.java | 4 +- .../extensions/SftpClientExtensionFactory.java | 8 +-- .../extensions/SpaceAvailableExtension.java | 4 +- .../helpers/AbstractCheckFileExtension.java | 8 +-- .../helpers/AbstractMD5HashExtension.java | 6 +-- .../helpers/AbstractSftpClientExtension.java | 14 ++--- .../helpers/CheckFileHandleExtensionImpl.java | 12 ++--- .../helpers/CheckFileNameExtensionImpl.java | 10 ++-- .../extensions/helpers/CopyDataExtensionImpl.java | 12 ++--- .../extensions/helpers/CopyFileExtensionImpl.java | 10 ++-- .../extensions/helpers/MD5FileExtensionImpl.java | 10 ++-- .../extensions/helpers/MD5HandleExtensionImpl.java | 10 ++-- .../helpers/SpaceAvailableExtensionImpl.java | 12 ++--- .../extensions/openssh/OpenSSHFsyncExtension.java | 6 +-- .../openssh/OpenSSHStatExtensionInfo.java | 2 +- .../openssh/OpenSSHStatHandleExtension.java | 6 +-- .../openssh/OpenSSHStatPathExtension.java | 4 +- .../AbstractOpenSSHStatCommandExtension.java | 10 ++-- .../openssh/helpers/OpenSSHFsyncExtensionImpl.java | 14 ++--- .../helpers/OpenSSHStatHandleExtensionImpl.java | 14 ++--- .../helpers/OpenSSHStatPathExtensionImpl.java | 12 ++--- .../client}/fs/SftpAclFileAttributeView.java | 6 +-- .../client}/fs/SftpDirectoryStream.java | 4 +- .../sftp => sftp/client}/fs/SftpFileStore.java | 4 +- .../sftp => sftp/client}/fs/SftpFileSystem.java | 14 ++--- .../fs/SftpFileSystemClientSessionInitializer.java | 4 +- .../fs/SftpFileSystemInitializationContext.java | 2 +- .../client}/fs/SftpFileSystemProvider.java | 20 ++++---- .../sftp => sftp/client}/fs/SftpPath.java | 2 +- .../sftp => sftp/client}/fs/SftpPathIterator.java | 4 +- .../client}/fs/SftpPosixFileAttributeView.java | 6 +-- .../client}/fs/SftpPosixFileAttributes.java | 4 +- .../client}/impl/AbstractSftpClient.java | 20 ++++---- .../impl/AbstractSftpFileAttributeView.java | 14 ++--- .../client}/impl/DefaultCloseableHandle.java | 6 +-- .../client}/impl/DefaultSftpClient.java | 12 ++--- .../client}/impl/DefaultSftpClientFactory.java | 12 ++--- .../sftp => sftp/client}/impl/SftpAckData.java | 2 +- .../client}/impl/SftpDirEntryIterator.java | 8 +-- .../client}/impl/SftpInputStreamAsync.java | 12 ++--- .../client}/impl/SftpIterableDirEntry.java | 6 +-- .../client}/impl/SftpOutputStreamAsync.java | 10 ++-- .../client}/impl/SftpRemotePathChannel.java | 12 ++--- .../client}/impl/SimpleSftpClientImpl.java | 8 +-- .../client}/impl/StfpIterableDirHandle.java | 8 +-- .../sftp => sftp/common}/SftpConstants.java | 2 +- .../sftp => sftp/common}/SftpException.java | 2 +- .../subsystem/sftp => sftp/common}/SftpHelper.java | 8 +-- .../common}/SftpUniversalOwnerAndGroup.java | 2 +- .../common}/extensions/AbstractParser.java | 2 +- .../common}/extensions/AclSupportedParser.java | 6 +-- .../common}/extensions/ExtensionParser.java | 2 +- .../common}/extensions/NewlineParser.java | 6 +-- .../common}/extensions/ParserUtils.java | 18 +++---- .../extensions/SpaceAvailableExtensionInfo.java | 2 +- .../common}/extensions/Supported2Parser.java | 6 +-- .../common}/extensions/SupportedParser.java | 6 +-- .../common}/extensions/VendorIdParser.java | 6 +-- .../common}/extensions/VersionsParser.java | 6 +-- .../openssh/AbstractOpenSSHExtensionParser.java | 6 +-- .../openssh/FstatVfsExtensionParser.java | 2 +- .../extensions/openssh/FsyncExtensionParser.java | 2 +- .../openssh/HardLinkExtensionParser.java | 2 +- .../openssh/LSetStatExtensionParser.java | 2 +- .../openssh/PosixRenameExtensionParser.java | 2 +- .../extensions/openssh/StatVfsExtensionParser.java | 2 +- .../server}/AbstractSftpEventListenerAdapter.java | 2 +- .../server}/AbstractSftpEventListenerManager.java | 2 +- .../server}/AbstractSftpSubsystemHelper.java | 20 ++++---- .../server}/DefaultGroupPrincipal.java | 2 +- .../sftp => sftp/server}/DefaultUserPrincipal.java | 2 +- .../sftp => sftp/server}/DirectoryHandle.java | 2 +- .../subsystem/sftp => sftp/server}/FileHandle.java | 6 +-- .../subsystem/sftp => sftp/server}/Handle.java | 2 +- .../server}/InvalidHandleException.java | 2 +- .../sftp => sftp/server}/PrincipalBase.java | 2 +- .../server}/SftpErrorStatusDataHandler.java | 4 +- .../sftp => sftp/server}/SftpEventListener.java | 2 +- .../server}/SftpEventListenerManager.java | 2 +- .../server}/SftpFileSystemAccessor.java | 4 +- .../server}/SftpFileSystemAccessorManager.java | 2 +- .../sftp => sftp/server}/SftpSubsystem.java | 8 +-- .../server}/SftpSubsystemEnvironment.java | 4 +- .../sftp => sftp/server}/SftpSubsystemFactory.java | 4 +- .../sftp => sftp/server}/SftpSubsystemProxy.java | 2 +- .../sftp => sftp/server}/UnixDateFormat.java | 2 +- .../server}/UnsupportedAttributePolicy.java | 2 +- .../client}/AbstractSftpClientTestSupport.java | 6 +-- .../subsystem/sftp => sftp/client}/ClientTest.java | 6 +-- .../client}/DefaultCloseableHandleTest.java | 8 +-- .../client}/SftpInputStreamWithChannel.java | 6 +-- .../client}/SftpOutputStreamWithChannel.java | 6 +-- .../sftp => sftp/client}/SftpPerformanceTest.java | 6 +-- .../subsystem/sftp => sftp/client}/SftpTest.java | 60 +++++++++++----------- .../sftp => sftp/client}/SftpTransferTest.java | 4 +- .../client}/SftpVersionSelectorTest.java | 4 +- .../sftp => sftp/client}/SftpVersionsTest.java | 26 +++++----- .../sftp => sftp/client}/SimpleSftpClientTest.java | 8 +-- .../BuiltinSftpClientExtensionsTest.java | 6 +-- .../extensions/UnsupportedExtensionTest.java | 10 ++-- .../client}/extensions/VersionParserTest.java | 4 +- .../helpers/AbstractCheckFileExtensionTest.java | 16 +++--- .../helpers/AbstractMD5HashExtensionTest.java | 16 +++--- .../helpers/CopyDataExtensionImplTest.java | 12 ++--- .../helpers/CopyFileExtensionImplTest.java | 12 ++--- .../helpers/SpaceAvailableExtensionImplTest.java | 16 +++--- .../openssh/helpers/OpenSSHExtensionsTest.java | 28 +++++----- .../client}/fs/SftpFileSystemTest.java | 14 ++--- .../client}/fs/SftpFileSystemURITest.java | 4 +- .../client}/impl/SftpRemotePathChannelTest.java | 8 +-- .../sftp => sftp/common}/SftpConstantsTest.java | 2 +- .../common}/SftpUniversalOwnerAndGroupTest.java | 2 +- .../server}/SftpSubsystemFactoryTest.java | 2 +- .../integration}/ApacheSshdSftpSessionFactory.java | 12 ++--- .../spring/integration}/SpringIoResource.java | 2 +- .../spring/integration}/SpringSftpSession.java | 12 ++--- .../ApacheSshdSftpSessionFactoryTest.java | 10 ++-- 250 files changed, 692 insertions(+), 683 deletions(-) rename sshd-ldap/src/main/java/org/apache/sshd/{server/auth => ldap}/LdapAuthenticator.java (93%) rename sshd-ldap/src/main/java/org/apache/sshd/{common/util/net => ldap}/LdapNetworkConnector.java (99%) rename sshd-ldap/src/main/java/org/apache/sshd/{server/auth/password => ldap}/LdapPasswordAuthenticator.java (95%) rename sshd-ldap/src/main/java/org/apache/sshd/{server/auth/pubkey => ldap}/LdapPublickeyAuthenticator.java (99%) delete mode 100644 sshd-ldap/src/main/resources/.gitignore rename sshd-ldap/src/test/java/org/apache/sshd/{server/auth => ldap}/BaseAuthenticatorTest.java (99%) rename sshd-ldap/src/test/java/org/apache/sshd/{server/auth/password => ldap}/LdapPasswordAuthenticatorTest.java (96%) rename sshd-ldap/src/test/java/org/apache/sshd/{server/auth/pubkey => ldap}/LdapPublickeyAuthenticatorTest.java (97%) rename sshd-mina/src/main/java/org/apache/sshd/{common/io => }/mina/MinaAcceptor.java (99%) rename sshd-mina/src/main/java/org/apache/sshd/{common/io => }/mina/MinaConnector.java (99%) rename sshd-mina/src/main/java/org/apache/sshd/{common/io => }/mina/MinaService.java (99%) rename sshd-mina/src/main/java/org/apache/sshd/{common/io => }/mina/MinaServiceFactory.java (98%) rename sshd-mina/src/main/java/org/apache/sshd/{common/io => }/mina/MinaServiceFactoryFactory.java (97%) rename sshd-mina/src/main/java/org/apache/sshd/{common/io => }/mina/MinaSession.java (99%) rename sshd-mina/src/main/java/org/apache/sshd/{common/io => }/mina/MinaSupport.java (97%) rename sshd-mina/src/test/java/org/apache/sshd/{common/io => }/mina/MinaSessionTest.java (97%) rename sshd-openpgp/src/main/java/org/apache/sshd/{common/config/keys/loader => }/openpgp/PGPAuthorizedEntriesTracker.java (99%) rename sshd-openpgp/src/main/java/org/apache/sshd/{common/config/keys/loader => }/openpgp/PGPAuthorizedKeyEntriesLoader.java (98%) rename sshd-openpgp/src/main/java/org/apache/sshd/{common/config/keys/loader => }/openpgp/PGPKeyFileWatcher.java (97%) rename sshd-openpgp/src/main/java/org/apache/sshd/{common/config/keys/loader => }/openpgp/PGPKeyLoader.java (98%) rename sshd-openpgp/src/main/java/org/apache/sshd/{common/config/keys/loader => }/openpgp/PGPKeyPairResourceParser.java (99%) rename sshd-openpgp/src/main/java/org/apache/sshd/{common/config/keys/loader => }/openpgp/PGPPrivateKeyExtractor.java (99%) rename sshd-openpgp/src/main/java/org/apache/sshd/{common/config/keys/loader => }/openpgp/PGPPublicKeyEntryDataResolver.java (98%) rename sshd-openpgp/src/main/java/org/apache/sshd/{common/config/keys/loader => }/openpgp/PGPPublicKeyExtractor.java (99%) rename sshd-openpgp/src/main/java/org/apache/sshd/{common/config/keys/loader => }/openpgp/PGPPublicKeyFileWatcher.java (98%) rename sshd-openpgp/src/main/java/org/apache/sshd/{common/config/keys/loader => }/openpgp/PGPPublicRingWatcher.java (99%) rename sshd-openpgp/src/main/java/org/apache/sshd/{common/config/keys/loader => }/openpgp/PGPUtils.java (99%) rename sshd-openpgp/src/test/java/org/apache/sshd/{common/config/keys/loader => }/openpgp/PGPKeyPairResourceParserTest.java (99%) rename sshd-openpgp/src/test/java/org/apache/sshd/{common/config/keys/loader => }/openpgp/PGPPublicRingWatcherTest.java (98%) rename sshd-openpgp/src/test/java/org/apache/sshd/{common/config/keys/loader => }/openpgp/PGPUtilsKeyFingerprintTest.java (99%) rename sshd-openpgp/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/openpgp/DSA-2048-gpg4win-3.1.3.asc (100%) rename sshd-openpgp/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/openpgp/EC-256-gpg2-public.asc (100%) rename sshd-openpgp/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/openpgp/EC-348-v1p0-public.asc (100%) rename sshd-openpgp/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/openpgp/EC-521-gpg2-public.asc (100%) rename sshd-openpgp/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/openpgp/RSA-2048-v1p0-public.asc (100%) rename sshd-openpgp/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/openpgp/RSA-2048-v1p6p1-public.asc (100%) rename sshd-openpgp/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/openpgp/RSA-4096-vp2p0p8-public.asc (100%) rename sshd-openpgp/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/openpgp/ed25519-gpg4win-3.1.3.asc (100%) rename sshd-openpgp/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/openpgp/super-secret-passphrase-DSA-2048-gpg4win-3.1.3.gpg (100%) rename sshd-openpgp/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/openpgp/super-secret-passphrase-EC-256-gpg2-private.gpg (100%) rename sshd-openpgp/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/openpgp/super-secret-passphrase-EC-384-v1p0-private.gpg (100%) rename sshd-openpgp/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/openpgp/super-secret-passphrase-EC-521-gpg2-private.gpg (100%) rename sshd-openpgp/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/openpgp/super-secret-passphrase-RSA-2048-v1p0-private.gpg (100%) rename sshd-openpgp/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/openpgp/super-secret-passphrase-RSA-2048-v1p6p1-private.gpg (100%) rename sshd-openpgp/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/openpgp/super-secret-passphrase-RSA-4096-v2p0p8-private.gpg (100%) rename sshd-openpgp/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/openpgp/super-secret-passphrase-ed25519-gpg4win-3.1.3.gpg (100%) rename sshd-putty/src/main/java/org/apache/sshd/{common/config/keys/loader => }/putty/AbstractPuttyKeyDecoder.java (99%) rename sshd-putty/src/main/java/org/apache/sshd/{common/config/keys/loader => }/putty/DSSPuttyKeyDecoder.java (97%) rename sshd-putty/src/main/java/org/apache/sshd/{common/config/keys/loader => }/putty/ECDSAPuttyKeyDecoder.java (98%) rename sshd-putty/src/main/java/org/apache/sshd/{common/config/keys/loader => }/putty/EdDSAPuttyKeyDecoder.java (98%) rename sshd-putty/src/main/java/org/apache/sshd/{common/config/keys/loader => }/putty/PuttyKeyPairResourceParser.java (99%) rename sshd-putty/src/main/java/org/apache/sshd/{common/config/keys/loader => }/putty/PuttyKeyReader.java (97%) rename sshd-putty/src/main/java/org/apache/sshd/{common/config/keys/loader => }/putty/PuttyKeyUtils.java (97%) rename sshd-putty/src/main/java/org/apache/sshd/{common/config/keys/loader => }/putty/RSAPuttyKeyDecoder.java (98%) rename sshd-putty/src/test/java/org/apache/sshd/{common/config/keys/loader => }/putty/PuttyKeyUtilsTest.java (99%) rename sshd-putty/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/putty/PuttyKeyUtilsTest-ecdsa-sha2-nistp256-KeyPair.ppk (100%) rename sshd-putty/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/putty/PuttyKeyUtilsTest-ecdsa-sha2-nistp384-KeyPair.ppk (100%) rename sshd-putty/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/putty/PuttyKeyUtilsTest-ecdsa-sha2-nistp521-KeyPair.ppk (100%) rename sshd-putty/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/putty/PuttyKeyUtilsTest-ssh-dss-KeyPair.ppk (100%) rename sshd-putty/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/putty/PuttyKeyUtilsTest-ssh-ed25519-KeyPair.ppk (100%) rename sshd-putty/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/putty/PuttyKeyUtilsTest-ssh-rsa-KeyPair.ppk (100%) rename sshd-putty/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/putty/super-secret-passphrase-AES-256-CBC-ecdsa-sha2-nistp256-KeyPair.ppk (100%) rename sshd-putty/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/putty/super-secret-passphrase-AES-256-CBC-ecdsa-sha2-nistp384-KeyPair.ppk (100%) rename sshd-putty/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/putty/super-secret-passphrase-AES-256-CBC-ecdsa-sha2-nistp521-KeyPair.ppk (100%) rename sshd-putty/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/putty/super-secret-passphrase-AES-256-CBC-ssh-dss-KeyPair.ppk (100%) rename sshd-putty/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/putty/super-secret-passphrase-AES-256-CBC-ssh-ed25519-KeyPair.ppk (100%) rename sshd-putty/src/test/resources/org/apache/sshd/{common/config/keys/loader => }/putty/super-secret-passphrase-AES-256-CBC-ssh-rsa-KeyPair.ppk (100%) rename sshd-scp/src/main/java/org/apache/sshd/{client/scp => scp/client}/AbstractScpClient.java (98%) rename sshd-scp/src/main/java/org/apache/sshd/{client/scp => scp/client}/AbstractScpClientCreator.java (89%) rename sshd-scp/src/main/java/org/apache/sshd/{client/scp => scp/client}/CloseableScpClient.java (96%) rename sshd-scp/src/main/java/org/apache/sshd/{client/scp => scp/client}/DefaultScpClient.java (96%) rename sshd-scp/src/main/java/org/apache/sshd/{client/scp => scp/client}/DefaultScpClientCreator.java (90%) rename sshd-scp/src/main/java/org/apache/sshd/{client/scp => scp/client}/DefaultScpStreamResolver.java (95%) rename sshd-scp/src/main/java/org/apache/sshd/{client/scp => scp/client}/ScpClient.java (98%) rename sshd-scp/src/main/java/org/apache/sshd/{client/scp => scp/client}/ScpClientCreator.java (95%) rename sshd-scp/src/main/java/org/apache/sshd/{client/scp => scp/client}/SimpleScpClient.java (99%) rename sshd-scp/src/main/java/org/apache/sshd/{client/scp => scp/client}/SimpleScpClientImpl.java (99%) rename sshd-scp/src/main/java/org/apache/sshd/{common/scp => scp/common}/AbstractScpTransferEventListenerAdapter.java (98%) rename sshd-scp/src/main/java/org/apache/sshd/{common/scp => scp/common}/ScpException.java (98%) rename sshd-scp/src/main/java/org/apache/sshd/{common/scp => scp/common}/ScpFileOpener.java (99%) rename sshd-scp/src/main/java/org/apache/sshd/{common/scp => scp/common}/ScpFileOpenerHolder.java (97%) rename sshd-scp/src/main/java/org/apache/sshd/{common/scp => scp/common}/ScpHelper.java (99%) rename sshd-scp/src/main/java/org/apache/sshd/{common/scp => scp/common}/ScpLocation.java (99%) rename sshd-scp/src/main/java/org/apache/sshd/{common/scp => scp/common}/ScpReceiveLineHandler.java (97%) rename sshd-scp/src/main/java/org/apache/sshd/{common/scp => scp/common}/ScpSourceStreamResolver.java (99%) rename sshd-scp/src/main/java/org/apache/sshd/{common/scp => scp/common}/ScpTargetStreamResolver.java (99%) rename sshd-scp/src/main/java/org/apache/sshd/{common/scp => scp/common}/ScpTimestamp.java (98%) rename sshd-scp/src/main/java/org/apache/sshd/{common/scp => scp/common}/ScpTransferEventListener.java (99%) rename sshd-scp/src/main/java/org/apache/sshd/{common/scp => scp/common}/helpers/DefaultScpFileOpener.java (95%) rename sshd-scp/src/main/java/org/apache/sshd/{common/scp => scp/common}/helpers/LocalFileScpSourceStreamResolver.java (94%) rename sshd-scp/src/main/java/org/apache/sshd/{common/scp => scp/common}/helpers/LocalFileScpTargetStreamResolver.java (97%) rename sshd-scp/src/main/java/org/apache/sshd/{server/scp => scp/server}/InputStreamReader.java (99%) rename sshd-scp/src/main/java/org/apache/sshd/{server/scp => scp/server}/ScpCommand.java (96%) rename sshd-scp/src/main/java/org/apache/sshd/{server/scp => scp/server}/ScpCommandFactory.java (97%) rename sshd-scp/src/main/java/org/apache/sshd/{server/scp => scp/server}/ScpShell.java (99%) rename sshd-scp/src/test/java/org/apache/sshd/{client/scp => scp/client}/ScpTest.java (99%) rename sshd-scp/src/test/java/org/apache/sshd/{client/scp => scp/client}/SimpleScpClientTest.java (97%) rename sshd-scp/src/test/java/org/apache/sshd/{server/scp => scp/server}/ScpCommandFactoryTest.java (94%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/RawSftpClient.java (98%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/SftpClient.java (99%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/SftpClientFactory.java (96%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/SftpVersionSelector.java (99%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/SimpleSftpClient.java (99%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/BuiltinSftpClientExtensions.java (78%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/CheckFileHandleExtension.java (94%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/CheckFileNameExtension.java (97%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/CopyDataExtension.java (91%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/CopyFileExtension.java (96%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/MD5FileExtension.java (96%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/MD5HandleExtension.java (94%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/SftpClientExtension.java (91%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/SftpClientExtensionFactory.java (85%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/SpaceAvailableExtension.java (89%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/helpers/AbstractCheckFileExtension.java (92%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/helpers/AbstractMD5HashExtension.java (94%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/helpers/AbstractSftpClientExtension.java (95%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/helpers/CheckFileHandleExtensionImpl.java (82%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/helpers/CheckFileNameExtensionImpl.java (84%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/helpers/CopyDataExtensionImpl.java (85%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/helpers/CopyFileExtensionImpl.java (86%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/helpers/MD5FileExtensionImpl.java (83%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/helpers/MD5HandleExtensionImpl.java (83%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/helpers/SpaceAvailableExtensionImpl.java (82%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/openssh/OpenSSHFsyncExtension.java (85%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/openssh/OpenSSHStatExtensionInfo.java (98%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/openssh/OpenSSHStatHandleExtension.java (84%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/openssh/OpenSSHStatPathExtension.java (90%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/openssh/helpers/AbstractOpenSSHStatCommandExtension.java (84%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/openssh/helpers/OpenSSHFsyncExtensionImpl.java (75%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/openssh/helpers/OpenSSHStatHandleExtensionImpl.java (72%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/openssh/helpers/OpenSSHStatPathExtensionImpl.java (75%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/fs/SftpAclFileAttributeView.java (92%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/fs/SftpDirectoryStream.java (95%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/fs/SftpFileStore.java (96%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/fs/SftpFileSystem.java (98%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/fs/SftpFileSystemClientSessionInitializer.java (97%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/fs/SftpFileSystemInitializationContext.java (98%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/fs/SftpFileSystemProvider.java (98%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/fs/SftpPath.java (96%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/fs/SftpPathIterator.java (96%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/fs/SftpPosixFileAttributeView.java (94%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/fs/SftpPosixFileAttributes.java (96%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/impl/AbstractSftpClient.java (98%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/impl/AbstractSftpFileAttributeView.java (87%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/impl/DefaultCloseableHandle.java (91%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/impl/DefaultSftpClient.java (98%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/impl/DefaultSftpClientFactory.java (89%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/impl/SftpAckData.java (96%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/impl/SftpDirEntryIterator.java (96%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/impl/SftpInputStreamAsync.java (97%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/impl/SftpIterableDirEntry.java (92%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/impl/SftpOutputStreamAsync.java (96%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/impl/SftpRemotePathChannel.java (98%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/impl/SimpleSftpClientImpl.java (96%) rename sshd-sftp/src/main/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/impl/StfpIterableDirHandle.java (88%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/SftpConstants.java (99%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/SftpException.java (96%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/SftpHelper.java (99%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/SftpUniversalOwnerAndGroup.java (98%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/AbstractParser.java (95%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/AclSupportedParser.java (97%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/ExtensionParser.java (95%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/NewlineParser.java (94%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/ParserUtils.java (90%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/SpaceAvailableExtensionInfo.java (98%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/Supported2Parser.java (94%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/SupportedParser.java (94%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/VendorIdParser.java (92%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/VersionsParser.java (94%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/openssh/AbstractOpenSSHExtensionParser.java (93%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/openssh/FstatVfsExtensionParser.java (94%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/openssh/FsyncExtensionParser.java (95%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/openssh/HardLinkExtensionParser.java (95%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/openssh/LSetStatExtensionParser.java (95%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/openssh/PosixRenameExtensionParser.java (95%) rename sshd-sftp/src/main/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/extensions/openssh/StatVfsExtensionParser.java (95%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/AbstractSftpEventListenerAdapter.java (99%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/AbstractSftpEventListenerManager.java (97%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/AbstractSftpSubsystemHelper.java (99%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/DefaultGroupPrincipal.java (95%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/DefaultUserPrincipal.java (95%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/DirectoryHandle.java (98%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/FileHandle.java (98%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/Handle.java (99%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/InvalidHandleException.java (96%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/PrincipalBase.java (97%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/SftpErrorStatusDataHandler.java (97%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/SftpEventListener.java (99%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/SftpEventListenerManager.java (97%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/SftpFileSystemAccessor.java (99%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/SftpFileSystemAccessorManager.java (95%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/SftpSubsystem.java (99%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/SftpSubsystemEnvironment.java (95%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/SftpSubsystemFactory.java (98%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/SftpSubsystemProxy.java (95%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/UnixDateFormat.java (98%) rename sshd-sftp/src/main/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/UnsupportedAttributePolicy.java (96%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/AbstractSftpClientTestSupport.java (95%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/ClientTest.java (99%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/DefaultCloseableHandleTest.java (92%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/SftpInputStreamWithChannel.java (96%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/SftpOutputStreamWithChannel.java (95%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/SftpPerformanceTest.java (98%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/SftpTest.java (97%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/SftpTransferTest.java (97%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/SftpVersionSelectorTest.java (98%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/SftpVersionsTest.java (96%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/SimpleSftpClientTest.java (95%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/BuiltinSftpClientExtensionsTest.java (95%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/UnsupportedExtensionTest.java (89%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/VersionParserTest.java (93%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/helpers/AbstractCheckFileExtensionTest.java (94%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/helpers/AbstractMD5HashExtensionTest.java (93%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/helpers/CopyDataExtensionImplTest.java (95%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/helpers/CopyFileExtensionImplTest.java (90%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/helpers/SpaceAvailableExtensionImplTest.java (88%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/extensions/openssh/helpers/OpenSSHExtensionsTest.java (89%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/fs/SftpFileSystemTest.java (98%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/fs/SftpFileSystemURITest.java (98%) rename sshd-sftp/src/test/java/org/apache/sshd/{client/subsystem/sftp => sftp/client}/impl/SftpRemotePathChannelTest.java (97%) rename sshd-sftp/src/test/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/SftpConstantsTest.java (98%) rename sshd-sftp/src/test/java/org/apache/sshd/{common/subsystem/sftp => sftp/common}/SftpUniversalOwnerAndGroupTest.java (98%) rename sshd-sftp/src/test/java/org/apache/sshd/{server/subsystem/sftp => sftp/server}/SftpSubsystemFactoryTest.java (98%) rename sshd-spring-sftp/src/main/java/org/apache/sshd/{spring/integration/sftp => sftp/spring/integration}/ApacheSshdSftpSessionFactory.java (98%) rename sshd-spring-sftp/src/main/java/org/apache/sshd/{spring/integration/sftp => sftp/spring/integration}/SpringIoResource.java (96%) rename sshd-spring-sftp/src/main/java/org/apache/sshd/{spring/integration/sftp => sftp/spring/integration}/SpringSftpSession.java (96%) rename sshd-spring-sftp/src/test/java/org/apache/sshd/{spring/integration/sftp => sftp/spring/integration}/ApacheSshdSftpSessionFactoryTest.java (98%)