You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wagon-commits@maven.apache.org by br...@apache.org on 2006/01/05 04:33:57 UTC
svn commit: r366069 -
/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagon.java
Author: brett
Date: Wed Jan 4 19:33:54 2006
New Revision: 366069
URL: http://svn.apache.org/viewcvs?rev=366069&view=rev
Log:
cleanup
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagon.java
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagon.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagon.java?rev=366069&r1=366068&r2=366069&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagon.java Wed Jan 4 19:33:54 2006
@@ -71,15 +71,14 @@
*
* @component.configuration
*/
- private String scpArgs = null;
-
+ private String scpArgs;
/**
* Arguments to pass to the SSH command.
*
* @component.configuration
*/
- private String sshArgs = null;
+ private String sshArgs;
private int port;
@@ -304,10 +303,10 @@
}
}
- public void put( File source, String resourceName )
+ public void put( File source, String destination )
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
{
- Resource resource = new Resource( resourceName );
+ Resource resource = new Resource( destination );
firePutInitiated( resource, source );
@@ -318,7 +317,7 @@
String basedir = getRepository().getBasedir();
- resourceName = StringUtils.replace( resourceName, "\\", "/" );
+ String resourceName = StringUtils.replace( destination, "\\", "/" );
String dir = PathUtils.dirname( resourceName );
@@ -369,15 +368,15 @@
{
String basedir = getRepository().getBasedir();
- resourceName = StringUtils.replace( resourceName, "\\", "/" );
+ String path = StringUtils.replace( resourceName, "\\", "/" );
createParentDirectories( destination );
- Resource resource = new Resource( resourceName );
+ Resource resource = new Resource( path );
fireGetStarted( resource, destination );
- executeScpCommand( destination, basedir + "/" + resourceName, false );
+ executeScpCommand( destination, basedir + "/" + path, false );
postProcessListeners( resource, destination, TransferEvent.REQUEST_GET );
@@ -441,9 +440,9 @@
{
String basedir = getRepository().getBasedir();
- destinationDirectory = StringUtils.replace( destinationDirectory, "\\", "/" );
+ String dir = StringUtils.replace( destinationDirectory, "\\", "/" );
- String path = getPath( basedir, destinationDirectory );
+ String path = getPath( basedir, dir );
try
{
if ( getRepository().getPermissions() != null )
@@ -481,7 +480,7 @@
throw new TransferFailedException( "Unable to create ZIP archive of directory", e );
}
- put( zipFile, getPath( destinationDirectory, zipFile.getName() ) );
+ put( zipFile, getPath( dir, zipFile.getName() ) );
try
{
---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org