You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/04/21 18:20:57 UTC
svn commit: r164080 -
/maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http
/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/sshext
/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh
Author: brett
Date: Thu Apr 21 09:20:56 2005
New Revision: 164080
URL: http://svn.apache.org/viewcvs?rev=164080&view=rev
Log:
add initiation message to all wagons
Modified:
maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagon.java
maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java
maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/SftpWagon.java
Modified: maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java?rev=164080&r1=164079&r2=164080&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java Thu Apr 21 09:20:56 2005
@@ -142,9 +142,11 @@
{
String url = getRepository().getUrl() + "/" + resourceName;
- PutMethod putMethod = new PutMethod( url );
-
Resource resource = new Resource( resourceName );
+
+ firePutInitiated( resource, source );
+
+ PutMethod putMethod = new PutMethod( url );
try
{
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=164080&r1=164079&r2=164080&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 Thu Apr 21 09:20:56 2005
@@ -241,7 +241,7 @@
{
Resource resource = new Resource( resourceName );
- firePutStarted( resource, source );
+ firePutInitiated( resource, source );
if ( !source.exists() )
{
@@ -259,6 +259,8 @@
String mkdirCmd = "mkdir -p " + basedir + "/" + dir + "\n";
executeCommand( mkdirCmd );
+
+ firePutStarted( resource, source );
executeScpCommand( source, basedir + "/" + resourceName, true );
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java?rev=164080&r1=164079&r2=164080&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java Thu Apr 21 09:20:56 2005
@@ -233,13 +233,16 @@
public void put( File source, String resourceName )
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
{
-
String basedir = getRepository().getBasedir();
resourceName = StringUtils.replace( resourceName, "\\", "/" );
String dir = PathUtils.dirname( resourceName );
dir = StringUtils.replace( dir, "\\", "/" );
+ Resource resource = new Resource( resourceName );
+
+ firePutInitiated( resource, source );
+
String mkdirCmd = "mkdir -p " + basedir + "/" + dir + "\n";
executeCommand( mkdirCmd );
@@ -298,8 +301,6 @@
{
throw new TransferFailedException( "ACK check failed" );
}
-
- Resource resource = new Resource( resourceName );
putTransfer( resource, source, out, false );
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/SftpWagon.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/SftpWagon.java?rev=164080&r1=164079&r2=164080&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/SftpWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/SftpWagon.java Thu Apr 21 09:20:56 2005
@@ -62,6 +62,10 @@
String dir = PathUtils.dirname( resourceName );
dir = StringUtils.replace( dir, "\\", "/" );
+ Resource resource = new Resource( resourceName );
+
+ firePutInitiated( resource, source );
+
ChannelSftp channel = null;
String filename;
@@ -83,8 +87,6 @@
channel.cd( basedir );
mkdirs( channel, dir );
-
- Resource resource = new Resource( resourceName );
firePutStarted( resource, source );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org