maven-wagon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tryg...@apache.org
Subject svn commit: r267198 - in /maven/wagon/trunk: wagon-provider-api/src/main/java/org/apache/maven/wagon/ wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/ wagon-provider-test/src/main/java/org/apache/maven/wagon/ wagon-providers/ wagon-p...
Date Fri, 02 Sep 2005 13:11:25 GMT
Author: trygvis
Date: Fri Sep  2 06:10:58 2005
New Revision: 267198

URL: http://svn.apache.org/viewcvs?rev=267198&view=rev
Log:
o Making the tests a bit less verbose.
o Fixing the broken FTP Wagon by adding getAuthenticationInfo() in
  AbstractWagon.
o Enabling all modules again.
o Disabling SSH related tests, need a better way to test these.

Added:
    maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagonTestDisabled.java
      - copied, changed from r267196, maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagonTest.java
    maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonTestDisabled.java
      - copied, changed from r267196, maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonTest.java
    maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonWithSshPrivateKeySearchTestDisabled.java
      - copied, changed from r267196, maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonWithSshPrivateKeySearchTest.java
    maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/SftpWagonTestDisabled.java
      - copied, changed from r267196, maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/SftpWagonTest.java
Removed:
    maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagonTest.java
    maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonTest.java
    maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonWithSshPrivateKeySearchTest.java
    maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/SftpWagonTest.java
Modified:
    maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
    maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamWagon.java
    maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java
    maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
    maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
    maven/wagon/trunk/wagon-providers/pom.xml
    maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
    maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java

Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java?rev=267198&r1=267197&r2=267198&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
(original)
+++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
Fri Sep  2 06:10:58 2005
@@ -36,7 +36,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-
 /**
  * Implementation of common facilties for Wagon providers.
  *
@@ -55,17 +54,27 @@
 
     protected TransferEventSupport transferEventSupport = new TransferEventSupport();
 
-    protected ProxyInfo proxyInfo = null;
+    protected ProxyInfo proxyInfo;
 
-    protected AuthenticationInfo authenticationInfo = null;
+    protected AuthenticationInfo authenticationInfo;
 
     // ----------------------------------------------------------------------
-    // Repository
+    // Accessors
     // ----------------------------------------------------------------------
 
     public Repository getRepository()
     {
         return repository;
+    }
+
+    public ProxyInfo getProxyInfo()
+    {
+        return proxyInfo;
+    }
+
+    public AuthenticationInfo getAuthenticationInfo()
+    {
+        return authenticationInfo;
     }
 
     // ----------------------------------------------------------------------

Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamWagon.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamWagon.java?rev=267198&r1=267197&r2=267198&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamWagon.java
(original)
+++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamWagon.java
Fri Sep  2 06:10:58 2005
@@ -25,7 +25,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-
 /**
  * Base class for wagon which provide stream based API.
  *
@@ -35,7 +34,6 @@
 public abstract class StreamWagon
     extends AbstractWagon
 {
-
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------

Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java?rev=267198&r1=267197&r2=267198&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java (original)
+++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java Fri
Sep  2 06:10:58 2005
@@ -34,7 +34,6 @@
     // File/File handling
     // ----------------------------------------------------------------------
 
-
     /**
      * Downloads specified resource from the repository to given file.
      *
@@ -93,8 +92,6 @@
 
     void disconnect()
         throws ConnectionException;
-
-   
 
     // ----------------------------------------------------------------------
     //  Session listener

Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java?rev=267198&r1=267197&r2=267198&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
(original)
+++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
Fri Sep  2 06:10:58 2005
@@ -18,11 +18,9 @@
 
 import org.apache.maven.wagon.PathUtils;
 import org.apache.maven.wagon.WagonConstants;
-import org.apache.maven.wagon.authentication.AuthenticationInfo;
 
 import java.io.Serializable;
 import java.util.Properties;
-
 
 /**
  * This class is an abstraction of the location from/to resources

Modified: maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java?rev=267198&r1=267197&r2=267198&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
(original)
+++ maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
Fri Sep  2 06:10:58 2005
@@ -162,13 +162,7 @@
 
     private void message( String message )
     {
-        System.out.println(
-            "---------------------------------------------------------------------------------------------------------"
);
-
         System.out.println( message );
-
-        System.out.println(
-            "---------------------------------------------------------------------------------------------------------"
);
     }
 
     // ----------------------------------------------------------------------
@@ -283,5 +277,4 @@
 
         return repository;
     }
-
 }

Modified: maven/wagon/trunk/wagon-providers/pom.xml
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/pom.xml?rev=267198&r1=267197&r2=267198&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/pom.xml Fri Sep  2 06:10:58 2005
@@ -27,9 +27,7 @@
     <module>wagon-http-lightweight</module>
     <module>wagon-http</module>
     <module>wagon-scm</module>
-    <!--
     <module>wagon-ssh-external</module>
-    -->
     <module>wagon-ssh</module>
   </modules>
 </project>

Modified: maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java?rev=267198&r1=267197&r2=267198&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
(original)
+++ maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
Fri Sep  2 06:10:58 2005
@@ -48,7 +48,7 @@
     public void openConnection()
         throws ConnectionException, AuthenticationException
     {
-        AuthenticationInfo authInfo = getRepository().getAuthenticationInfo();
+        AuthenticationInfo authInfo = getAuthenticationInfo();
 
         if ( authInfo == null )
         {
@@ -119,7 +119,7 @@
 
         try
         {
-            if ( ftp.login( username.trim(), password.trim() ) == false )
+            if ( !ftp.login( username.trim(), password.trim() ) )
             {
                 fireSessionConnectionRefused();
 
@@ -140,8 +140,8 @@
 
             if ( !dirChanged )
             {
-                throw new ConnectionException(
-                    "Required directories: '" + getRepository().getBasedir() + "' are missing"
);
+                throw new ConnectionException( "Required directory: '" + getRepository().getBasedir()
+ "' " +
+                                               "is missing" );
             }
         }
         catch ( IOException e )

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=267198&r1=267197&r2=267198&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
Fri Sep  2 06:10:58 2005
@@ -33,7 +33,6 @@
 import org.apache.maven.wagon.AbstractWagon;
 import org.apache.maven.wagon.ResourceDoesNotExistException;
 import org.apache.maven.wagon.TransferFailedException;
-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.resource.Resource;
@@ -177,8 +176,6 @@
             catch ( HttpRecoverableException e )
             {
                 attempt++;
-
-                continue;
             }
             catch ( IOException e )
             {
@@ -289,8 +286,6 @@
                 catch ( HttpRecoverableException e )
                 {
                     attempt++;
-
-                    continue;
                 }
                 catch ( IOException e )
                 {

Copied: maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagonTestDisabled.java
(from r267196, maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagonTest.java)
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagonTestDisabled.java?p2=maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagonTestDisabled.java&p1=maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagonTest.java&r1=267196&r2=267198&rev=267198&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagonTest.java
(original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagonTestDisabled.java
Fri Sep  2 06:10:58 2005
@@ -25,7 +25,7 @@
  * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
  * @version $Id$
  */
-public class ScpExternalWagonTest
+public class ScpExternalWagonTestDisabled
     extends WagonTestCase
 {
     protected String getProtocol()

Copied: maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonTestDisabled.java
(from r267196, maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonTest.java)
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonTestDisabled.java?p2=maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonTestDisabled.java&p1=maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonTest.java&r1=267196&r2=267198&rev=267198&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonTest.java
(original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonTestDisabled.java
Fri Sep  2 06:10:58 2005
@@ -25,7 +25,7 @@
  * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
  * @version $Id$
  */
-public class ScpWagonTest
+public class ScpWagonTestDisabled
     extends WagonTestCase
 {
     protected String getProtocol()

Copied: maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonWithSshPrivateKeySearchTestDisabled.java
(from r267196, maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonWithSshPrivateKeySearchTest.java)
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonWithSshPrivateKeySearchTestDisabled.java?p2=maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonWithSshPrivateKeySearchTestDisabled.java&p1=maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonWithSshPrivateKeySearchTest.java&r1=267196&r2=267198&rev=267198&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonWithSshPrivateKeySearchTest.java
(original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonWithSshPrivateKeySearchTestDisabled.java
Fri Sep  2 06:10:58 2005
@@ -23,7 +23,7 @@
  * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
  * @version $Id$
  */
-public class ScpWagonWithSshPrivateKeySearchTest
+public class ScpWagonWithSshPrivateKeySearchTestDisabled
     extends WagonTestCase
 {
     protected String getProtocol()

Copied: maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/SftpWagonTestDisabled.java
(from r267196, maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/SftpWagonTest.java)
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/SftpWagonTestDisabled.java?p2=maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/SftpWagonTestDisabled.java&p1=maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/SftpWagonTest.java&r1=267196&r2=267198&rev=267198&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/SftpWagonTest.java
(original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/SftpWagonTestDisabled.java
Fri Sep  2 06:10:58 2005
@@ -25,7 +25,7 @@
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @version $Id$
  */
-public class SftpWagonTest
+public class SftpWagonTestDisabled
     extends WagonTestCase
 {
     protected String getProtocol()



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


Mime
View raw message