[SSHD-698] Fix typos Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/0fde8856 Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/0fde8856 Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/0fde8856
Branch: refs/heads/master Commit: 0fde8856223441d6889a989e66599d57d2423195 Parents: 6d0d896 Author: Guillaume Nodet <[email protected]> Authored: Thu Sep 15 16:31:36 2016 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Thu Sep 15 21:06:39 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/sshd/agent/common/AbstractAgentClient.java | 4 ++-- .../main/java/org/apache/sshd/client/ClientFactoryManager.java | 2 +- .../org/apache/sshd/client/channel/AbstractClientChannel.java | 4 ++-- .../main/java/org/apache/sshd/client/channel/ChannelShell.java | 2 +- .../java/org/apache/sshd/client/channel/ChannelSubsystem.java | 2 +- .../apache/sshd/client/config/hosts/KnownHostHashValue.java | 2 +- .../sshd/client/keyverifier/KnownHostsServerKeyVerifier.java | 4 ++-- .../java/org/apache/sshd/client/scp/AbstractScpClient.java | 2 +- .../sshd/client/session/ClientConnectionServiceFactory.java | 2 +- .../org/apache/sshd/client/session/ClientUserAuthService.java | 2 +- .../client/subsystem/sftp/AbstractSftpFileAttributeView.java | 2 +- .../apache/sshd/client/subsystem/sftp/DefaultSftpClient.java | 2 +- .../sshd/client/subsystem/sftp/SftpDirEntryIterator.java | 4 ++-- .../subsystem/sftp/extensions/SpaceAvailableExtension.java | 2 +- sshd-core/src/main/java/org/apache/sshd/common/Factory.java | 2 +- .../src/main/java/org/apache/sshd/common/SshConstants.java | 4 ++-- .../org/apache/sshd/common/config/SshConfigFileReader.java | 2 +- .../sshd/common/config/keys/DSSPublicKeyEntryDecoder.java | 2 +- .../apache/sshd/common/config/keys/RSAPublicKeyDecoder.java | 2 +- .../java/org/apache/sshd/common/file/util/BaseFileSystem.java | 2 +- .../sshd/common/global/AbstractOpenSshHostKeysHandler.java | 2 +- .../org/apache/sshd/common/scp/ScpTransferEventListener.java | 4 ++-- .../main/java/org/apache/sshd/common/util/EventNotifier.java | 2 +- .../java/org/apache/sshd/server/channel/ChannelSession.java | 2 +- .../org/apache/sshd/server/global/TcpipForwardHandler.java | 2 +- .../org/apache/sshd/server/session/AbstractServerSession.java | 2 +- .../org/apache/sshd/server/session/ServerUserAuthService.java | 2 +- .../java/org/apache/sshd/server/subsystem/sftp/FileHandle.java | 2 +- .../org/apache/sshd/server/x11/DefaultX11ForwardSupport.java | 6 +++--- .../src/test/java/org/apache/sshd/common/SshConstantsTest.java | 4 ++-- .../test/java/org/apache/sshd/common/kex/KeyExchangeTest.java | 2 +- 31 files changed, 40 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java b/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java index 796cbdd..abd121f 100644 --- a/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java +++ b/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java @@ -47,7 +47,7 @@ public abstract class AbstractAgentClient extends AbstractLoggingBean { int avail = buffer.available(); if (avail < 4) { if (log.isTraceEnabled()) { - log.trace("Received message total length ({}) below minuimum ({})", + log.trace("Received message total length ({}) below minimum ({})", avail, 4); } return; @@ -60,7 +60,7 @@ public abstract class AbstractAgentClient extends AbstractLoggingBean { avail = buffer.available(); if (avail < (len + 4)) { if (log.isTraceEnabled()) { - log.trace("Received request length ({}) below minuimum ({})", + log.trace("Received request length ({}) below minimum ({})", avail, len + 4); } return; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java b/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java index e4e873f..3ecdb42 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java @@ -49,7 +49,7 @@ public interface ClientFactoryManager /** * Key used to set the heartbeat interval in milliseconds (0 to disable = default) */ - String HEARTBEAT_INTERVAL = "hearbeat-interval"; + String HEARTBEAT_INTERVAL = "heartbeat-interval"; /** * Default value for {@link #HEARTBEAT_INTERVAL} if none configured http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/client/channel/AbstractClientChannel.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/channel/AbstractClientChannel.java b/sshd-core/src/main/java/org/apache/sshd/client/channel/AbstractClientChannel.java index e9a8196..24c9983 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/channel/AbstractClientChannel.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/channel/AbstractClientChannel.java @@ -191,8 +191,8 @@ public abstract class AbstractClientChannel extends AbstractChannel implements C // Close inverted streams after // If the inverted stream is closed before, there's a small time window // in which we have: - // ChannePipedInputStream#closed = true - // ChannePipedInputStream#writerClosed = false + // ChannelPipedInputStream#closed = true + // ChannelPipedInputStream#writerClosed = false // which leads to an IOException("Pipe closed") when reading. IoUtils.closeQuietly(in, out, err); IoUtils.closeQuietly(invertedIn, invertedOut, invertedErr); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelShell.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelShell.java b/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelShell.java index 35a2ff7..6b3047b 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelShell.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelShell.java @@ -28,7 +28,7 @@ import org.apache.sshd.common.session.Session; import org.apache.sshd.common.util.buffer.Buffer; /** - * Client channel to open a remot shell + * Client channel to open a remote shell * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelSubsystem.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelSubsystem.java b/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelSubsystem.java index 1034d52..2f9119b 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelSubsystem.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelSubsystem.java @@ -106,7 +106,7 @@ public class ChannelSubsystem extends ChannelSession { String systemName = getSubsystem(); Date pending = removePendingRequest(Channel.CHANNEL_SUBSYSTEM); if (pending != null) { - log.warn("handleFailure({}) susbsystem={}, pending since={}", this, systemName, pending); + log.warn("handleFailure({}) subsystem={}, pending since={}", this, systemName, pending); close(true); } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/KnownHostHashValue.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/KnownHostHashValue.java b/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/KnownHostHashValue.java index f5fa825..2d41af7 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/KnownHostHashValue.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/KnownHostHashValue.java @@ -157,7 +157,7 @@ public class KnownHostHashValue { NamedFactory<Mac> factory = ValidateUtils.checkNotNull(KnownHostDigest.fromName(components[1]), - "Invalid hash pattern (unknwon digest): %s", pattern); + "Invalid hash pattern (unknown digest): %s", pattern); value.setDigester(factory); value.setSaltValue(Base64.decodeString(components[2])); value.setDigestValue(Base64.decodeString(components[3])); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/KnownHostsServerKeyVerifier.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/KnownHostsServerKeyVerifier.java b/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/KnownHostsServerKeyVerifier.java index 93fa5eb..eba487a 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/KnownHostsServerKeyVerifier.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/KnownHostsServerKeyVerifier.java @@ -76,7 +76,7 @@ public class KnownHostsServerKeyVerifier public static final String KNOWN_HOSTS_FILE_OPTION = "UserKnownHostsFile"; /** - * Represents an entry in the internal verifier's cach + * Represents an entry in the internal verifier's cache * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ public static class HostEntryPair { @@ -325,7 +325,7 @@ public class KnownHostsServerKeyVerifier if (matchLine.equals(newLine)) { if (log.isDebugEnabled()) { - log.debug("updateModifiedServerKey({})[{}] unmodified upodated lline for {}", + log.debug("updateModifiedServerKey({})[{}] unmodified updated line for {}", clientSession, remoteAddress, matchLine); } return; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/client/scp/AbstractScpClient.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/scp/AbstractScpClient.java b/sshd-core/src/main/java/org/apache/sshd/client/scp/AbstractScpClient.java index 9a1dc57..f798de5 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/scp/AbstractScpClient.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/scp/AbstractScpClient.java @@ -102,7 +102,7 @@ public abstract class AbstractScpClient extends AbstractLoggingBean implements S if (options.contains(Option.TargetIsDirectory)) { Boolean status = IoUtils.checkFileExists(local, opts); if (status == null) { - throw new SshException("Target directory " + local.toString() + " is probaly inaccesible"); + throw new SshException("Target directory " + local.toString() + " is probably inaccesible"); } if (!status) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionServiceFactory.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionServiceFactory.java b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionServiceFactory.java index d71ce1c..8373e22 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionServiceFactory.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionServiceFactory.java @@ -54,7 +54,7 @@ public class ClientConnectionServiceFactory extends AbstractConnectionServiceFac @Override public Service create(Session session) throws IOException { - ValidateUtils.checkTrue(session instanceof AbstractClientSession, "Not a client sesssion: %s", session); + ValidateUtils.checkTrue(session instanceof AbstractClientSession, "Not a client session: %s", session); ClientConnectionService service = new ClientConnectionService((AbstractClientSession) session); service.addPortForwardingEventListener(getPortForwardingEventListenerProxy()); return service; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/client/session/ClientUserAuthService.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientUserAuthService.java b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientUserAuthService.java index e0e52d2..aac8d57 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientUserAuthService.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientUserAuthService.java @@ -84,7 +84,7 @@ public class ClientUserAuthService } } else { if (log.isDebugEnabled()) { - log.debug("ClientUserAuthService({}) use configured preferrences: {}", s, prefs); + log.debug("ClientUserAuthService({}) use configured preferences: {}", s, prefs); } for (String pref : GenericUtils.split(prefs, ',')) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/AbstractSftpFileAttributeView.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/AbstractSftpFileAttributeView.java b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/AbstractSftpFileAttributeView.java index 86b8ad5..140ac18 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/AbstractSftpFileAttributeView.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/AbstractSftpFileAttributeView.java @@ -74,7 +74,7 @@ public abstract class AbstractSftpFileAttributeView extends AbstractLoggingBean try (SftpClient client = fs.getClient()) { try { if (log.isDebugEnabled()) { - log.debug("writeRemotAttributes({})[{}]: {}", fs, p, attrs); + log.debug("writeRemoteAttributes({})[{}]: {}", fs, p, attrs); } client.setStat(p.toString(), attrs); } catch (SftpException e) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/DefaultSftpClient.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/DefaultSftpClient.java b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/DefaultSftpClient.java index f61d302..dddcfd5 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/DefaultSftpClient.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/DefaultSftpClient.java @@ -340,7 +340,7 @@ public class DefaultSftpClient extends AbstractSftpClient { remainingTimeout -= sleepMillis; } } catch (InterruptedException e) { - throw (IOException) new InterruptedIOException("Interruppted init()").initCause(e); + throw (IOException) new InterruptedIOException("Interrupted init()").initCause(e); } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpDirEntryIterator.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpDirEntryIterator.java b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpDirEntryIterator.java index 564d1d9..abf3a1d 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpDirEntryIterator.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpDirEntryIterator.java @@ -53,7 +53,7 @@ public class SftpDirEntryIterator extends AbstractLoggingBean implements Iterato /** * @param client The {@link SftpClient} instance to use for the iteration * @param path The remote directory path - * @throws IOException If failed to gain access to the remote directory patj + * @throws IOException If failed to gain access to the remote directory path */ public SftpDirEntryIterator(SftpClient client, String path) throws IOException { this(client, path, client.openDir(path), true); @@ -72,7 +72,7 @@ public class SftpDirEntryIterator extends AbstractLoggingBean implements Iterato * @param path A hint as to the remote directory path - used only for logging * @param dirHandle The directory {@link Handle} to use for listing the entries * @param closeOnFinished If {@code true} then close the directory handle when - * all entries have been exahusted + * all entries have been exhausted */ public SftpDirEntryIterator(SftpClient client, String path, Handle dirHandle, boolean closeOnFinished) { this.client = Objects.requireNonNull(client, "No SFTP client instance"); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/extensions/SpaceAvailableExtension.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/extensions/SpaceAvailableExtension.java b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/extensions/SpaceAvailableExtension.java index a7450e9..2cc938b 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/extensions/SpaceAvailableExtension.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/extensions/SpaceAvailableExtension.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.apache.sshd.common.subsystem.sftp.extensions.SpaceAvailableExtensionInfo; /** - * Implements the "space-availble" extension + * Implements the "space-available" extension * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> * @see <A HREF="http://tools.ietf.org/wg/secsh/draft-ietf-secsh-filexfer/draft-ietf-secsh-filexfer-09.txt";>DRAFT 09 section 9.2</A> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/common/Factory.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/Factory.java b/sshd-core/src/main/java/org/apache/sshd/common/Factory.java index 406eb5e..86f007d 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/Factory.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/Factory.java @@ -20,7 +20,7 @@ package org.apache.sshd.common; /** - * Fatory is a simple interface that is used to create other objects. + * Factory is a simple interface that is used to create other objects. * * @param <T> type of objets this factory will create * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/common/SshConstants.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/SshConstants.java b/sshd-core/src/main/java/org/apache/sshd/common/SshConstants.java index 919ba40..4ceb0c3 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/SshConstants.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/SshConstants.java @@ -139,7 +139,7 @@ public final class SshConstants { * @return {@code true} if this value is used by several <U>different</U> messages * @see #getAmbiguousOpcodes() */ - public static boolean isAmbigouosOpcode(int cmd) { + public static boolean isAmbiguousOpcode(int cmd) { return getAmbiguousOpcodes().contains(cmd); } @@ -162,7 +162,7 @@ public final class SshConstants { } try { - return !isAmbigouosOpcode(f.getByte(null)); + return !isAmbiguousOpcode(f.getByte(null)); } catch (Exception e) { return false; } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/common/config/SshConfigFileReader.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/config/SshConfigFileReader.java b/sshd-core/src/main/java/org/apache/sshd/common/config/SshConfigFileReader.java index 35ba82a..27a42a2 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/config/SshConfigFileReader.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/config/SshConfigFileReader.java @@ -358,7 +358,7 @@ public final class SshConfigFileReader { * @param v Checks if the value is "yes", "y" * or "on" or "true". * @return The result - <B>Note:</B> {@code null}/empty values are - * intrepreted as {@code false} + * interpreted as {@code false} */ public static boolean parseBooleanValue(String v) { return "yes".equalsIgnoreCase(v) http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/common/config/keys/DSSPublicKeyEntryDecoder.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/DSSPublicKeyEntryDecoder.java b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/DSSPublicKeyEntryDecoder.java index 424d0c6..6ea520e 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/DSSPublicKeyEntryDecoder.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/DSSPublicKeyEntryDecoder.java @@ -52,7 +52,7 @@ public class DSSPublicKeyEntryDecoder extends AbstractPublicKeyEntryDecoder<DSAP @Override public DSAPublicKey decodePublicKey(String keyType, InputStream keyData) throws IOException, GeneralSecurityException { if (!KeyPairProvider.SSH_DSS.equals(keyType)) { // just in case we were invoked directly - throw new InvalidKeySpecException("Unepected key type: " + keyType); + throw new InvalidKeySpecException("Unexpected key type: " + keyType); } BigInteger p = decodeBigInt(keyData); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/common/config/keys/RSAPublicKeyDecoder.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/RSAPublicKeyDecoder.java b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/RSAPublicKeyDecoder.java index b9cabc9..94b5520 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/RSAPublicKeyDecoder.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/RSAPublicKeyDecoder.java @@ -52,7 +52,7 @@ public class RSAPublicKeyDecoder extends AbstractPublicKeyEntryDecoder<RSAPublic @Override public RSAPublicKey decodePublicKey(String keyType, InputStream keyData) throws IOException, GeneralSecurityException { if (!KeyPairProvider.SSH_RSA.equals(keyType)) { // just in case we were invoked directly - throw new InvalidKeySpecException("Unepected key type: " + keyType); + throw new InvalidKeySpecException("Unexpected key type: " + keyType); } BigInteger e = decodeBigInt(keyData); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/common/file/util/BaseFileSystem.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/file/util/BaseFileSystem.java b/sshd-core/src/main/java/org/apache/sshd/common/file/util/BaseFileSystem.java index 169daa1..367a12e 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/file/util/BaseFileSystem.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/file/util/BaseFileSystem.java @@ -156,7 +156,7 @@ public abstract class BaseFileSystem<T extends Path> extends FileSystem { } protected String globToRegex(String pattern) { - StringBuilder sb = new StringBuilder(ValidateUtils.checkNotNull(pattern, "No patern").length()); + StringBuilder sb = new StringBuilder(ValidateUtils.checkNotNull(pattern, "No pattern").length()); int inGroup = 0; int inClass = 0; int firstIndexInClass = -1; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/common/global/AbstractOpenSshHostKeysHandler.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/global/AbstractOpenSshHostKeysHandler.java b/sshd-core/src/main/java/org/apache/sshd/common/global/AbstractOpenSshHostKeysHandler.java index 523aa2c..2d8d1f1 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/global/AbstractOpenSshHostKeysHandler.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/global/AbstractOpenSshHostKeysHandler.java @@ -51,7 +51,7 @@ public abstract class AbstractOpenSshHostKeysHandler extends AbstractConnectionS protected AbstractOpenSshHostKeysHandler(String request, BufferPublicKeyParser<? extends PublicKey> parser) { this.request = ValidateUtils.checkNotNullAndNotEmpty(request, "No request identifier"); - this.parser = ValidateUtils.checkNotNull(parser, "No publick keys extractor"); + this.parser = ValidateUtils.checkNotNull(parser, "No public keys extractor"); } public final String getRequestName() { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpTransferEventListener.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpTransferEventListener.java b/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpTransferEventListener.java index 2e99576..3acae88 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpTransferEventListener.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpTransferEventListener.java @@ -50,7 +50,7 @@ public interface ScpTransferEventListener extends SshdEventListener { /** * @param op The {@link FileOperation} * @param file The <U>local</U> referenced file {@link Path} - * @param length Size (in bytes) of transfered data + * @param length Size (in bytes) of transferred data * @param perms A {@link Set} of {@link PosixFilePermission}s to be applied * once transfer is complete * @throws IOException If failed to handle the event @@ -62,7 +62,7 @@ public interface ScpTransferEventListener extends SshdEventListener { /** * @param op The {@link FileOperation} * @param file The <U>local</U> referenced file {@link Path} - * @param length Size (in bytes) of transfered data + * @param length Size (in bytes) of transferred data * @param perms A {@link Set} of {@link PosixFilePermission}s to be applied * once transfer is complete * @param thrown The result of the operation attempt - if {@code null} then http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/common/util/EventNotifier.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/EventNotifier.java b/sshd-core/src/main/java/org/apache/sshd/common/util/EventNotifier.java index 8e50cea..0cbcf30 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/EventNotifier.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/EventNotifier.java @@ -20,7 +20,7 @@ package org.apache.sshd.common.util; /** - * Notify about the occurence of an event + * Notify about the occurrence of an event * * @param <E> type of event being notified * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java b/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java index b09f1f7..22383e7 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java @@ -547,7 +547,7 @@ public class ChannelSession extends AbstractServerChannel { protected RequestHandler.Result handleSubsystem(String request, Buffer buffer, boolean wantReply) throws IOException { String subsystem = buffer.getString(); if (log.isDebugEnabled()) { - log.debug("handleSubsystem({})[want-reply={}] sybsystem={}", + log.debug("handleSubsystem({})[want-reply={}] subsystem={}", this, wantReply, subsystem); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/server/global/TcpipForwardHandler.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/global/TcpipForwardHandler.java b/sshd-core/src/main/java/org/apache/sshd/server/global/TcpipForwardHandler.java index 3dd2d06..a8dd753 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/global/TcpipForwardHandler.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/global/TcpipForwardHandler.java @@ -56,7 +56,7 @@ public class TcpipForwardHandler extends AbstractConnectionServiceRequestHandler String address = buffer.getString(); int port = buffer.getInt(); SshdSocketAddress socketAddress = new SshdSocketAddress(address, port); - TcpipForwarder forwarder = ValidateUtils.checkNotNull(connectionService.getTcpipForwarder(), "No TCP/IP forwader"); + TcpipForwarder forwarder = ValidateUtils.checkNotNull(connectionService.getTcpipForwarder(), "No TCP/IP forwarder"); SshdSocketAddress bound = forwarder.localPortForwardingRequested(socketAddress); if (log.isDebugEnabled()) { log.debug("process({})[{}][want-reply-{}] {} => {}", http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java b/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java index 2ec01da..5026e1b 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java @@ -268,7 +268,7 @@ public abstract class AbstractServerSession extends AbstractSession implements S for (String keyType : provided) { if (!supported.contains(keyType)) { if (log.isDebugEnabled()) { - log.debug("resolveAvailableSignaturesProposal({})[{}] {} not in suppored list: {}", + log.debug("resolveAvailableSignaturesProposal({})[{}] {} not in supported list: {}", this, provided, keyType, supported); } continue; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/server/session/ServerUserAuthService.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerUserAuthService.java b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerUserAuthService.java index 22040fc..545ac57 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerUserAuthService.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerUserAuthService.java @@ -232,7 +232,7 @@ public class ServerUserAuthService extends AbstractCloseable implements Service, session, e.getClass().getSimpleName(), currentAuth.getName(), e.getMessage()); } if (log.isTraceEnabled()) { - log.trace("process(" + session + ") current authentiaction=" + currentAuth.getName() + " failure details", e); + log.trace("process(" + session + ") current authentication=" + currentAuth.getName() + " failure details", e); } } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/FileHandle.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/FileHandle.java b/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/FileHandle.java index f6f1e8e..e27fddd 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/FileHandle.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/FileHandle.java @@ -200,7 +200,7 @@ public class FileHandle extends Handle { } if (lock == null) { throw new SftpException(SftpConstants.SSH_FX_NO_MATCHING_BYTE_RANGE_LOCK, - "No mtahcing lock found on range [" + offset + "-" + (offset + length)); + "No matching lock found on range [" + offset + "-" + (offset + length)); } lock.release(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/main/java/org/apache/sshd/server/x11/DefaultX11ForwardSupport.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/x11/DefaultX11ForwardSupport.java b/sshd-core/src/main/java/org/apache/sshd/server/x11/DefaultX11ForwardSupport.java index 3e02e80..e96f4d1 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/x11/DefaultX11ForwardSupport.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/x11/DefaultX11ForwardSupport.java @@ -121,8 +121,8 @@ public class DefaultX11ForwardSupport extends AbstractInnerCloseable implements + " failed to allocate internet-domain X11 display socket in range {}-{}", authenticationProtocol, authenticationCookie, screen, minDisplayNumber, maxDisplayNumber); - Collection<SocketAddress> boundAddressess = acceptor.getBoundAddresses(); - if (GenericUtils.isEmpty(boundAddressess)) { + Collection<SocketAddress> boundAddresses = acceptor.getBoundAddresses(); + if (GenericUtils.isEmpty(boundAddresses)) { if (log.isDebugEnabled()) { log.debug("createDisplay(auth={}, cookie={}, screen={}) closing - no more bound addresses", authenticationProtocol, authenticationCookie, screen); @@ -131,7 +131,7 @@ public class DefaultX11ForwardSupport extends AbstractInnerCloseable implements } else { if (log.isDebugEnabled()) { log.debug("createDisplay(auth={}, cookie={}, screen={}) closing - remaining bound addresses: {}", - authenticationProtocol, authenticationCookie, screen, boundAddressess); + authenticationProtocol, authenticationCookie, screen, boundAddresses); } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/test/java/org/apache/sshd/common/SshConstantsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/SshConstantsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/SshConstantsTest.java index 86eb6b4..40546ca 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/SshConstantsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/SshConstantsTest.java @@ -60,13 +60,13 @@ public class SshConstantsTest extends BaseTestSupport { for (int cmd : knownAmbiguities) { assertEquals("Mismatched mnemonic for known ambiguity=" + cmd, Integer.toString(cmd), SshConstants.getCommandMessageName(cmd)); - assertTrue("Known ambiguity not reported as such: " + cmd, SshConstants.isAmbigouosOpcode(cmd)); + assertTrue("Known ambiguity not reported as such: " + cmd, SshConstants.isAmbiguousOpcode(cmd)); assertTrue("Known ambiguity=" + cmd + " not listed: " + opcodes, opcodes.contains(cmd)); } for (Integer cmd : opcodes) { assertEquals("Mismatched mnemonic for " + cmd, cmd.toString(), SshConstants.getCommandMessageName(cmd)); - assertTrue("Opcode not detected as ambiguous: " + cmd, SshConstants.isAmbigouosOpcode(cmd)); + assertTrue("Opcode not detected as ambiguous: " + cmd, SshConstants.isAmbiguousOpcode(cmd)); } } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0fde8856/sshd-core/src/test/java/org/apache/sshd/common/kex/KeyExchangeTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/kex/KeyExchangeTest.java b/sshd-core/src/test/java/org/apache/sshd/common/kex/KeyExchangeTest.java index 9de3fc5..fa3c8ee 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/kex/KeyExchangeTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/kex/KeyExchangeTest.java @@ -64,7 +64,7 @@ public class KeyExchangeTest extends BaseTestSupport { String actual = xformer.transform(cmd); assertSame("Mismatched results for cmd=" + cmd, expected, actual); - if (SshConstants.isAmbigouosOpcode(cmd)) { + if (SshConstants.isAmbiguousOpcode(cmd)) { assertEquals("Unexpected ambiguous command resolution for " + cmd, cmd.toString(), SshConstants.getCommandMessageName(cmd)); } }
