svn commit: r798066 - in /mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd: client/session/ClientSessionImpl.java server/session/ServerSession.java

[gnodet]

Author: gnodet
Date: Mon Jul 27 07:58:18 2009
New Revision: 798066

URL: http://svn.apache.org/viewvc?rev=798066&view=rev
Log:
SSHD-31: Change SshClient / SshServer arguments to FactoryManager

Modified:
    
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
    
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java

Modified: 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
URL: 
http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java?rev=798066&r1=798065&r2=798066&view=diff
==============================================================================
--- 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
 (original)
+++ 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
 Mon Jul 27 07:58:18 2009
@@ -24,7 +24,6 @@
 import org.apache.mina.core.session.IoSession;
 import org.apache.sshd.ClientChannel;
 import org.apache.sshd.ClientSession;
-import org.apache.sshd.SshClient;
 import org.apache.sshd.client.UserAuth;
 import org.apache.sshd.client.auth.UserAuthPassword;
 import org.apache.sshd.client.channel.AbstractClientChannel;
@@ -32,6 +31,7 @@
 import org.apache.sshd.client.channel.ChannelExec;
 import org.apache.sshd.client.future.AuthFuture;
 import org.apache.sshd.client.future.DefaultAuthFuture;
+import org.apache.sshd.common.FactoryManager;
 import org.apache.sshd.common.KeyPairProvider;
 import org.apache.sshd.common.NamedFactory;
 import org.apache.sshd.common.SshConstants;
@@ -57,7 +57,7 @@
     private UserAuth userAuth;
     private AuthFuture authFuture;
 
-    public ClientSessionImpl(SshClient client, IoSession session) throws 
Exception {
+    public ClientSessionImpl(FactoryManager client, IoSession session) throws 
Exception {
         super(client, session);
         log.info("Session created...");
         sendClientIdentification();

Modified: 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
URL: 
http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java?rev=798066&r1=798065&r2=798066&view=diff
==============================================================================
--- 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
 (original)
+++ 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
 Mon Jul 27 07:58:18 2009
@@ -26,7 +26,6 @@
 import java.util.TimerTask;
 
 import org.apache.mina.core.session.IoSession;
-import org.apache.sshd.SshServer;
 import org.apache.sshd.common.FactoryManager;
 import org.apache.sshd.common.KeyExchange;
 import org.apache.sshd.common.NamedFactory;
@@ -72,7 +71,7 @@
         ReceiveKexInit, Kex, ReceiveNewKeys, WaitingUserAuth, UserAuth, 
Running, Unknown
     }
 
-    public ServerSession(SshServer server, IoSession ioSession) throws 
Exception {
+    public ServerSession(FactoryManager server, IoSession ioSession) throws 
Exception {
         super(server, ioSession);
         maxAuthRequests = getIntProperty(FactoryManager.MAX_AUTH_REQUESTS, 
maxAuthRequests);
         authTimeout = getIntProperty(FactoryManager.AUTH_TIMEOUT, authTimeout);