From 69ea99cae52996d2cb891e46d01437360a81ecc5 Mon Sep 17 00:00:00 2001 From: brett Date: Fri, 18 Feb 2005 06:29:31 +0000 Subject: [PATCH] implement SFTP, SCPEXE wagons git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@154241 13f79535-47bb-0310-9956-ffa450edef68 --- artifact/project.xml | 5 +++++ .../artifact/deployer/DefaultArtifactDeployer.java | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/artifact/project.xml b/artifact/project.xml index 7af30b18..ae5376d8 100644 --- a/artifact/project.xml +++ b/artifact/project.xml @@ -146,6 +146,11 @@ wagon-ssh 1.0-alpha-2-SNAPSHOT + + maven + wagon-ssh-external + 1.0-alpha-2-SNAPSHOT + maven wagon-file diff --git a/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java b/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java index 1cb93bb4..0119bebb 100644 --- a/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java +++ b/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java @@ -36,11 +36,12 @@ import org.apache.maven.wagon.providers.file.FileWagon; import org.apache.maven.wagon.providers.ftp.FtpWagon; import org.apache.maven.wagon.providers.http.HttpWagon; import org.apache.maven.wagon.providers.ssh.ScpWagon; +import org.apache.maven.wagon.providers.ssh.SftpWagon; +import org.apache.maven.wagon.providers.sshext.ScpExternalWagon; import org.apache.maven.wagon.repository.Repository; import org.codehaus.plexus.util.FileUtils; import java.io.File; -import java.io.IOException; import java.net.MalformedURLException; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -413,7 +414,6 @@ public class DefaultArtifactDeployer private Wagon getWagon( String protocol ) throws MalformedURLException { - // TODO: implement others (SFTP, SCPEXE) if ( protocol.equals( "http" ) ) { return new HttpWagon(); @@ -422,6 +422,10 @@ public class DefaultArtifactDeployer { return new FtpWagon(); } + else if ( protocol.equals( "sftp" ) ) + { + return new SftpWagon(); + } else if ( protocol.equals( "file" ) ) { return new FileWagon(); @@ -430,6 +434,10 @@ public class DefaultArtifactDeployer { return new ScpWagon(); } + else if ( protocol.equals( "scpexe" ) ) + { + return new ScpExternalWagon(); + } else { throw new MalformedURLException( "Unknown Wagon protocol: " + protocol );