maven-wagon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1128840 [3/3] - in /maven/wagon/trunk: ./ wagon-providers/ wagon-providers/wagon-http-lightweight/ wagon-providers/wagon-http-shared4/ wagon-providers/wagon-http-shared4/src/ wagon-providers/wagon-http-shared4/src/main/ wagon-providers/wag...
Date Sun, 29 May 2011 08:25:29 GMT
Added: maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/org.apache.maven.html
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/org.apache.maven.html?rev=1128840&view=auto
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/org.apache.maven.html
(added)
+++ maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/org.apache.maven.html
Sun May 29 08:25:27 2011
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+ <head>
+  <title>Index of /repo/m2-ibiblio-rsync-repository/org/apache/maven/archiva/archiva-plexus-runtime/1.0.1</title>
+ </head>
+ <body>
+<h1>Index of /repo/m2-ibiblio-rsync-repository/org/apache/maven/archiva/archiva-plexus-runtime/1.0.1</h1>
+<pre><img src="/icons/blank.gif" alt="Icon "> <a href="?C=N;O=D">Name</a>
                                                                              <a href="?C=M;O=A">Last
modified</a>      <a href="?C=S;O=A">Size</a>  <a href="?C=D;O=A">Description</a><hr><img
src="/icons/back.gif" alt="[DIR]"> <a href="/repo/m2-ibiblio-rsync-repository/org/apache/maven/archiva/archiva-plexus-runtime/">Parent
Directory</a>                                                                      
                 -   
+<img src="/icons/compressed.gif" alt="[   ]"> <a href="archiva-plexus-runtime-1.0.1-bin.tar.gz">archiva-plexus-runtime-1.0.1-bin.tar.gz</a>
                                           04-Feb-2008 03:40   22M  
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1-bin.tar.gz.asc">archiva-plexus-runtime-1.0.1-bin.tar.gz.asc</a>
                                       04-Feb-2008 03:40  189   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1-bin.tar.gz.asc.md5">archiva-plexus-runtime-1.0.1-bin.tar.gz.asc.md5</a>
                                   04-Feb-2008 03:40   32   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1-bin.tar.gz.asc.sha1">archiva-plexus-runtime-1.0.1-bin.tar.gz.asc.sha1</a>
                                  04-Feb-2008 03:40   40   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1-bin.tar.gz.md5">archiva-plexus-runtime-1.0.1-bin.tar.gz.md5</a>
                                       04-Feb-2008 03:40   32   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1-bin.tar.gz.sha1">archiva-plexus-runtime-1.0.1-bin.tar.gz.sha1</a>
                                      04-Feb-2008 03:40   40   
+<img src="/icons/compressed.gif" alt="[   ]"> <a href="archiva-plexus-runtime-1.0.1-bin.zip">archiva-plexus-runtime-1.0.1-bin.zip</a>
                                              04-Feb-2008 03:40   23M  
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1-bin.zip.asc">archiva-plexus-runtime-1.0.1-bin.zip.asc</a>
                                          04-Feb-2008 03:40  189   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1-bin.zip.asc.md5">archiva-plexus-runtime-1.0.1-bin.zip.asc.md5</a>
                                      04-Feb-2008 03:40   32   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1-bin.zip.asc.sha1">archiva-plexus-runtime-1.0.1-bin.zip.asc.sha1</a>
                                     04-Feb-2008 03:40   40   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1-bin.zip.md5">archiva-plexus-runtime-1.0.1-bin.zip.md5</a>
                                          04-Feb-2008 03:40   32   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1-bin.zip.sha1">archiva-plexus-runtime-1.0.1-bin.zip.sha1</a>
                                         04-Feb-2008 03:40   40   
+<img src="/icons/unknown.gif" alt="[   ]"> <a href="archiva-plexus-runtime-1.0.1-sources.jar">archiva-plexus-runtime-1.0.1-sources.jar</a>
                                          04-Feb-2008 03:40  5.4K  
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1-sources.jar.asc">archiva-plexus-runtime-1.0.1-sources.jar.asc</a>
                                      04-Feb-2008 03:40  189   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1-sources.jar.asc.md5">archiva-plexus-runtime-1.0.1-sources.jar.asc.md5</a>
                                  04-Feb-2008 03:40   32   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1-sources.jar.asc.sha1">archiva-plexus-runtime-1.0.1-sources.jar.asc.sha1</a>
                                 04-Feb-2008 03:40   40   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1-sources.jar.md5">archiva-plexus-runtime-1.0.1-sources.jar.md5</a>
                                      04-Feb-2008 03:40   32   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1-sources.jar.sha1">archiva-plexus-runtime-1.0.1-sources.jar.sha1</a>
                                     04-Feb-2008 03:40   40   
+<img src="/icons/unknown.gif" alt="[   ]"> <a href="archiva-plexus-runtime-1.0.1.jar">archiva-plexus-runtime-1.0.1.jar</a>
                                                  04-Feb-2008 03:40  8.0K  
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1.jar.asc">archiva-plexus-runtime-1.0.1.jar.asc</a>
                                              04-Feb-2008 03:40  189   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1.jar.asc.md5">archiva-plexus-runtime-1.0.1.jar.asc.md5</a>
                                          04-Feb-2008 03:40   32   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1.jar.asc.sha1">archiva-plexus-runtime-1.0.1.jar.asc.sha1</a>
                                         04-Feb-2008 03:40   40   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1.jar.md5">archiva-plexus-runtime-1.0.1.jar.md5</a>
                                              04-Feb-2008 03:40   32   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1.jar.sha1">archiva-plexus-runtime-1.0.1.jar.sha1</a>
                                             04-Feb-2008 03:40   40   
+<img src="/icons/unknown.gif" alt="[   ]"> <a href="archiva-plexus-runtime-1.0.1.pom">archiva-plexus-runtime-1.0.1.pom</a>
                                                  04-Feb-2008 03:40  6.6K  
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1.pom.asc">archiva-plexus-runtime-1.0.1.pom.asc</a>
                                              04-Feb-2008 03:40  189   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1.pom.asc.md5">archiva-plexus-runtime-1.0.1.pom.asc.md5</a>
                                          04-Feb-2008 03:40   32   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1.pom.asc.sha1">archiva-plexus-runtime-1.0.1.pom.asc.sha1</a>
                                         04-Feb-2008 03:40   40   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1.pom.md5">archiva-plexus-runtime-1.0.1.pom.md5</a>
                                              04-Feb-2008 03:40   32   
+<img src="/icons/text.gif" alt="[TXT]"> <a href="archiva-plexus-runtime-1.0.1.pom.sha1">archiva-plexus-runtime-1.0.1.pom.sha1</a>
                                             04-Feb-2008 03:40   40
+<img src="/icons/text.gif" alt="[TXT]"> <a href="readme%20artifacts.txt">readme
artifacts.txt</a>                                              04-Feb-2008 03:40   40
     
+<hr></pre>
+<address>Apache/2.2.6 (Unix) DAV/2 mod_ssl/2.2.6 OpenSSL/0.9.7e-p1 Server at people.apache.org
Port 80</address>
+</body></html>

Propchange: maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/org.apache.maven.html
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/org.codehaus.html
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/org.codehaus.html?rev=1128840&view=auto
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/org.codehaus.html
(added)
+++ maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/org.codehaus.html
Sun May 29 08:25:27 2011
@@ -0,0 +1,82 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+ <head>
+  <title>Index of /org/codehaus</title>
+ </head>
+ <body>
+<h1>Index of /org/codehaus</h1>
+<pre><img src="/icons/blank.gif" alt="Icon "> <a href="?C=N;O=D">Name</a>
                   <a href="?C=M;O=A">Last modified</a>      <a href="?C=S;O=A">Size</a>
 <a href="?C=D;O=A">Description</a><hr><img src="/icons/back.gif" alt="[DIR]">
<a href="/org/">Parent Directory</a>                             -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="agilifier/">agilifier/</a>
             05-Oct-2006 16:06    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="benji/">benji/</a> 
                26-Jan-2008 20:04    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="bruce/">bruce/</a> 
                26-Jun-2007 07:31    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="btm/">btm/</a>     
              10-Apr-2007 07:08    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="cargo/">cargo/</a> 
                15-Mar-2007 15:41    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="castor-spring/">castor-spring/</a>
         17-Jan-2007 21:49    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="castor/">castor/</a>
                04-Feb-2008 16:28    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="cozmos/">cozmos/</a>
                18-Dec-2006 12:51    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="dataforge/">dataforge/</a>
             12-Jun-2006 21:38    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="dimple/">dimple/</a>
                13-Dec-2006 04:59    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="droolsdotnet/">droolsdotnet/</a>
          21-Feb-2007 22:50    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="enunciate/">enunciate/</a>
             07-Jan-2008 09:37    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="fabric3/">fabric3/</a>
               25-Jan-2008 04:55    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="gant/">gant/</a>   
               08-Dec-2007 03:41    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="grails-plugins/">grails-plugins/</a>
        17-Jan-2007 21:43    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="groovy/">groovy/</a>
                15-Dec-2007 12:15    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="gsoc/">gsoc/</a>   
               16-Feb-2007 15:48    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="guessencoding/">guessencoding/</a>
         22-Jul-2007 16:13    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="gumtree/">gumtree/</a>
               18-Jan-2007 17:54    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="gwt-openlayers/">gwt-openlayers/</a>
        14-Sep-2007 17:04    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="haus/">haus/</a>   
               16-Mar-2007 15:46    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="izpack/">izpack/</a>
                04-Feb-2008 05:42    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="javasim/">javasim/</a>
               22-Sep-2007 22:02    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="jedi/">jedi/</a>   
               01-Jun-2007 07:10    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="jequel/">jequel/</a>
                09-Nov-2007 08:18    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="jet/">jet/</a>     
              22-Aug-2006 13:25    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="jettison/">jettison/</a>
              09-Nov-2006 04:13    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="jfdi/">jfdi/</a>   
               15-Sep-2006 21:24    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="jikesrvm/">jikesrvm/</a>
              19-Jan-2007 23:07    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="jra/">jra/</a>     
              23-Oct-2006 13:13    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="jremoting/">jremoting/</a>
             08-Jan-2008 10:47    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="jtestme/">jtestme/</a>
               01-Sep-2007 17:20    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="jtestr/">jtestr/</a>
                07-Dec-2007 18:05    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="labs-ng/">labs-ng/</a>
               20-Dec-2007 09:46    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="logicabyss/">logicabyss/</a>
            02-Dec-2007 15:57    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="marionette/">marionette/</a>
            08-Oct-2007 15:31    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="mevenide/">mevenide/</a>
              18-Dec-2007 12:01    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="modello/">modello/</a>
               22-Mar-2007 23:52    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="mojo/">mojo/</a>   
               06-Feb-2008 16:17    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="mvel/">mvel/</a>   
               05-Feb-2008 08:37    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="mvflex/">mvflex/</a>
                29-Dec-2006 20:33    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="native-mojo/">native-mojo/</a>
           12-Feb-2007 18:35    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="openim/">openim/</a>
                30-Apr-2007 15:47    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="plexus/">plexus/</a>
                06-Dec-2007 15:34    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="polymap/">polymap/</a>
               02-Dec-2007 15:32    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="prometheus/">prometheus/</a>
            28-Mar-2007 10:05    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="prophit/">prophit/</a>
               30-Apr-2007 15:44    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="quaere/">quaere/</a>
                19-Sep-2007 07:08    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="redback/">redback/</a>
               07-Sep-2007 18:57    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="rulessandpit/">rulessandpit/</a>
          02-May-2007 16:03    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="rvm/">rvm/</a>     
              19-Jan-2007 23:13    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="savana/">savana/</a>
                09-Nov-2007 07:56    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="scala-ide/">scala-ide/</a>
             26-Jun-2007 07:38    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="senro/">senro/</a> 
                27-Sep-2006 16:22    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="sonar/">sonar/</a> 
                24-Jan-2008 08:17    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="staxmate/">staxmate/</a>
              27-Nov-2007 00:46    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="stomp/">stomp/</a> 
                02-Mar-2007 10:29    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="svn4j/">svn4j/</a> 
                17-Nov-2006 12:17    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="swiby/">swiby/</a> 
                19-Sep-2007 06:09    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="swizzle/">swizzle/</a>
               04-Jan-2008 21:04    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="sxc/">sxc/</a>     
              16-Feb-2007 15:46    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="testdox/">testdox/</a>
               12-Jul-2007 07:38    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="wadi/">wadi/</a>   
               21-Jul-2007 02:03    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="waffle/">waffle/</a>
                06-Jan-2008 23:53    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="woodstox/">woodstox/</a>
              03-Sep-2006 19:14    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="xdoclet/">xdoclet/</a>
               15-Jun-2006 05:04    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="xfire/">xfire/</a> 
                19-Jun-2006 10:15    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="xharness/">xharness/</a>
              24-Oct-2006 15:49    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="xsite/">xsite/</a> 
                11-Nov-2006 06:08    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="xstream/">xstream/</a>
               28-Jul-2006 04:30    -   
+<img src="/icons/folder.gif" alt="[DIR]"> <a href="xwire/">xwire/</a> 
                26-Jul-2006 14:20    -   
+<hr></pre>
+<address>Apache/2.0.52 (Red Hat) Server at repository.codehaus.org Port 80</address>
+</body></html>

Propchange: maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/org.codehaus.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/wagon/trunk/wagon-providers/wagon-http/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http/pom.xml?rev=1128840&r1=1128839&r2=1128840&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http/pom.xml Sun May 29 08:25:27 2011
@@ -36,7 +36,7 @@ under the License.
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>wagon-http-shared</artifactId>
+      <artifactId>wagon-http-shared4</artifactId>
       <version>2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>

Modified: maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java?rev=1128840&r1=1128839&r2=1128840&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
Sun May 29 08:25:27 2011
@@ -23,8 +23,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.http.HttpException;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.methods.HttpGet;
 import org.apache.maven.wagon.ResourceDoesNotExistException;
 import org.apache.maven.wagon.TransferFailedException;
 import org.apache.maven.wagon.authorization.AuthorizationException;
@@ -48,11 +50,13 @@ public class HttpWagon
 
         String url = getRepository().getUrl() + "/" + destinationDirectory;
 
-        GetMethod getMethod = new GetMethod( url );
+        HttpGet getMethod = new HttpGet( url );
 
         try
         {
-            int statusCode = execute( getMethod );
+
+            HttpResponse response = execute( getMethod );
+            int statusCode = response.getStatusLine().getStatusCode();
 
             fireTransferDebug( url + " - Status code: " + statusCode );
 
@@ -83,9 +87,7 @@ public class HttpWagon
                         "Failed to transfer file: " + url + ". Return code is: " + statusCode
);
             }
 
-            InputStream is = null;
-            
-            is = getMethod.getResponseBodyAsStream();
+            InputStream is = response.getEntity().getContent();
 
             return HtmlFileListParser.parseFileList( url, is );
         }
@@ -93,9 +95,12 @@ public class HttpWagon
         {
             throw new TransferFailedException( "Could not read response body.", e );
         }
+        catch (HttpException e) {
+            throw new TransferFailedException( "Could not read response body.", e );
+        }
         finally
         {
-            getMethod.releaseConnection();
+            getMethod.abort();
         }
     }
 }

Modified: maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java?rev=1128840&r1=1128839&r2=1128840&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
(original)
+++ maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
Sun May 29 08:25:27 2011
@@ -23,6 +23,8 @@ import java.util.Properties;
 
 import org.apache.maven.wagon.StreamingWagon;
 import org.apache.maven.wagon.http.HttpWagonTestCase;
+import org.apache.maven.wagon.shared.http.HttpConfiguration;
+import org.apache.maven.wagon.shared.http.HttpMethodConfiguration;
 
 /**
  * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
@@ -43,6 +45,11 @@ public class HttpWagonTest
 
     protected void setHttpHeaders( StreamingWagon wagon, Properties properties )
     {
-        ( (HttpWagon) wagon ).setHttpHeaders( properties );
+        HttpConfiguration config = new HttpConfiguration();
+
+        HttpMethodConfiguration methodConfiguration = new HttpMethodConfiguration();
+        methodConfiguration.setHeaders( properties );
+        config.setAll( methodConfiguration );
+        ((HttpWagon) wagon).setHttpConfiguration( config );
     }
 }

Modified: maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml?rev=1128840&r1=1128839&r2=1128840&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml Sun May 29 08:25:27
2011
@@ -48,12 +48,12 @@ under the License.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>wagon-http-shared</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-webdav</artifactId>
-      <version>1.5.0</version>
+      <version>2.2.5</version>
       <exclusions>
         <exclusion>
           <artifactId>commons-logging</artifactId>
@@ -62,11 +62,27 @@ under the License.
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.1</version>
+      <!--
+        The version of commons-logging that comes transitively has class loader
+        problems. So we exclude it here and add a newer version below.
+      -->
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <!-- Test dependencies -->
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.5_spec</artifactId>
+      <version>1.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java?rev=1128840&r1=1128839&r2=1128840&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
(original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
Sun May 29 08:25:27 2011
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.DavException;



---------------------------------------------------------------------
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