Rename authenticators for clarity

5 files changed, 12 insertions, 12 deletions

diff --git a/src/main/java/com/gitblit/transport/ssh/SshKeyAuthenticator.java b/src/main/java/com/gitblit/transport/ssh/PublicKeyAuthenticator.java
index 922f25ae..84e7afa5 100644
--- a/src/main/java/com/gitblit/transport/ssh/SshKeyAuthenticator.java
+++ b/src/main/java/com/gitblit/transport/ssh/PublicKeyAuthenticator.java
@@ -32,7 +32,7 @@ import com.gitblit.models.UserModel;
  * @author Eric Myrhe
  *
  */
-public class SshKeyAuthenticator implements PublickeyAuthenticator {
+public class PublicKeyAuthenticator implements PublickeyAuthenticator {
 
 	protected final Logger log = LoggerFactory.getLogger(getClass());
 
@@ -40,7 +40,7 @@ public class SshKeyAuthenticator implements PublickeyAuthenticator {
 
 	protected final IAuthenticationManager authManager;
 
-	public SshKeyAuthenticator(IKeyManager keyManager, IAuthenticationManager authManager) {
+	public PublicKeyAuthenticator(IKeyManager keyManager, IAuthenticationManager authManager) {
 		this.keyManager = keyManager;
 		this.authManager = authManager;
 	}
diff --git a/src/main/java/com/gitblit/transport/ssh/SshDaemon.java b/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
index c8c20f56..5415779e 100644
--- a/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
+++ b/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
@@ -117,7 +117,7 @@ public class SshDaemon {
 			addr = new InetSocketAddress(bindInterface, port);
 		}
 
-		SshKeyAuthenticator publickeyAuthenticator = new SshKeyAuthenticator(
+		PublicKeyAuthenticator publickeyAuthenticator = new PublicKeyAuthenticator(
 				keyManager, gitblit);
 		sshd = SshServer.setUpDefaultServer();
 		sshd.setPort(addr.getPort());
@@ -125,7 +125,7 @@ public class SshDaemon {
 		sshd.setKeyPairProvider(new PEMGeneratorHostKeyProvider(new File(
 				gitblit.getBaseFolder(), HOST_KEY_STORE).getPath()));
 		sshd.setPublickeyAuthenticator(publickeyAuthenticator);
-		sshd.setPasswordAuthenticator(new SshPasswordAuthenticator(gitblit));
+		sshd.setPasswordAuthenticator(new UsernamePasswordAuthenticator(gitblit));
 		sshd.setSessionFactory(new SshSessionFactory());
 		sshd.setFileSystemFactory(new DisabledFilesystemFactory());
 		sshd.setTcpipForwardingFilter(new NonForwardingFilter());
diff --git a/src/main/java/com/gitblit/transport/ssh/SshPasswordAuthenticator.java b/src/main/java/com/gitblit/transport/ssh/UsernamePasswordAuthenticator.java
index 5ddc4a39..861bc22d 100644
--- a/src/main/java/com/gitblit/transport/ssh/SshPasswordAuthenticator.java
+++ b/src/main/java/com/gitblit/transport/ssh/UsernamePasswordAuthenticator.java
@@ -30,13 +30,13 @@ import com.gitblit.models.UserModel;
  * @author James Moger
  *
  */
-public class SshPasswordAuthenticator implements PasswordAuthenticator {
+public class UsernamePasswordAuthenticator implements PasswordAuthenticator {
 
 	protected final Logger log = LoggerFactory.getLogger(getClass());
 
 	protected final IAuthenticationManager authManager;
 
-	public SshPasswordAuthenticator(IAuthenticationManager authManager) {
+	public UsernamePasswordAuthenticator(IAuthenticationManager authManager) {
 		this.authManager = authManager;
 	}
 
diff --git a/src/main/java/com/gitblit/transport/ssh/commands/BaseKeyCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/BaseKeyCommand.java
index 50927cc2..36475244 100644
--- a/src/main/java/com/gitblit/transport/ssh/commands/BaseKeyCommand.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/BaseKeyCommand.java
@@ -21,7 +21,7 @@ import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 
-import com.gitblit.transport.ssh.SshKeyAuthenticator;
+import com.gitblit.transport.ssh.PublicKeyAuthenticator;
 import com.google.common.base.Charsets;
 
 /**
@@ -51,8 +51,8 @@ public abstract class BaseKeyCommand extends SshCommand {
 		return sshKeys;
 	}
 
-	protected SshKeyAuthenticator authenticator;
-	public void setAuthenticator(SshKeyAuthenticator authenticator) {
+	protected PublicKeyAuthenticator authenticator;
+	public void setAuthenticator(PublicKeyAuthenticator authenticator) {
 		this.authenticator = authenticator;
 	}
 }
diff --git a/src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java
index 5c022732..7cd1b045 100644
--- a/src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java
@@ -32,7 +32,7 @@ import com.gitblit.git.GitblitUploadPackFactory;
 import com.gitblit.git.RepositoryResolver;
 import com.gitblit.transport.ssh.AbstractGitCommand;
 import com.gitblit.transport.ssh.CommandMetaData;
-import com.gitblit.transport.ssh.SshKeyAuthenticator;
+import com.gitblit.transport.ssh.PublicKeyAuthenticator;
 import com.gitblit.transport.ssh.SshDaemonClient;
 import com.gitblit.utils.cli.SubcommandHandler;
 import com.google.common.base.Charsets;
@@ -231,8 +231,8 @@ public class DispatchCommand extends BaseCommand {
 	  this.gitblitReceivePackFactory = gitblitReceivePackFactory;
   }
 
-  private SshKeyAuthenticator authenticator;
-  public void setAuthenticator(SshKeyAuthenticator authenticator) {
+  private PublicKeyAuthenticator authenticator;
+  public void setAuthenticator(PublicKeyAuthenticator authenticator) {
 	this.authenticator = authenticator;
   }
 }