You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/09/22 13:21:55 UTC
svn commit: r1174062 -
/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
Author: olamy
Date: Thu Sep 22 11:21:55 2011
New Revision: 1174062
URL: http://svn.apache.org/viewvc?rev=1174062&view=rev
Log:
remove use of deprecated methods
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java?rev=1174062&r1=1174061&r2=1174062&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java Thu Sep 22 11:21:55 2011
@@ -170,24 +170,24 @@ public class ScpExternalWagon
{
if ( putty )
{
- cl.createArgument().setLine( "-P " + port );
+ cl.createArg().setLine( "-P " + port );
}
else
{
- cl.createArgument().setLine( "-p " + port );
+ cl.createArg().setLine( "-p " + port );
}
}
if ( sshArgs != null )
{
- cl.createArgument().setLine( sshArgs );
+ cl.createArg().setLine( sshArgs );
}
String remoteHost = this.buildRemoteHost();
- cl.createArgument().setValue( remoteHost );
+ cl.createArg().setValue( remoteHost );
- cl.createArgument().setValue( command );
+ cl.createArg().setValue( command );
fireSessionDebug( "Executing command: " + cl.toString() );
@@ -229,26 +229,26 @@ public class ScpExternalWagon
if ( privateKey != null )
{
- cl.createArgument().setValue( "-i" );
- cl.createArgument().setFile( privateKey );
+ cl.createArg().setValue( "-i" );
+ cl.createArg().setFile( privateKey );
}
String password = authenticationInfo.getPassword();
if ( putty && password != null )
{
- cl.createArgument().setValue( "-pw" );
- cl.createArgument().setValue( password );
+ cl.createArg().setValue( "-pw" );
+ cl.createArg().setValue( password );
}
// should check interactive flag, but scpexe never works in interactive mode right now due to i/o streams
if ( putty )
{
- cl.createArgument().setValue( "-batch" );
+ cl.createArg().setValue( "-batch" );
}
else
{
- cl.createArgument().setValue( "-o" );
- cl.createArgument().setValue( "BatchMode yes" );
+ cl.createArg().setValue( "-o" );
+ cl.createArg().setValue( "BatchMode yes" );
}
return cl;
}
@@ -278,12 +278,12 @@ public class ScpExternalWagon
repository.getPort() == WagonConstants.UNKNOWN_PORT ? ScpHelper.DEFAULT_SSH_PORT : repository.getPort();
if ( port != ScpHelper.DEFAULT_SSH_PORT )
{
- cl.createArgument().setLine( "-P " + port );
+ cl.createArg().setLine( "-P " + port );
}
if ( scpArgs != null )
{
- cl.createArgument().setLine( scpArgs );
+ cl.createArg().setLine( scpArgs );
}
String resourceName = normalizeResource( resource );
@@ -294,13 +294,13 @@ public class ScpExternalWagon
String qualifiedRemoteFile = this.buildRemoteHost() + ":" + remoteFile;
if ( put )
{
- cl.createArgument().setValue( localFile.getName() );
- cl.createArgument().setValue( qualifiedRemoteFile );
+ cl.createArg().setValue( localFile.getName() );
+ cl.createArg().setValue( qualifiedRemoteFile );
}
else
{
- cl.createArgument().setValue( qualifiedRemoteFile );
- cl.createArgument().setValue( localFile.getName() );
+ cl.createArg().setValue( qualifiedRemoteFile );
+ cl.createArg().setValue( localFile.getName() );
}
fireSessionDebug( "Executing command: " + cl.toString() );