maven-wagon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r662345 - in /maven/wagon/trunk/wagon-providers: wagon-ssh-common/ wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ wagon-ssh-external/ wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ wago...
Date Mon, 02 Jun 2008 07:02:21 GMT
Author: brett
Date: Mon Jun  2 00:02:21 2008
New Revision: 662345

URL: http://svn.apache.org/viewvc?rev=662345&view=rev
Log:
[WAGON-101] refactor SSH tests in prep to get some streaming working

Modified:
    maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml
    maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java
    maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml
    maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
    maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java
    maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java
    maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml
    maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
    maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
    maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonTest.java
    maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonWithSshPrivateKeySearchTest.java

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml?rev=662345&r1=662344&r2=662345&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml Mon Jun  2 00:02:21 2008
@@ -39,6 +39,12 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-interactivity-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-component-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 </project>

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java?rev=662345&r1=662344&r2=662345&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java
(original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java
Mon Jun  2 00:02:21 2008
@@ -19,6 +19,11 @@
  * under the License.
  */
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.List;
+
 import org.apache.maven.wagon.AbstractWagon;
 import org.apache.maven.wagon.CommandExecutionException;
 import org.apache.maven.wagon.CommandExecutor;
@@ -31,17 +36,11 @@
 import org.apache.maven.wagon.authentication.AuthenticationException;
 import org.apache.maven.wagon.authentication.AuthenticationInfo;
 import org.apache.maven.wagon.authorization.AuthorizationException;
-import org.apache.maven.wagon.events.TransferEvent;
 import org.apache.maven.wagon.repository.RepositoryPermissions;
 import org.apache.maven.wagon.resource.Resource;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.List;
-
 /**
  * Common SSH operations.
  *
@@ -357,24 +356,4 @@
             return false;
         }
     }
-
-    protected void handleGetException( Resource resource, Exception e, File destination )
-        throws TransferFailedException, ResourceDoesNotExistException
-    {
-        fireTransferError( resource, e, TransferEvent.REQUEST_GET );
-
-        if ( destination.exists() )
-        {
-            boolean deleted = destination.delete();
-
-            if ( !deleted )
-            {
-                destination.deleteOnExit();
-            }
-        }
-
-        String msg = "Error occured while downloading '" + resource + "' from the remote
repository:" + getRepository() + ": " + e.getMessage();
-
-        throw new TransferFailedException( msg, e );
-    }
 }

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml?rev=662345&r1=662344&r2=662345&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml Mon Jun  2 00:02:21 2008
@@ -34,19 +34,30 @@
     Wagon that gets and puts artifacts using SSH protocol with a preinstalled SSH client
   </description>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/Scp*Test.*</exclude>
-            <exclude>**/SshCommandExecutorTest.*</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  <profiles>
+    <profile>
+      <id>no-ssh-tests</id>
+      <activation>
+        <property>
+          <name>!ssh-tests</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <!-- Tests that require an ssh server on localhost -->
+              <excludes>
+                <exclude>**/SshCommandExecutorTest.*</exclude>
+                <exclude>**/ScpWagon*Test.*</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

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=662345&r1=662344&r2=662345&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
Mon Jun  2 00:02:21 2008
@@ -246,6 +246,8 @@
         String resourceName = normalizeResource( resource );
         String remoteFile = getRepository().getBasedir() + "/" + resourceName;
         
+        remoteFile = StringUtils.replace( remoteFile, " ", "\\ " );
+        
         String qualifiedRemoteFile = this.buildRemoteHost() + ":" + remoteFile;
         if ( put )
         {
@@ -449,75 +451,4 @@
     {
         this.sshArgs = sshArgs;
     }
-
-    public void putDirectory( File sourceDirectory, String destinationDirectory )
-        throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
-    {
-        String basedir = getRepository().getBasedir();
-
-        String dir = StringUtils.replace( destinationDirectory, "\\", "/" );
-
-        String path = getPath( basedir, dir );
-        try
-        {
-            if ( getRepository().getPermissions() != null )
-            {
-                String dirPerms = getRepository().getPermissions().getDirectoryMode();
-
-                if ( dirPerms != null )
-                {
-                    String umaskCmd = "umask " + PermissionModeUtils.getUserMaskFor( dirPerms
);
-                    executeCommand( umaskCmd );
-                }
-            }
-
-            String mkdirCmd = "mkdir -p " + path;
-
-            executeCommand( mkdirCmd );
-        }
-        catch ( CommandExecutionException e )
-        {
-            throw new TransferFailedException( "Error performing commands for file transfer",
e );
-        }
-
-        File zipFile;
-        try
-        {
-            zipFile = File.createTempFile( "wagon", ".zip" );
-            zipFile.deleteOnExit();
-
-            List files = FileUtils.getFileNames( sourceDirectory, "**/**", "", false );
-
-            createZip( files, zipFile, sourceDirectory );
-        }
-        catch ( IOException e )
-        {
-            throw new TransferFailedException( "Unable to create ZIP archive of directory",
e );
-        }
-
-        put( zipFile, getPath( dir, zipFile.getName() ) );
-
-        try
-        {
-            executeCommand( "cd " + path + "; unzip -o " + zipFile.getName() + "; rm -f "
+ zipFile.getName() );
-
-            zipFile.delete();
-
-            RepositoryPermissions permissions = getRepository().getPermissions();
-
-            if ( permissions != null && permissions.getGroup() != null )
-            {
-                executeCommand( "chgrp -Rf " + permissions.getGroup() + " " + path );
-            }
-
-            if ( permissions != null && permissions.getFileMode() != null )
-            {
-                executeCommand( "chmod -Rf " + permissions.getFileMode() + " " + path );
-            }
-        }
-        catch ( CommandExecutionException e )
-        {
-            throw new TransferFailedException( "Error performing commands for file transfer",
e );
-        }
-    }
 }

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java?rev=662345&r1=662344&r2=662345&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java
(original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java
Mon Jun  2 00:02:21 2008
@@ -40,6 +40,11 @@
         return WagonConstants.UNKNOWN_LENGTH;
     }
 
+    protected boolean supportsGetIfNewer()
+    {
+        return false;
+    }
+
     protected long getExpectedLastModifiedOnGet( Repository repository, Resource resource
)
     {
         return 0;

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java?rev=662345&r1=662344&r2=662345&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java
(original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java
Mon Jun  2 00:02:21 2008
@@ -33,6 +33,11 @@
 public class ScpWagonWithSshPrivateKeySearchTest
     extends WagonTestCase
 {
+    protected boolean supportsGetIfNewer()
+    {
+        return false;
+    }
+
     protected int getExpectedContentLengthOnGet( int expectedSize )
     {
         return WagonConstants.UNKNOWN_LENGTH;

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=662345&r1=662344&r2=662345&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml Mon Jun  2 00:02:21 2008
@@ -31,22 +31,32 @@
   <artifactId>wagon-ssh</artifactId>
   <name>Maven Wagon SSH Provider</name>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <!-- Tests that require an ssh server on localhost -->
-          <excludes>
-            <exclude>**/ScpWagon*Test.*</exclude>
-            <exclude>**/SftpWagonTest.*</exclude>
-            <exclude>**/SshCommandExecutorTest.*</exclude>
-            <exclude>**/KnownHostsProviderTest.*</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  <profiles>
+    <profile>
+      <id>no-ssh-tests</id>
+      <activation>
+        <property>
+          <name>!ssh-tests</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <!-- Tests that require an ssh server on localhost -->
+              <excludes>
+                <exclude>**/SftpWagonTest.*</exclude>
+                <exclude>**/SshCommandExecutorTest.*</exclude>
+                <exclude>**/KnownHostsProviderTest.*</exclude>
+                <exclude>**/ScpWagon*Test.*</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
   <dependencies>
     <dependency>
       <groupId>com.jcraft</groupId>
@@ -55,10 +65,6 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-interactivity-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
     <dependency>

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java?rev=662345&r1=662344&r2=662345&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
(original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
Mon Jun  2 00:02:21 2008
@@ -30,8 +30,11 @@
 import java.util.Properties;
 
 import org.apache.maven.wagon.CommandExecutionException;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
 import org.apache.maven.wagon.Streams;
+import org.apache.maven.wagon.TransferFailedException;
 import org.apache.maven.wagon.authentication.AuthenticationException;
+import org.apache.maven.wagon.events.TransferEvent;
 import org.apache.maven.wagon.providers.ssh.AbstractSshWagon;
 import org.apache.maven.wagon.providers.ssh.CommandExecutorStreamProcessor;
 import org.apache.maven.wagon.providers.ssh.SshWagon;
@@ -42,6 +45,7 @@
 import org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider;
 import org.apache.maven.wagon.providers.ssh.knownhost.UnknownHostException;
 import org.apache.maven.wagon.proxy.ProxyInfo;
+import org.apache.maven.wagon.resource.Resource;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringInputStream;
 
@@ -316,6 +320,26 @@
         }
     }
 
+    protected void handleGetException( Resource resource, Exception e, File destination )
+        throws TransferFailedException, ResourceDoesNotExistException
+    {
+        fireTransferError( resource, e, TransferEvent.REQUEST_GET );
+
+        if ( destination.exists() )
+        {
+            boolean deleted = destination.delete();
+
+            if ( !deleted )
+            {
+                destination.deleteOnExit();
+            }
+        }
+
+        String msg = "Error occured while downloading '" + resource + "' from the remote
repository:" + getRepository() + ": " + e.getMessage();
+
+        throw new TransferFailedException( msg, e );
+    }
+
     public InteractiveUserInfo getInteractiveUserInfo()
     {
         return this.interactiveUserInfo;

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java?rev=662345&r1=662344&r2=662345&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
(original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
Mon Jun  2 00:02:21 2008
@@ -44,6 +44,7 @@
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @version $Id$
  * @todo [BP] add compression flag
+ * @todo see if SftpProgressMonitor allows us to do streaming (without it, we can't do checksums
as the input stream is lost)
  * 
  * @plexus.component role="org.apache.maven.wagon.Wagon" 
  *   role-hint="sftp"
@@ -58,72 +59,43 @@
 
     private static final long MILLIS_PER_SEC = 1000L;
 
-    public void put( String basedir, Resource resource, File source )
-        throws TransferFailedException
+    private void returnToParentDirectory( Resource resource, ChannelSftp channel )
+        throws SftpException
     {
-        String resourceName = resource.getName();
-        String dir = getResourceDirectory( resourceName );
-
-        ChannelSftp channel = null;
-
-        try
+        String dir = getResourceDirectory( resource.getName() );
+        String[] dirs = PathUtils.dirnames( dir );
+        for ( int i = 0; i < dirs.length; i++ )
         {
-            channel = (ChannelSftp) session.openChannel( SFTP_CHANNEL );
-
-            channel.connect();
-
-            RepositoryPermissions permissions = getRepository().getPermissions();
-
-            int directoryMode = getDirectoryMode( permissions );
+            channel.cd( ".." );
+        }
+    }
 
-            channel.cd( "/" );
-            
-            try
-            {
-                mkdirs( channel, basedir + "/", directoryMode );
-                
-                mkdirs( channel, resourceName, directoryMode );
-            }
-            catch ( TransferFailedException e )
-            {
-                fireTransferError( resource, e, TransferEvent.REQUEST_PUT );
+    private ChannelSftp preparePut( Resource resource, RepositoryPermissions permissions
)
+        throws JSchException, SftpException, TransferFailedException
+    {
+        ChannelSftp channel;
+        channel = (ChannelSftp) session.openChannel( SFTP_CHANNEL );
 
-                throw e;
-            }
+        channel.connect();
 
-            putFile( channel, source, resource, permissions );
+        int directoryMode = getDirectoryMode( permissions );
 
-            String[] dirs = PathUtils.dirnames( dir );
-            for ( int i = 0; i < dirs.length; i++ )
-            {
-                channel.cd( ".." );
-            }
-        }
-        catch ( SftpException e )
+        channel.cd( "/" );
+        
+        try
         {
-            fireTransferError( resource, e, TransferEvent.REQUEST_PUT );
+            String basedir = getRepository().getBasedir();
+            mkdirs( channel, basedir + "/", directoryMode );
             
-            String msg = "Error occured while deploying '" + resourceName + "' " + "to remote
repository: " +
-                getRepository().getUrl();
-
-            throw new TransferFailedException( msg, e );
+            mkdirs( channel, resource.getName(), directoryMode );
         }
-        catch ( JSchException e )
+        catch ( TransferFailedException e )
         {
             fireTransferError( resource, e, TransferEvent.REQUEST_PUT );
 
-            String msg = "Error occured while deploying '" + resourceName + "' " + "to remote
repository: " +
-                getRepository().getUrl();
-
-            throw new TransferFailedException( msg, e );
-        }
-        finally
-        {
-            if ( channel != null )
-            {
-                channel.disconnect();
-            }
+            throw e;
         }
+        return channel;
     }
 
     private void putFile( ChannelSftp channel, File source, Resource resource, RepositoryPermissions
permissions )
@@ -137,6 +109,8 @@
 
         firePutStarted( resource, source );
 
+        
+        
         channel.put( source.getAbsolutePath(), filename );
 
         postProcessListeners( resource, source, TransferEvent.REQUEST_PUT );
@@ -334,13 +308,47 @@
     public void put( File source, String destination )
         throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
     {
-        String basedir = getRepository().getBasedir();
-
         Resource resource = getResource( destination );
 
         firePutInitiated( resource, source );
 
-        put( basedir, resource, source );
+        ChannelSftp channel = null;
+        
+        try
+        {
+            RepositoryPermissions permissions = getRepository().getPermissions();
+        
+            channel = preparePut( resource, permissions );
+        
+            putFile( channel, source, resource, permissions );
+        
+            returnToParentDirectory( resource, channel );
+        }
+        catch ( SftpException e )
+        {
+            fireTransferError( resource, e, TransferEvent.REQUEST_PUT );
+            
+            String msg = "Error occured while deploying '" + resource.getName() + "' " +
"to remote repository: " +
+                getRepository().getUrl();
+        
+            throw new TransferFailedException( msg, e );
+        }
+        catch ( JSchException e )
+        {
+            fireTransferError( resource, e, TransferEvent.REQUEST_PUT );
+        
+            String msg = "Error occured while deploying '" + resource.getName() + "' " +
"to remote repository: " +
+                getRepository().getUrl();
+        
+            throw new TransferFailedException( msg, e );
+        }
+        finally
+        {
+            if ( channel != null )
+            {
+                channel.disconnect();
+            }
+        }
     }
 
     public void get( String resourceName, File destination )

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=662345&r1=662344&r2=662345&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
Mon Jun  2 00:02:21 2008
@@ -19,14 +19,14 @@
  * under the License.
  */
 
+import java.io.File;
+
 import org.apache.maven.wagon.WagonTestCase;
 import org.apache.maven.wagon.authentication.AuthenticationInfo;
 import org.apache.maven.wagon.providers.ssh.TestData;
 import org.apache.maven.wagon.repository.Repository;
 import org.apache.maven.wagon.resource.Resource;
 
-import java.io.File;
-
 /**
  * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
  * @version $Id$
@@ -34,6 +34,11 @@
 public class ScpWagonTest
     extends WagonTestCase
 {
+    protected boolean supportsGetIfNewer()
+    {
+        return false;
+    }
+
     protected String getProtocol()
     {
         return "scp";

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonWithSshPrivateKeySearchTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonWithSshPrivateKeySearchTest.java?rev=662345&r1=662344&r2=662345&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonWithSshPrivateKeySearchTest.java
(original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonWithSshPrivateKeySearchTest.java
Mon Jun  2 00:02:21 2008
@@ -32,6 +32,11 @@
 public class ScpWagonWithSshPrivateKeySearchTest
     extends WagonTestCase
 {
+    protected boolean supportsGetIfNewer()
+    {
+        return false;
+    }
+
     protected String getProtocol()
     {
         return "scp";



---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org


Mime
View raw message