Author: olamy
Date: Wed Sep 21 13:43:38 2011
New Revision: 1173640
URL: http://svn.apache.org/viewvc?rev=1173640&view=rev
Log:
[WAGON-350] add unit test for wagon ssh with an embedded ssh server
refactor with moving embedded server class to ssh-common-test for reuse it with
ssh-external test
Added:
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa
- copied, changed from r1173638,
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase
- copied, changed from r1173638,
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa-passphrase
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase.pub
- copied, changed from r1173638,
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa-passphrase.pub
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa.pub
- copied, changed from r1173638,
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa.pub
Removed:
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa-passphrase
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa-passphrase.pub
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa.pub
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java
maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonTest.java
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java?rev=1173640&r1=1173639&r2=1173640&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java
Wed Sep 21 13:43:38 2011
@@ -21,7 +21,7 @@ package org.apache.maven.wagon.providers
import org.apache.mina.core.session.IoSession;
import org.apache.sshd.SshServer;
import org.apache.sshd.common.Session;
-import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
+import org.apache.sshd.common.keyprovider.ResourceKeyPairProvider;
import org.apache.sshd.common.session.AbstractSession;
import org.apache.sshd.server.Command;
import org.apache.sshd.server.CommandFactory;
@@ -55,13 +55,17 @@ public class SshServerEmbedded
private SshServer sshd;
- private List<String> sshKeysFiles = new ArrayList<String>();
+ private List<String> sshKeysResources = new ArrayList<String>();
- public SshServerEmbedded( String wagonProtocol, List<String> sshKeysFiles )
+ /**
+ * @param wagonProtocol scp scpexe
+ * @param sshKeysResources paths in the classlaoder with ssh keys
+ */
+ public SshServerEmbedded( String wagonProtocol, List<String>
sshKeysResources )
{
this.wagonProtocol = wagonProtocol;
- this.sshKeysFiles = sshKeysFiles;
+ this.sshKeysResources = sshKeysResources;
this.sshd = SshServer.setUpDefaultServer();
@@ -86,11 +90,10 @@ public class SshServerEmbedded
}
} );
- FileKeyPairProvider fileKeyPairProvider = new FileKeyPairProvider();
-
- fileKeyPairProvider.setFiles( sshKeysFiles.toArray( new
String[sshKeysFiles.size()] ) );
+ ResourceKeyPairProvider resourceKeyPairProvider =
+ new ResourceKeyPairProvider( sshKeysResources.toArray( new
String[sshKeysResources.size()] ) );
- sshd.setKeyPairProvider( fileKeyPairProvider );
+ sshd.setKeyPairProvider( resourceKeyPairProvider );
SessionFactory sessionFactory = new SessionFactory()
{
@Override
Copied:
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa
(from r1173638,
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa)
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa?p2=maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa&p1=maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa&r1=1173638&r2=1173640&rev=1173640&view=diff
==============================================================================
(empty)
Copied:
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase
(from r1173638,
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa-passphrase)
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase?p2=maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase&p1=maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa-passphrase&r1=1173638&r2=1173640&rev=1173640&view=diff
==============================================================================
(empty)
Copied:
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase.pub
(from r1173638,
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa-passphrase.pub)
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase.pub?p2=maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase.pub&p1=maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa-passphrase.pub&r1=1173638&r2=1173640&rev=1173640&view=diff
==============================================================================
(empty)
Copied:
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa.pub
(from r1173638,
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa.pub)
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa.pub?p2=maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa.pub&p1=maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa.pub&r1=1173638&r2=1173640&rev=1173640&view=diff
==============================================================================
(empty)
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml?rev=1173640&r1=1173639&r2=1173640&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml Wed Sep 21 13:43:38 2011
@@ -107,5 +107,10 @@ under the License.
</plugins>
</build>
</profile>
+ <profile>
+ <id>windauze</id>
+
+
+ </profile>
</profiles>
</project>
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonTest.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonTest.java?rev=1173640&r1=1173639&r2=1173640&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonTest.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonTest.java
Wed Sep 21 13:43:38 2011
@@ -22,34 +22,14 @@ package org.apache.maven.wagon.providers
import org.apache.maven.wagon.StreamingWagonTestCase;
import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
-import org.apache.maven.wagon.providers.ssh.ShellCommand;
import org.apache.maven.wagon.providers.ssh.SshServerEmbedded;
import org.apache.maven.wagon.providers.ssh.TestData;
import org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider;
import org.apache.maven.wagon.repository.Repository;
import org.apache.maven.wagon.resource.Resource;
-import org.apache.mina.core.session.IoSession;
-import org.apache.sshd.SshServer;
-import org.apache.sshd.common.Session;
-import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
-import org.apache.sshd.common.session.AbstractSession;
-import org.apache.sshd.server.Command;
-import org.apache.sshd.server.CommandFactory;
-import org.apache.sshd.server.FileSystemFactory;
-import org.apache.sshd.server.FileSystemView;
-import org.apache.sshd.server.PublickeyAuthenticator;
-import org.apache.sshd.server.SshFile;
-import org.apache.sshd.server.auth.UserAuthPassword;
-import org.apache.sshd.server.auth.UserAuthPublicKey;
-import org.apache.sshd.server.filesystem.NativeSshFile;
-import org.apache.sshd.server.session.ServerSession;
-import org.apache.sshd.server.session.SessionFactory;
-import org.apache.sshd.server.shell.ProcessShellFactory;
-import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.io.IOException;
-import java.security.PublicKey;
import java.util.Arrays;
/**
@@ -99,9 +79,9 @@ public class ScpWagonTest
{
super.setUp();
- File sshKey = new File( System.getProperty( "sshKeysPath",
"src/test/ssh-keys" ), "id_rsa" );
+ String sshKeyResource = "ssh-keys/id_rsa";
- sshServerEmbedded = new SshServerEmbedded( getProtocol(),
Arrays.asList( sshKey.getPath() ) );
+ sshServerEmbedded = new SshServerEmbedded( getProtocol(),
Arrays.asList( sshKeyResource ) );
sshServerEmbedded.start();
System.out.println( "sshd on port " + sshServerEmbedded.getPort() );
@@ -155,6 +135,4 @@ public class ScpWagonTest
}
-
-
}
