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 2009/03/30 21:16:20 UTC
svn commit: r760111 - in /mina/sshd/trunk/src: main/java/org/apache/sshd/
main/java/org/apache/sshd/client/ main/java/org/apache/sshd/client/auth/
main/java/org/apache/sshd/client/channel/
main/java/org/apache/sshd/client/future/ main/java/org/apache/s...
Author: gnodet
Date: Mon Mar 30 19:16:19 2009
New Revision: 760111
URL: http://svn.apache.org/viewvc?rev=760111&view=rev
Log:
Optimize import statements
Modified:
mina/sshd/trunk/src/main/java/org/apache/sshd/ClientChannel.java
mina/sshd/trunk/src/main/java/org/apache/sshd/ClientSession.java
mina/sshd/trunk/src/main/java/org/apache/sshd/SshClient.java
mina/sshd/trunk/src/main/java/org/apache/sshd/SshServer.java
mina/sshd/trunk/src/main/java/org/apache/sshd/client/SessionFactory.java
mina/sshd/trunk/src/main/java/org/apache/sshd/client/auth/UserAuthPassword.java
mina/sshd/trunk/src/main/java/org/apache/sshd/client/channel/AbstractClientChannel.java
mina/sshd/trunk/src/main/java/org/apache/sshd/client/channel/ChannelSession.java
mina/sshd/trunk/src/main/java/org/apache/sshd/client/channel/ChannelShell.java
mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/AuthFuture.java
mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/ConnectFuture.java
mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/DefaultConnectFuture.java
mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/OpenFuture.java
mina/sshd/trunk/src/main/java/org/apache/sshd/client/kex/AbstractDHGClient.java
mina/sshd/trunk/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
mina/sshd/trunk/src/main/java/org/apache/sshd/common/AbstractFactoryManager.java
mina/sshd/trunk/src/main/java/org/apache/sshd/common/AbstractSessionIoHandler.java
mina/sshd/trunk/src/main/java/org/apache/sshd/common/Channel.java
mina/sshd/trunk/src/main/java/org/apache/sshd/common/KeyExchange.java
mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java
mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/ChannelOutputStream.java
mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/ChannelPipedInputStream.java
mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/ChannelPipedOutputStream.java
mina/sshd/trunk/src/main/java/org/apache/sshd/common/compression/CompressionZlib.java
mina/sshd/trunk/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java
mina/sshd/trunk/src/main/java/org/apache/sshd/common/random/SingletonRandomFactory.java
mina/sshd/trunk/src/main/java/org/apache/sshd/common/session/AbstractSession.java
mina/sshd/trunk/src/main/java/org/apache/sshd/common/signature/AbstractSignature.java
mina/sshd/trunk/src/main/java/org/apache/sshd/common/util/NoCloseInputStream.java
mina/sshd/trunk/src/main/java/org/apache/sshd/common/util/NoCloseOutputStream.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/CommandFactory.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/PublickeyAuthenticator.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/ServerChannel.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/SessionFactory.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/ShellFactory.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/auth/UserAuthNone.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/auth/UserAuthPassword.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/auth/UserAuthPublicKey.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/command/ScpCommand.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/command/UnknownCommand.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/kex/AbstractDHGServer.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProvider.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProvider.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/pam/PAMPasswordAuthenticator.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/session/ServerSession.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/shell/InvertedShell.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/shell/InvertedShellWrapper.java
mina/sshd/trunk/src/main/java/org/apache/sshd/server/shell/ProcessShellFactory.java
mina/sshd/trunk/src/test/java/org/apache/sshd/AbstractSessionTest.java
mina/sshd/trunk/src/test/java/org/apache/sshd/CipherTest.java
mina/sshd/trunk/src/test/java/org/apache/sshd/ClientTest.java
mina/sshd/trunk/src/test/java/org/apache/sshd/CompressionTest.java
mina/sshd/trunk/src/test/java/org/apache/sshd/LoadTest.java
mina/sshd/trunk/src/test/java/org/apache/sshd/RandomTest.java
mina/sshd/trunk/src/test/java/org/apache/sshd/ServerTest.java
mina/sshd/trunk/src/test/java/org/apache/sshd/TestSpringConfig.java
mina/sshd/trunk/src/test/java/org/apache/sshd/util/Compression.java
mina/sshd/trunk/src/test/java/org/apache/sshd/util/EchoShellFactory.java
mina/sshd/trunk/src/test/java/org/apache/sshd/util/TeePipedOutputStream.java
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/ClientChannel.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/ClientChannel.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/ClientChannel.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/ClientChannel.java Mon Mar 30 19:16:19 2009
@@ -18,12 +18,11 @@
*/
package org.apache.sshd;
-import java.io.Closeable;
-import java.io.OutputStream;
import java.io.InputStream;
+import java.io.OutputStream;
-import org.apache.sshd.common.future.CloseFuture;
import org.apache.sshd.client.future.OpenFuture;
+import org.apache.sshd.common.future.CloseFuture;
/**
* A client channel used to communicate with
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/ClientSession.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/ClientSession.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/ClientSession.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/ClientSession.java Mon Mar 30 19:16:19 2009
@@ -18,12 +18,11 @@
*/
package org.apache.sshd;
-import java.security.PublicKey;
-import java.io.Closeable;
import java.io.IOException;
+import java.security.PublicKey;
-import org.apache.sshd.common.future.CloseFuture;
import org.apache.sshd.client.future.AuthFuture;
+import org.apache.sshd.common.future.CloseFuture;
/**
* An authenticated session to a given SSH server
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/SshClient.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/SshClient.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/SshClient.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/SshClient.java Mon Mar 30 19:16:19 2009
@@ -25,20 +25,17 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import org.apache.sshd.client.session.ClientSessionImpl;
-import org.apache.sshd.client.kex.DHG1;
-import org.apache.sshd.client.kex.DHG14;
+import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.service.IoConnector;
+import org.apache.mina.transport.socket.nio.NioSocketConnector;
+import org.apache.sshd.client.SessionFactory;
import org.apache.sshd.client.future.ConnectFuture;
import org.apache.sshd.client.future.DefaultConnectFuture;
-import org.apache.sshd.client.SessionFactory;
+import org.apache.sshd.client.kex.DHG1;
+import org.apache.sshd.client.kex.DHG14;
+import org.apache.sshd.client.session.ClientSessionImpl;
import org.apache.sshd.common.AbstractFactoryManager;
-import org.apache.sshd.common.session.AbstractSession;
-import org.apache.sshd.common.AbstractSessionIoHandler;
import org.apache.sshd.common.Cipher;
import org.apache.sshd.common.Compression;
import org.apache.sshd.common.KeyExchange;
@@ -58,17 +55,12 @@
import org.apache.sshd.common.random.BouncyCastleRandom;
import org.apache.sshd.common.random.JceRandom;
import org.apache.sshd.common.random.SingletonRandomFactory;
+import org.apache.sshd.common.session.AbstractSession;
import org.apache.sshd.common.signature.SignatureDSA;
import org.apache.sshd.common.signature.SignatureRSA;
-import org.apache.sshd.common.util.SecurityUtils;
import org.apache.sshd.common.util.NoCloseInputStream;
import org.apache.sshd.common.util.NoCloseOutputStream;
-import org.apache.mina.transport.socket.nio.NioSocketConnector;
-import org.apache.mina.transport.socket.SocketConnector;
-import org.apache.mina.core.service.IoConnector;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.core.future.IoFutureListener;
-import org.apache.mina.core.future.IoFuture;
+import org.apache.sshd.common.util.SecurityUtils;
/**
* Entry point for the client side of the SSH protocol.
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/SshServer.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/SshServer.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/SshServer.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/SshServer.java Mon Mar 30 19:16:19 2009
@@ -23,9 +23,9 @@
import java.util.Arrays;
import java.util.List;
+import org.apache.mina.core.service.IoAcceptor;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.sshd.common.AbstractFactoryManager;
-import org.apache.sshd.common.session.AbstractSession;
-import org.apache.sshd.common.AbstractSessionIoHandler;
import org.apache.sshd.common.Cipher;
import org.apache.sshd.common.Compression;
import org.apache.sshd.common.KeyExchange;
@@ -49,24 +49,20 @@
import org.apache.sshd.common.signature.SignatureDSA;
import org.apache.sshd.common.signature.SignatureRSA;
import org.apache.sshd.common.util.SecurityUtils;
-import org.apache.sshd.server.ServerChannel;
+import org.apache.sshd.server.CommandFactory;
import org.apache.sshd.server.PasswordAuthenticator;
import org.apache.sshd.server.PublickeyAuthenticator;
+import org.apache.sshd.server.ServerChannel;
import org.apache.sshd.server.ServerFactoryManager;
-import org.apache.sshd.server.session.ServerSession;
+import org.apache.sshd.server.SessionFactory;
import org.apache.sshd.server.ShellFactory;
import org.apache.sshd.server.UserAuth;
-import org.apache.sshd.server.SessionFactory;
-import org.apache.sshd.server.CommandFactory;
import org.apache.sshd.server.auth.UserAuthPassword;
import org.apache.sshd.server.auth.UserAuthPublicKey;
import org.apache.sshd.server.channel.ChannelSession;
import org.apache.sshd.server.kex.DHG1;
import org.apache.sshd.server.kex.DHG14;
import org.apache.sshd.server.shell.ProcessShellFactory;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.core.service.IoAcceptor;
/**
* The SshServer class is the main entry point for the server side of the SSH protocol.
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/client/SessionFactory.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/client/SessionFactory.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/client/SessionFactory.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/client/SessionFactory.java Mon Mar 30 19:16:19 2009
@@ -19,7 +19,6 @@
package org.apache.sshd.client;
import org.apache.mina.core.session.IoSession;
-import org.apache.sshd.SshServer;
import org.apache.sshd.SshClient;
import org.apache.sshd.client.session.ClientSessionImpl;
import org.apache.sshd.common.AbstractSessionIoHandler;
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/client/auth/UserAuthPassword.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/client/auth/UserAuthPassword.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/client/auth/UserAuthPassword.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/client/auth/UserAuthPassword.java Mon Mar 30 19:16:19 2009
@@ -20,10 +20,10 @@
import java.io.IOException;
+import org.apache.sshd.client.UserAuth;
+import org.apache.sshd.client.session.ClientSessionImpl;
import org.apache.sshd.common.SshConstants;
import org.apache.sshd.common.util.Buffer;
-import org.apache.sshd.client.session.ClientSessionImpl;
-import org.apache.sshd.client.UserAuth;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/client/channel/AbstractClientChannel.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/client/channel/AbstractClientChannel.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/client/channel/AbstractClientChannel.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/client/channel/AbstractClientChannel.java Mon Mar 30 19:16:19 2009
@@ -18,23 +18,21 @@
*/
package org.apache.sshd.client.channel;
-import java.io.OutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
-import org.apache.sshd.common.util.Buffer;
-import org.apache.sshd.common.util.IoUtils;
+import org.apache.sshd.ClientChannel;
+import org.apache.sshd.client.future.DefaultOpenFuture;
+import org.apache.sshd.client.future.OpenFuture;
+import org.apache.sshd.client.session.ClientSessionImpl;
import org.apache.sshd.common.SshConstants;
import org.apache.sshd.common.SshException;
+import org.apache.sshd.common.channel.AbstractChannel;
import org.apache.sshd.common.future.CloseFuture;
import org.apache.sshd.common.future.SshFutureListener;
-import org.apache.sshd.common.future.SshFuture;
-import org.apache.sshd.common.channel.AbstractChannel;
-import org.apache.sshd.ClientChannel;
-import org.apache.sshd.ClientSession;
-import org.apache.sshd.client.session.ClientSessionImpl;
-import org.apache.sshd.client.future.OpenFuture;
-import org.apache.sshd.client.future.DefaultOpenFuture;
+import org.apache.sshd.common.util.Buffer;
+import org.apache.sshd.common.util.IoUtils;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/client/channel/ChannelSession.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/client/channel/ChannelSession.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/client/channel/ChannelSession.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/client/channel/ChannelSession.java Mon Mar 30 19:16:19 2009
@@ -18,15 +18,9 @@
*/
package org.apache.sshd.client.channel;
-import java.io.IOException;
-
-import org.apache.sshd.common.util.Buffer;
-import org.apache.sshd.common.SshConstants;
-import org.apache.sshd.common.future.CloseFuture;
-import org.apache.sshd.common.future.SshFutureListener;
-import org.apache.sshd.common.future.SshFuture;
-import org.apache.sshd.ClientChannel;
import org.apache.sshd.client.future.OpenFuture;
+import org.apache.sshd.common.SshConstants;
+import org.apache.sshd.common.util.Buffer;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/client/channel/ChannelShell.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/client/channel/ChannelShell.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/client/channel/ChannelShell.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/client/channel/ChannelShell.java Mon Mar 30 19:16:19 2009
@@ -18,14 +18,8 @@
*/
package org.apache.sshd.client.channel;
-import java.io.IOException;
-
import org.apache.sshd.common.SshConstants;
-import org.apache.sshd.common.future.SshFutureListener;
-import org.apache.sshd.common.future.SshFuture;
import org.apache.sshd.common.util.Buffer;
-import org.apache.sshd.ClientChannel;
-import org.apache.sshd.client.future.OpenFuture;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/AuthFuture.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/AuthFuture.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/AuthFuture.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/AuthFuture.java Mon Mar 30 19:16:19 2009
@@ -19,7 +19,6 @@
package org.apache.sshd.client.future;
import org.apache.sshd.common.future.SshFuture;
-import org.apache.sshd.common.future.SshFutureListener;
/**
* An {@link SshFuture} for asynchronous authentication requests.
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/ConnectFuture.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/ConnectFuture.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/ConnectFuture.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/ConnectFuture.java Mon Mar 30 19:16:19 2009
@@ -18,9 +18,8 @@
*/
package org.apache.sshd.client.future;
-import org.apache.sshd.common.future.SshFuture;
-import org.apache.sshd.common.future.SshFutureListener;
import org.apache.sshd.ClientSession;
+import org.apache.sshd.common.future.SshFuture;
/**
* An {@link SshFuture} for asynchronous connections requests.
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/DefaultConnectFuture.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/DefaultConnectFuture.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/DefaultConnectFuture.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/DefaultConnectFuture.java Mon Mar 30 19:16:19 2009
@@ -18,9 +18,9 @@
*/
package org.apache.sshd.client.future;
-import org.apache.sshd.common.future.DefaultSshFuture;
-import org.apache.sshd.common.RuntimeSshException;
import org.apache.sshd.ClientSession;
+import org.apache.sshd.common.RuntimeSshException;
+import org.apache.sshd.common.future.DefaultSshFuture;
/**
* A default implementation of {@link ConnectFuture}.
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/OpenFuture.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/OpenFuture.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/OpenFuture.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/client/future/OpenFuture.java Mon Mar 30 19:16:19 2009
@@ -19,7 +19,6 @@
package org.apache.sshd.client.future;
import org.apache.sshd.common.future.SshFuture;
-import org.apache.sshd.common.future.SshFutureListener;
/**
* An {@link SshFuture} for asynchronous channel opening requests.
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/client/kex/AbstractDHGClient.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/client/kex/AbstractDHGClient.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/client/kex/AbstractDHGClient.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/client/kex/AbstractDHGClient.java Mon Mar 30 19:16:19 2009
@@ -22,7 +22,6 @@
import java.security.interfaces.RSAPublicKey;
import org.apache.sshd.client.session.ClientSessionImpl;
-import org.apache.sshd.common.session.AbstractSession;
import org.apache.sshd.common.Digest;
import org.apache.sshd.common.KeyExchange;
import org.apache.sshd.common.KeyPairProvider;
@@ -32,6 +31,7 @@
import org.apache.sshd.common.SshException;
import org.apache.sshd.common.digest.SHA1;
import org.apache.sshd.common.kex.DH;
+import org.apache.sshd.common.session.AbstractSession;
import org.apache.sshd.common.util.Buffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java Mon Mar 30 19:16:19 2009
@@ -18,26 +18,26 @@
*/
package org.apache.sshd.client.session;
-import java.security.PublicKey;
import java.io.IOException;
+import java.security.PublicKey;
+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.ChannelShell;
import org.apache.sshd.client.channel.AbstractClientChannel;
-import org.apache.sshd.client.UserAuth;
+import org.apache.sshd.client.channel.ChannelShell;
import org.apache.sshd.client.future.AuthFuture;
import org.apache.sshd.client.future.DefaultAuthFuture;
-import org.apache.sshd.ClientSession;
-import org.apache.sshd.ClientChannel;
-import org.apache.sshd.common.session.AbstractSession;
import org.apache.sshd.common.KeyPairProvider;
import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.common.SshConstants;
import org.apache.sshd.common.SshException;
import org.apache.sshd.common.future.CloseFuture;
+import org.apache.sshd.common.session.AbstractSession;
import org.apache.sshd.common.util.Buffer;
-import org.apache.mina.core.session.IoSession;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/AbstractFactoryManager.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/common/AbstractFactoryManager.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/common/AbstractFactoryManager.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/common/AbstractFactoryManager.java Mon Mar 30 19:16:19 2009
@@ -18,11 +18,11 @@
*/
package org.apache.sshd.common;
+import java.io.InputStream;
+import java.util.HashMap;
import java.util.List;
-import java.util.Properties;
import java.util.Map;
-import java.util.HashMap;
-import java.io.InputStream;
+import java.util.Properties;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/AbstractSessionIoHandler.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/common/AbstractSessionIoHandler.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/common/AbstractSessionIoHandler.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/common/AbstractSessionIoHandler.java Mon Mar 30 19:16:19 2009
@@ -18,9 +18,9 @@
*/
package org.apache.sshd.common;
+import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IoSession;
-import org.apache.mina.core.buffer.IoBuffer;
import org.apache.sshd.common.session.AbstractSession;
/**
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/Channel.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/common/Channel.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/common/Channel.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/common/Channel.java Mon Mar 30 19:16:19 2009
@@ -18,11 +18,10 @@
*/
package org.apache.sshd.common;
-import java.io.Closeable;
import java.io.IOException;
-import org.apache.sshd.common.util.Buffer;
import org.apache.sshd.common.future.CloseFuture;
+import org.apache.sshd.common.util.Buffer;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/KeyExchange.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/common/KeyExchange.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/common/KeyExchange.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/common/KeyExchange.java Mon Mar 30 19:16:19 2009
@@ -18,8 +18,8 @@
*/
package org.apache.sshd.common;
-import org.apache.sshd.common.util.Buffer;
import org.apache.sshd.common.session.AbstractSession;
+import org.apache.sshd.common.util.Buffer;
/**
* Key exchange algorithm.
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java Mon Mar 30 19:16:19 2009
@@ -20,16 +20,16 @@
import java.io.IOException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.sshd.common.session.AbstractSession;
-import org.apache.sshd.common.SshConstants;
import org.apache.sshd.common.Channel;
import org.apache.sshd.common.FactoryManager;
+import org.apache.sshd.common.SshConstants;
import org.apache.sshd.common.future.CloseFuture;
import org.apache.sshd.common.future.DefaultCloseFuture;
+import org.apache.sshd.common.session.AbstractSession;
import org.apache.sshd.common.util.Buffer;
import org.apache.sshd.common.util.BufferUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/ChannelOutputStream.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/ChannelOutputStream.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/ChannelOutputStream.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/ChannelOutputStream.java Mon Mar 30 19:16:19 2009
@@ -18,8 +18,8 @@
*/
package org.apache.sshd.common.channel;
-import java.io.OutputStream;
import java.io.IOException;
+import java.io.OutputStream;
import org.apache.sshd.common.SshConstants;
import org.apache.sshd.common.SshException;
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/ChannelPipedInputStream.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/ChannelPipedInputStream.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/ChannelPipedInputStream.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/ChannelPipedInputStream.java Mon Mar 30 19:16:19 2009
@@ -18,8 +18,8 @@
*/
package org.apache.sshd.common.channel;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InterruptedIOException;
import org.apache.sshd.common.util.Buffer;
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/ChannelPipedOutputStream.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/ChannelPipedOutputStream.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/ChannelPipedOutputStream.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/common/channel/ChannelPipedOutputStream.java Mon Mar 30 19:16:19 2009
@@ -18,8 +18,8 @@
*/
package org.apache.sshd.common.channel;
-import java.io.OutputStream;
import java.io.IOException;
+import java.io.OutputStream;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/compression/CompressionZlib.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/common/compression/CompressionZlib.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/common/compression/CompressionZlib.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/common/compression/CompressionZlib.java Mon Mar 30 19:16:19 2009
@@ -20,13 +20,13 @@
import java.io.IOException;
+import com.jcraft.jzlib.JZlib;
+import com.jcraft.jzlib.ZStream;
import org.apache.sshd.common.Compression;
import org.apache.sshd.common.NamedFactory;
-import org.apache.sshd.common.SshException;
import org.apache.sshd.common.SshConstants;
+import org.apache.sshd.common.SshException;
import org.apache.sshd.common.util.Buffer;
-import com.jcraft.jzlib.JZlib;
-import com.jcraft.jzlib.ZStream;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java Mon Mar 30 19:16:19 2009
@@ -18,8 +18,8 @@
*/
package org.apache.sshd.common.future;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import java.util.concurrent.TimeUnit;
import org.apache.mina.util.ExceptionMonitor;
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/random/SingletonRandomFactory.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/common/random/SingletonRandomFactory.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/common/random/SingletonRandomFactory.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/common/random/SingletonRandomFactory.java Mon Mar 30 19:16:19 2009
@@ -18,8 +18,8 @@
*/
package org.apache.sshd.common.random;
-import org.apache.sshd.common.Random;
import org.apache.sshd.common.NamedFactory;
+import org.apache.sshd.common.Random;
/**
* A random factory wrapper that uses a single random instance.
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/session/AbstractSession.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/common/session/AbstractSession.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/common/session/AbstractSession.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/common/session/AbstractSession.java Mon Mar 30 19:16:19 2009
@@ -21,33 +21,30 @@
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.sshd.common.util.Buffer;
-import org.apache.sshd.common.util.BufferUtils;
-import org.apache.sshd.common.util.IoUtils;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.future.IoFuture;
+import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.session.IoSession;
+import org.apache.sshd.common.Channel;
+import org.apache.sshd.common.Cipher;
+import org.apache.sshd.common.Compression;
+import org.apache.sshd.common.Digest;
import org.apache.sshd.common.FactoryManager;
-import org.apache.sshd.common.Random;
import org.apache.sshd.common.KeyExchange;
-import org.apache.sshd.common.Cipher;
import org.apache.sshd.common.Mac;
-import org.apache.sshd.common.Compression;
-import org.apache.sshd.common.Channel;
import org.apache.sshd.common.NamedFactory;
+import org.apache.sshd.common.Random;
import org.apache.sshd.common.SshConstants;
-import org.apache.sshd.common.Digest;
import org.apache.sshd.common.SshException;
-import org.apache.sshd.common.channel.AbstractChannel;
import org.apache.sshd.common.future.CloseFuture;
import org.apache.sshd.common.future.DefaultCloseFuture;
-import org.apache.sshd.common.future.SshFutureListener;
import org.apache.sshd.common.future.SshFuture;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.core.buffer.IoBuffer;
-import org.apache.mina.core.future.WriteFuture;
-import org.apache.mina.core.future.IoFutureListener;
-import org.apache.mina.core.future.IoFuture;
+import org.apache.sshd.common.future.SshFutureListener;
+import org.apache.sshd.common.util.Buffer;
+import org.apache.sshd.common.util.BufferUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/signature/AbstractSignature.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/common/signature/AbstractSignature.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/common/signature/AbstractSignature.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/common/signature/AbstractSignature.java Mon Mar 30 19:16:19 2009
@@ -18,8 +18,8 @@
*/
package org.apache.sshd.common.signature;
-import java.security.PublicKey;
import java.security.PrivateKey;
+import java.security.PublicKey;
import org.apache.sshd.common.Signature;
import org.apache.sshd.common.util.SecurityUtils;
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/util/NoCloseInputStream.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/common/util/NoCloseInputStream.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/common/util/NoCloseInputStream.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/common/util/NoCloseInputStream.java Mon Mar 30 19:16:19 2009
@@ -19,8 +19,8 @@
package org.apache.sshd.common.util;
import java.io.FilterInputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/util/NoCloseOutputStream.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/common/util/NoCloseOutputStream.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/common/util/NoCloseOutputStream.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/common/util/NoCloseOutputStream.java Mon Mar 30 19:16:19 2009
@@ -19,8 +19,8 @@
package org.apache.sshd.common.util;
import java.io.FilterOutputStream;
-import java.io.OutputStream;
import java.io.IOException;
+import java.io.OutputStream;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/CommandFactory.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/CommandFactory.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/CommandFactory.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/CommandFactory.java Mon Mar 30 19:16:19 2009
@@ -18,9 +18,9 @@
*/
package org.apache.sshd.server;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
import org.apache.sshd.server.session.ServerSession;
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/PublickeyAuthenticator.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/PublickeyAuthenticator.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/PublickeyAuthenticator.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/PublickeyAuthenticator.java Mon Mar 30 19:16:19 2009
@@ -18,10 +18,10 @@
*/
package org.apache.sshd.server;
-import org.apache.sshd.server.session.ServerSession;
-
import java.security.PublicKey;
+import org.apache.sshd.server.session.ServerSession;
+
/**
* TODO Add javadoc
*
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/ServerChannel.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/ServerChannel.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/ServerChannel.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/ServerChannel.java Mon Mar 30 19:16:19 2009
@@ -20,9 +20,9 @@
import java.io.IOException;
-import org.apache.sshd.common.util.Buffer;
import org.apache.sshd.common.Channel;
import org.apache.sshd.common.channel.Window;
+import org.apache.sshd.common.util.Buffer;
import org.apache.sshd.server.session.ServerSession;
/**
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/SessionFactory.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/SessionFactory.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/SessionFactory.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/SessionFactory.java Mon Mar 30 19:16:19 2009
@@ -18,16 +18,10 @@
*/
package org.apache.sshd.server;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-
import org.apache.mina.core.session.IoSession;
-
-import org.apache.sshd.common.session.AbstractSession;
-import org.apache.sshd.common.AbstractSessionIoHandler;
-
import org.apache.sshd.SshServer;
+import org.apache.sshd.common.AbstractSessionIoHandler;
+import org.apache.sshd.common.session.AbstractSession;
import org.apache.sshd.server.session.ServerSession;
/**
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/ShellFactory.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/ShellFactory.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/ShellFactory.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/ShellFactory.java Mon Mar 30 19:16:19 2009
@@ -18,9 +18,9 @@
*/
package org.apache.sshd.server;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
import java.util.Map;
/**
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/auth/UserAuthNone.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/auth/UserAuthNone.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/auth/UserAuthNone.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/auth/UserAuthNone.java Mon Mar 30 19:16:19 2009
@@ -20,8 +20,8 @@
import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.common.util.Buffer;
-import org.apache.sshd.server.session.ServerSession;
import org.apache.sshd.server.UserAuth;
+import org.apache.sshd.server.session.ServerSession;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/auth/UserAuthPassword.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/auth/UserAuthPassword.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/auth/UserAuthPassword.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/auth/UserAuthPassword.java Mon Mar 30 19:16:19 2009
@@ -21,8 +21,8 @@
import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.common.util.Buffer;
import org.apache.sshd.server.PasswordAuthenticator;
-import org.apache.sshd.server.session.ServerSession;
import org.apache.sshd.server.UserAuth;
+import org.apache.sshd.server.session.ServerSession;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/auth/UserAuthPublicKey.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/auth/UserAuthPublicKey.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/auth/UserAuthPublicKey.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/auth/UserAuthPublicKey.java Mon Mar 30 19:16:19 2009
@@ -27,8 +27,8 @@
import org.apache.sshd.common.SshConstants;
import org.apache.sshd.common.util.Buffer;
import org.apache.sshd.server.PublickeyAuthenticator;
-import org.apache.sshd.server.session.ServerSession;
import org.apache.sshd.server.UserAuth;
+import org.apache.sshd.server.session.ServerSession;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java Mon Mar 30 19:16:19 2009
@@ -28,19 +28,19 @@
import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.common.SshConstants;
-import org.apache.sshd.common.future.CloseFuture;
-import org.apache.sshd.common.future.SshFutureListener;
-import org.apache.sshd.common.future.SshFuture;
import org.apache.sshd.common.channel.ChannelOutputStream;
-import org.apache.sshd.common.channel.ChannelPipedOutputStream;
import org.apache.sshd.common.channel.ChannelPipedInputStream;
+import org.apache.sshd.common.channel.ChannelPipedOutputStream;
+import org.apache.sshd.common.future.CloseFuture;
+import org.apache.sshd.common.future.SshFuture;
+import org.apache.sshd.common.future.SshFutureListener;
import org.apache.sshd.common.util.Buffer;
+import org.apache.sshd.common.util.IoUtils;
import org.apache.sshd.common.util.LfToCrLfFilterOutputStream;
import org.apache.sshd.common.util.LoggingFilterOutputStream;
-import org.apache.sshd.common.util.IoUtils;
+import org.apache.sshd.server.CommandFactory;
import org.apache.sshd.server.ServerChannel;
import org.apache.sshd.server.ShellFactory;
-import org.apache.sshd.server.CommandFactory;
import org.apache.sshd.server.session.ServerSession;
/**
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/command/ScpCommand.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/command/ScpCommand.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/command/ScpCommand.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/command/ScpCommand.java Mon Mar 30 19:16:19 2009
@@ -18,13 +18,13 @@
*/
package org.apache.sshd.server.command;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import org.apache.sshd.server.CommandFactory;
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/command/UnknownCommand.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/command/UnknownCommand.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/command/UnknownCommand.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/command/UnknownCommand.java Mon Mar 30 19:16:19 2009
@@ -18,9 +18,9 @@
*/
package org.apache.sshd.server.command;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
import org.apache.sshd.server.CommandFactory;
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/kex/AbstractDHGServer.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/kex/AbstractDHGServer.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/kex/AbstractDHGServer.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/kex/AbstractDHGServer.java Mon Mar 30 19:16:19 2009
@@ -20,7 +20,6 @@
import java.security.KeyPair;
-import org.apache.sshd.common.session.AbstractSession;
import org.apache.sshd.common.Digest;
import org.apache.sshd.common.KeyExchange;
import org.apache.sshd.common.NamedFactory;
@@ -29,6 +28,7 @@
import org.apache.sshd.common.SshException;
import org.apache.sshd.common.digest.SHA1;
import org.apache.sshd.common.kex.DH;
+import org.apache.sshd.common.session.AbstractSession;
import org.apache.sshd.common.util.Buffer;
import org.apache.sshd.common.util.BufferUtils;
import org.apache.sshd.server.session.ServerSession;
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProvider.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProvider.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProvider.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProvider.java Mon Mar 30 19:16:19 2009
@@ -18,10 +18,10 @@
*/
package org.apache.sshd.server.keyprovider;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.io.OutputStreamWriter;
import java.security.KeyPair;
import org.bouncycastle.openssl.PEMReader;
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProvider.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProvider.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProvider.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProvider.java Mon Mar 30 19:16:19 2009
@@ -18,11 +18,11 @@
*/
package org.apache.sshd.server.keyprovider;
-import java.security.KeyPair;
import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.ObjectOutputStream;
import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.security.KeyPair;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/pam/PAMPasswordAuthenticator.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/pam/PAMPasswordAuthenticator.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/pam/PAMPasswordAuthenticator.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/pam/PAMPasswordAuthenticator.java Mon Mar 30 19:16:19 2009
@@ -18,9 +18,9 @@
*/
package org.apache.sshd.server.pam;
-import org.apache.sshd.server.PasswordAuthenticator;
import net.sf.jpam.Pam;
import net.sf.jpam.PamReturnValue;
+import org.apache.sshd.server.PasswordAuthenticator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/session/ServerSession.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/session/ServerSession.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/session/ServerSession.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/session/ServerSession.java Mon Mar 30 19:16:19 2009
@@ -18,27 +18,26 @@
*/
package org.apache.sshd.server.session;
+import java.io.IOException;
import java.security.KeyPair;
import java.util.ArrayList;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
-import java.io.IOException;
+import org.apache.mina.core.session.IoSession;
import org.apache.sshd.SshServer;
-import org.apache.sshd.server.UserAuth;
-import org.apache.sshd.server.ServerFactoryManager;
-import org.apache.sshd.server.ServerChannel;
-import org.apache.sshd.common.session.AbstractSession;
+import org.apache.sshd.common.FactoryManager;
import org.apache.sshd.common.KeyExchange;
import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.common.SshConstants;
import org.apache.sshd.common.SshException;
-import org.apache.sshd.common.FactoryManager;
import org.apache.sshd.common.future.CloseFuture;
+import org.apache.sshd.common.session.AbstractSession;
import org.apache.sshd.common.util.Buffer;
-import org.apache.mina.transport.socket.SocketSessionConfig;
-import org.apache.mina.core.session.IoSession;
+import org.apache.sshd.server.ServerChannel;
+import org.apache.sshd.server.ServerFactoryManager;
+import org.apache.sshd.server.UserAuth;
/**
*
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/shell/InvertedShell.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/shell/InvertedShell.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/shell/InvertedShell.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/shell/InvertedShell.java Mon Mar 30 19:16:19 2009
@@ -18,10 +18,10 @@
*/
package org.apache.sshd.server.shell;
-import java.util.Map;
import java.io.IOException;
-import java.io.OutputStream;
import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Map;
/**
* This shell have inverted streams, such as the one obtained when launching a
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/shell/InvertedShellWrapper.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/shell/InvertedShellWrapper.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/shell/InvertedShellWrapper.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/shell/InvertedShellWrapper.java Mon Mar 30 19:16:19 2009
@@ -18,9 +18,9 @@
*/
package org.apache.sshd.server.shell;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
import java.util.Map;
import org.apache.sshd.server.ShellFactory;
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/server/shell/ProcessShellFactory.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/shell/ProcessShellFactory.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/main/java/org/apache/sshd/server/shell/ProcessShellFactory.java (original)
+++ mina/sshd/trunk/src/main/java/org/apache/sshd/server/shell/ProcessShellFactory.java Mon Mar 30 19:16:19 2009
@@ -18,9 +18,9 @@
*/
package org.apache.sshd.server.shell;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
import java.util.Map;
import org.apache.sshd.server.ShellFactory;
Modified: mina/sshd/trunk/src/test/java/org/apache/sshd/AbstractSessionTest.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/test/java/org/apache/sshd/AbstractSessionTest.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/test/java/org/apache/sshd/AbstractSessionTest.java (original)
+++ mina/sshd/trunk/src/test/java/org/apache/sshd/AbstractSessionTest.java Mon Mar 30 19:16:19 2009
@@ -18,15 +18,14 @@
*/
package org.apache.sshd;
+import org.apache.mina.core.buffer.IoBuffer;
import org.apache.sshd.common.session.AbstractSession;
import org.apache.sshd.common.util.Buffer;
-import org.apache.sshd.SshServer;
-import org.apache.mina.core.buffer.IoBuffer;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.*;
-
/**
* TODO Add javadoc
*
Modified: mina/sshd/trunk/src/test/java/org/apache/sshd/CipherTest.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/test/java/org/apache/sshd/CipherTest.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/test/java/org/apache/sshd/CipherTest.java (original)
+++ mina/sshd/trunk/src/test/java/org/apache/sshd/CipherTest.java Mon Mar 30 19:16:19 2009
@@ -18,30 +18,30 @@
*/
package org.apache.sshd;
-import java.util.Arrays;
-import java.io.OutputStream;
import java.io.InputStream;
+import java.io.OutputStream;
import java.net.ServerSocket;
+import java.util.Arrays;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.Ignore;
-import com.jcraft.jsch.*;
-import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
+import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.Logger;
+import com.jcraft.jsch.UserInfo;
+import org.apache.sshd.common.Cipher;
+import org.apache.sshd.common.NamedFactory;
+import org.apache.sshd.common.Random;
import org.apache.sshd.common.cipher.AES128CBC;
import org.apache.sshd.common.cipher.AES192CBC;
import org.apache.sshd.common.cipher.AES256CBC;
import org.apache.sshd.common.cipher.BlowfishCBC;
import org.apache.sshd.common.cipher.TripleDESCBC;
-import org.apache.sshd.common.*;
-import org.apache.sshd.common.Cipher;
-import org.apache.sshd.common.Random;
+import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
import org.apache.sshd.common.random.BouncyCastleRandom;
-import org.apache.sshd.SshServer;
-import org.apache.sshd.util.EchoShellFactory;
import org.apache.sshd.util.BogusPasswordAuthenticator;
-
+import org.apache.sshd.util.EchoShellFactory;
+import org.junit.After;
import static org.junit.Assert.assertEquals;
+import org.junit.Ignore;
+import org.junit.Test;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/test/java/org/apache/sshd/ClientTest.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/test/java/org/apache/sshd/ClientTest.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/test/java/org/apache/sshd/ClientTest.java (original)
+++ mina/sshd/trunk/src/test/java/org/apache/sshd/ClientTest.java Mon Mar 30 19:16:19 2009
@@ -18,31 +18,28 @@
*/
package org.apache.sshd;
-import java.io.PipedOutputStream;
-import java.io.PipedInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
import java.net.ServerSocket;
-import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
-import org.apache.sshd.common.util.BufferUtils;
-import org.apache.sshd.common.SshException;
-import org.apache.sshd.common.future.CloseFuture;
-import org.apache.sshd.ClientChannel;
-import org.apache.sshd.ClientSession;
-import org.apache.sshd.SshClient;
-import org.apache.sshd.SshServer;
import org.apache.sshd.client.future.AuthFuture;
import org.apache.sshd.client.future.OpenFuture;
-import org.apache.sshd.util.EchoShellFactory;
+import org.apache.sshd.common.SshException;
+import org.apache.sshd.common.future.CloseFuture;
+import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
+import org.apache.sshd.common.util.BufferUtils;
import org.apache.sshd.util.BogusPasswordAuthenticator;
+import org.apache.sshd.util.EchoShellFactory;
import org.apache.sshd.util.TeePipedOutputStream;
import org.junit.After;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.*;
-
/**
* TODO Add javadoc
*
Modified: mina/sshd/trunk/src/test/java/org/apache/sshd/CompressionTest.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/test/java/org/apache/sshd/CompressionTest.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/test/java/org/apache/sshd/CompressionTest.java (original)
+++ mina/sshd/trunk/src/test/java/org/apache/sshd/CompressionTest.java Mon Mar 30 19:16:19 2009
@@ -18,22 +18,23 @@
*/
package org.apache.sshd;
-import java.util.Arrays;
-import java.io.OutputStream;
import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Arrays;
-import org.junit.After;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import com.jcraft.jsch.*;
-import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
+import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.Logger;
+import com.jcraft.jsch.UserInfo;
+import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.common.compression.CompressionDelayedZlib;
import org.apache.sshd.common.compression.CompressionNone;
import org.apache.sshd.common.compression.CompressionZlib;
-import org.apache.sshd.common.*;
-import org.apache.sshd.SshServer;
-import org.apache.sshd.util.EchoShellFactory;
+import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
import org.apache.sshd.util.BogusPasswordAuthenticator;
+import org.apache.sshd.util.EchoShellFactory;
+import org.junit.After;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/test/java/org/apache/sshd/LoadTest.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/test/java/org/apache/sshd/LoadTest.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/test/java/org/apache/sshd/LoadTest.java (original)
+++ mina/sshd/trunk/src/test/java/org/apache/sshd/LoadTest.java Mon Mar 30 19:16:19 2009
@@ -1,30 +1,25 @@
package org.apache.sshd;
-import java.net.ServerSocket;
import java.io.ByteArrayOutputStream;
-import java.io.PipedOutputStream;
import java.io.PipedInputStream;
-import java.util.concurrent.CountDownLatch;
+import java.io.PipedOutputStream;
+import java.net.ServerSocket;
import java.util.Arrays;
+import java.util.concurrent.CountDownLatch;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.Assert;
-import static org.junit.Assert.assertArrayEquals;
-import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
+import org.apache.sshd.client.kex.DHG1;
+import org.apache.sshd.common.Cipher;
import org.apache.sshd.common.KeyExchange;
import org.apache.sshd.common.NamedFactory;
-import org.apache.sshd.common.Cipher;
-import org.apache.sshd.common.cipher.AES128CBC;
-import org.apache.sshd.common.cipher.TripleDESCBC;
import org.apache.sshd.common.cipher.BlowfishCBC;
-import org.apache.sshd.common.cipher.AES192CBC;
-import org.apache.sshd.common.cipher.AES256CBC;
-import org.apache.sshd.util.EchoShellFactory;
+import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
import org.apache.sshd.util.BogusPasswordAuthenticator;
+import org.apache.sshd.util.EchoShellFactory;
import org.apache.sshd.util.TeePipedOutputStream;
-import org.apache.sshd.client.kex.DHG1;
+import org.junit.After;
+import static org.junit.Assert.assertArrayEquals;
+import org.junit.Before;
+import org.junit.Test;
public class LoadTest {
Modified: mina/sshd/trunk/src/test/java/org/apache/sshd/RandomTest.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/test/java/org/apache/sshd/RandomTest.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/test/java/org/apache/sshd/RandomTest.java (original)
+++ mina/sshd/trunk/src/test/java/org/apache/sshd/RandomTest.java Mon Mar 30 19:16:19 2009
@@ -18,10 +18,10 @@
*/
package org.apache.sshd;
-import org.junit.Test;
-import org.apache.sshd.common.random.JceRandom;
-import org.apache.sshd.common.random.BouncyCastleRandom;
import org.apache.sshd.common.Random;
+import org.apache.sshd.common.random.BouncyCastleRandom;
+import org.apache.sshd.common.random.JceRandom;
+import org.junit.Test;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/test/java/org/apache/sshd/ServerTest.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/test/java/org/apache/sshd/ServerTest.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/test/java/org/apache/sshd/ServerTest.java (original)
+++ mina/sshd/trunk/src/test/java/org/apache/sshd/ServerTest.java Mon Mar 30 19:16:19 2009
@@ -20,22 +20,19 @@
import java.net.ServerSocket;
+import org.apache.mina.core.session.IoSession;
+import org.apache.sshd.client.SessionFactory;
+import org.apache.sshd.client.session.ClientSessionImpl;
+import org.apache.sshd.common.SshConstants;
import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
import org.apache.sshd.common.session.AbstractSession;
-import org.apache.sshd.common.SshConstants;
-import org.apache.sshd.util.EchoShellFactory;
-import org.apache.sshd.util.BogusPasswordAuthenticator;
import org.apache.sshd.server.command.ScpCommandFactory;
-import org.apache.sshd.ClientSession;
-import org.apache.sshd.SshClient;
-import org.apache.sshd.SshServer;
-import org.apache.sshd.client.SessionFactory;
-import org.apache.sshd.client.session.ClientSessionImpl;
-import org.apache.mina.core.session.IoSession;
+import org.apache.sshd.util.BogusPasswordAuthenticator;
+import org.apache.sshd.util.EchoShellFactory;
+import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.junit.Assert;
-import org.junit.After;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/test/java/org/apache/sshd/TestSpringConfig.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/test/java/org/apache/sshd/TestSpringConfig.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/test/java/org/apache/sshd/TestSpringConfig.java (original)
+++ mina/sshd/trunk/src/test/java/org/apache/sshd/TestSpringConfig.java Mon Mar 30 19:16:19 2009
@@ -20,14 +20,14 @@
import java.io.OutputStream;
-import org.junit.Test;
-import org.junit.Before;
-import org.junit.After;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
import com.jcraft.jsch.Channel;
-import com.jcraft.jsch.Logger;
import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.Logger;
import com.jcraft.jsch.UserInfo;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/test/java/org/apache/sshd/util/Compression.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/test/java/org/apache/sshd/util/Compression.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/test/java/org/apache/sshd/util/Compression.java (original)
+++ mina/sshd/trunk/src/test/java/org/apache/sshd/util/Compression.java Mon Mar 30 19:16:19 2009
@@ -46,7 +46,9 @@
*/
package org.apache.sshd.util;
-import com.jcraft.jzlib.*;
+
+import com.jcraft.jzlib.JZlib;
+import com.jcraft.jzlib.ZStream;
/**
* TODO Add javadoc
Modified: mina/sshd/trunk/src/test/java/org/apache/sshd/util/EchoShellFactory.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/test/java/org/apache/sshd/util/EchoShellFactory.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/test/java/org/apache/sshd/util/EchoShellFactory.java (original)
+++ mina/sshd/trunk/src/test/java/org/apache/sshd/util/EchoShellFactory.java Mon Mar 30 19:16:19 2009
@@ -18,11 +18,11 @@
*/
package org.apache.sshd.util;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.util.Map;
import org.apache.sshd.server.ShellFactory;
Modified: mina/sshd/trunk/src/test/java/org/apache/sshd/util/TeePipedOutputStream.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/test/java/org/apache/sshd/util/TeePipedOutputStream.java?rev=760111&r1=760110&r2=760111&view=diff
==============================================================================
--- mina/sshd/trunk/src/test/java/org/apache/sshd/util/TeePipedOutputStream.java (original)
+++ mina/sshd/trunk/src/test/java/org/apache/sshd/util/TeePipedOutputStream.java Mon Mar 30 19:16:19 2009
@@ -18,9 +18,9 @@
*/
package org.apache.sshd.util;
-import java.io.PipedOutputStream;
-import java.io.OutputStream;
import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PipedOutputStream;
/**
* TODO Add javadoc