You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2014/01/30 15:50:59 UTC
[2/6] git commit: [SSHD-286] Rename
getClientFactoryManager/getServerFactoryManager to getFactoryManager with
return type override.
[SSHD-286] Rename getClientFactoryManager/getServerFactoryManager to getFactoryManager with return type override.
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/c1a6b588
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/c1a6b588
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/c1a6b588
Branch: refs/heads/master
Commit: c1a6b588ea29e6a208c8c3d8991ebf777a5fe9ad
Parents: 7ea210b
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Jan 30 11:41:28 2014 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Jan 30 11:41:28 2014 +0100
----------------------------------------------------------------------
sshd-core/src/main/java/org/apache/sshd/ClientSession.java | 2 +-
.../org/apache/sshd/client/auth/UserAuthKeyboardInteractive.java | 2 +-
.../java/org/apache/sshd/client/session/ClientSessionImpl.java | 4 ++--
.../org/apache/sshd/client/session/ClientUserAuthService.java | 2 +-
.../org/apache/sshd/server/auth/UserAuthKeyboardInteractive.java | 2 +-
.../main/java/org/apache/sshd/server/auth/UserAuthPassword.java | 2 +-
.../main/java/org/apache/sshd/server/auth/UserAuthPublicKey.java | 2 +-
.../main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java | 2 +-
.../main/java/org/apache/sshd/server/session/ServerSession.java | 2 +-
.../org/apache/sshd/server/session/ServerUserAuthService.java | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c1a6b588/sshd-core/src/main/java/org/apache/sshd/ClientSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/ClientSession.java b/sshd-core/src/main/java/org/apache/sshd/ClientSession.java
index 26fd46b..96068cb 100644
--- a/sshd-core/src/main/java/org/apache/sshd/ClientSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/ClientSession.java
@@ -175,6 +175,6 @@ public interface ClientSession extends Session {
/**
* Return ClientFactoryManager for this session.
*/
- ClientFactoryManager getClientFactoryManager();
+ ClientFactoryManager getFactoryManager();
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c1a6b588/sshd-core/src/main/java/org/apache/sshd/client/auth/UserAuthKeyboardInteractive.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/auth/UserAuthKeyboardInteractive.java b/sshd-core/src/main/java/org/apache/sshd/client/auth/UserAuthKeyboardInteractive.java
index 36cd4bb..374ac36 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/auth/UserAuthKeyboardInteractive.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/auth/UserAuthKeyboardInteractive.java
@@ -78,7 +78,7 @@ public class UserAuthKeyboardInteractive extends AbstractUserAuth {
} else if (num == 1 && password != null && !echo[0] && prompt[0].toLowerCase().startsWith("password:")) {
rep = new String[] { password };
} else {
- UserInteraction ui = session.getClientFactoryManager().getUserInteraction();
+ UserInteraction ui = session.getFactoryManager().getUserInteraction();
if (ui != null) {
String dest = username + "@" + session.getIoSession().getRemoteAddress().toString();
rep = ui.interactive(dest, name, instruction, prompt, echo);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c1a6b588/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
index 6da6c0c..720ce4b 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
@@ -101,7 +101,7 @@ public class ClientSessionImpl extends AbstractSession implements ClientSession
sendKexInit();
}
- public ClientFactoryManager getClientFactoryManager() {
+ public ClientFactoryManager getFactoryManager() {
return (ClientFactoryManager) factoryManager;
}
@@ -301,7 +301,7 @@ public class ClientSessionImpl extends AbstractSession implements ClientSession
@Override
protected void checkKeys() throws SshException {
- ServerKeyVerifier serverKeyVerifier = getClientFactoryManager().getServerKeyVerifier();
+ ServerKeyVerifier serverKeyVerifier = getFactoryManager().getServerKeyVerifier();
SocketAddress remoteAddress = ioSession.getRemoteAddress();
if (!serverKeyVerifier.verifyServerKey(this, remoteAddress, kex.getServerKey())) {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c1a6b588/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 d98c510..9612b9b 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
@@ -102,7 +102,7 @@ public class ClientUserAuthService implements Service {
String welcome = buffer.getString();
String lang = buffer.getString();
log.debug("Welcome banner: {}", welcome);
- UserInteraction ui = session.getClientFactoryManager().getUserInteraction();
+ UserInteraction ui = session.getFactoryManager().getUserInteraction();
if (ui != null) {
ui.welcome(welcome);
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c1a6b588/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthKeyboardInteractive.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthKeyboardInteractive.java b/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthKeyboardInteractive.java
index 989d4a6..94cfdba 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthKeyboardInteractive.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthKeyboardInteractive.java
@@ -73,7 +73,7 @@ public class UserAuthKeyboardInteractive extends AbstractUserAuth {
}
private boolean checkPassword(ServerSession session, String username, String password) throws Exception {
- PasswordAuthenticator auth = session.getServerFactoryManager().getPasswordAuthenticator();
+ PasswordAuthenticator auth = session.getFactoryManager().getPasswordAuthenticator();
if (auth != null) {
return auth.authenticate(username, password, session);
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c1a6b588/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPassword.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPassword.java b/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPassword.java
index 8db22b8..50754ac 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPassword.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPassword.java
@@ -58,7 +58,7 @@ public class UserAuthPassword extends AbstractUserAuth {
}
private boolean checkPassword(ServerSession session, String username, String password) throws Exception {
- PasswordAuthenticator auth = session.getServerFactoryManager().getPasswordAuthenticator();
+ PasswordAuthenticator auth = session.getFactoryManager().getPasswordAuthenticator();
if (auth != null) {
return auth.authenticate(username, password, session);
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c1a6b588/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPublicKey.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPublicKey.java b/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPublicKey.java
index e71957c..e6fd677 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPublicKey.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPublicKey.java
@@ -70,7 +70,7 @@ public class UserAuthPublicKey extends AbstractUserAuth {
byte[] sig = hasSig ? buffer.getBytes() : null;
- PublickeyAuthenticator authenticator = session.getServerFactoryManager().getPublickeyAuthenticator();
+ PublickeyAuthenticator authenticator = session.getFactoryManager().getPublickeyAuthenticator();
if (authenticator == null) {
throw new Exception("No PublickeyAuthenticator configured");
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c1a6b588/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java b/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java
index ca6bb41..abb73d1 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java
@@ -207,7 +207,7 @@ public class UserAuthGSS extends AbstractUserAuth {
* @throws Exception If no GSS authenticator is defined
*/
private GSSAuthenticator getAuthenticator(ServerSession session) throws Exception {
- GSSAuthenticator ga = session.getServerFactoryManager().getGSSAuthenticator();
+ GSSAuthenticator ga = session.getFactoryManager().getGSSAuthenticator();
if (ga == null) {
throw new Exception("No GSSAuthenticator configured");
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c1a6b588/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
index 30c8311..0969335 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
@@ -65,7 +65,7 @@ public class ServerSession extends AbstractSession {
return negociated[index];
}
- public ServerFactoryManager getServerFactoryManager() {
+ public ServerFactoryManager getFactoryManager() {
return (ServerFactoryManager) factoryManager;
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c1a6b588/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 5ad87ad..cc173f8 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
@@ -255,7 +255,7 @@ public class ServerUserAuthService implements Service {
}
private ServerFactoryManager getFactoryManager() {
- return session.getServerFactoryManager();
+ return session.getFactoryManager();
}
}