[wagon2] 01/01: Imported Upstream version 2.5

Emmanuel Bourg ebourg-guest at alioth.debian.org
Mon Oct 28 12:19:06 UTC 2013


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag upstream/2.5
in repository wagon2.

commit 6fb3b85c756666c9f2104efa24c7f5b187715d7a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 28 10:49:13 2013 +0100

    Imported Upstream version 2.5
---
 .gitignore                                         |    4 +
 deploySite.sh                                      |    2 +-
 pom.xml                                            |   45 +-
 src/site/resources/images/wagon-deps.png           |  Bin 33075 -> 31652 bytes
 src/site/xdoc/index.xml                            |    3 +-
 src/site/xdoc/wagon-deps.odg                       |  Bin 16281 -> 16223 bytes
 wagon-provider-api/pom.xml                         |    2 +-
 .../java/org/apache/maven/wagon/AbstractWagon.java |   55 +-
 wagon-provider-api/src/site/apt/index.apt          |    2 +-
 .../org/apache/maven/wagon/AbstractWagonTest.java  |    1 -
 .../java/org/apache/maven/wagon/WagonMock.java     |    4 +-
 .../wagon/events/TransferEventSupportTest.java     |    2 -
 wagon-provider-test/pom.xml                        |    2 +-
 .../apache/maven/wagon/StreamingWagonTestCase.java |    1 -
 .../apache/maven/wagon/http/HttpWagonTestCase.java |    2 +-
 wagon-providers/pom.xml                            |    9 +-
 wagon-providers/wagon-file/pom.xml                 |   10 +-
 .../maven/wagon/providers/file/FileWagon.java      |    2 +-
 wagon-providers/wagon-file/src/site/apt/index.apt  |    2 +-
 wagon-providers/wagon-ftp/pom.xml                  |    8 +-
 .../apache/maven/wagon/providers/ftp/FtpWagon.java |    4 +-
 wagon-providers/wagon-ftp/src/site/apt/index.apt   |    2 +-
 .../maven/wagon/providers/ftp/FtpWagonTest.java    |    5 +-
 wagon-providers/wagon-http-lightweight/pom.xml     |   16 +-
 .../wagon/providers/http/LightweightHttpWagon.java |    2 +-
 .../wagon-http-lightweight/src/site/apt/index.apt  |    2 +-
 .../providers/http/LightweightHttpWagonTest.java   |    5 -
 .../apache/maven/wagon/providers/http/TckTest.java |    2 -
 wagon-providers/wagon-http-shared/pom.xml          |   46 +-
 .../wagon/shared/http/HtmlFileListParser.java      |  178 +++--
 wagon-providers/wagon-http-shared4/pom.xml         |   63 --
 .../wagon/shared/http4/HtmlFileListParser.java     |  164 -----
 .../wagon-http-shared4/src/site/site.xml           |   33 -
 .../wagon/shared/http4/HtmlFileListParserTest.java |  728 --------------------
 .../test/resources/filelistings/commons-lang.html  |   31 -
 .../test/resources/filelistings/ibiblio-wagon.html |   99 ---
 .../test/resources/filelistings/jetty-wagon.html   |   90 ---
 .../src/test/resources/filelistings/mevenide.html  |   42 --
 .../test/resources/filelistings/mirror-wagon.html  |  112 ---
 .../src/test/resources/filelistings/nekohtml.html  |   23 -
 .../src/test/resources/filelistings/net_sf.html    |   71 --
 .../resources/filelistings/org.apache.maven.html   |   42 --
 .../test/resources/filelistings/org.codehaus.html  |   82 ---
 wagon-providers/wagon-http/pom.xml                 |   14 +-
 .../providers/http}/AbstractHttpClientWagon.java   |    6 +-
 .../ConfigurableSSLSocketFactoryDecorator.java     |    2 +-
 .../wagon/providers/http}/HttpConfiguration.java   |    2 +-
 .../providers/http}/HttpMethodConfiguration.java   |    2 +-
 .../maven/wagon/providers/http/HttpWagon.java      |    3 +-
 .../providers/http}/RelaxedX509TrustManager.java   |    2 +-
 wagon-providers/wagon-http/src/site/apt/index.apt  |    2 +-
 .../wagon/providers/http/HttpClientWagonTest.java} |    4 +-
 .../providers/http/HttpWagonPreemptiveTest.java    |    2 -
 .../maven/wagon/providers/http/HttpWagonTest.java  |    4 -
 .../wagon/providers/http/HttpWagonTimeoutTest.java |    2 -
 .../providers/http/HttpsWagonPreemptiveTest.java   |    2 -
 .../wagon/providers/http/HugeFileDownloadTest.java |  156 +++++
 .../apache/maven/wagon/providers/http/TckTest.java |    2 +-
 .../wagon-http/src/test/resources/log4j.xml        |    8 +-
 wagon-providers/wagon-scm/pom.xml                  |    4 +-
 wagon-providers/wagon-scm/src/site/apt/index.apt   |    2 +-
 wagon-providers/wagon-ssh-common-test/pom.xml      |    2 +-
 wagon-providers/wagon-ssh-common/pom.xml           |    2 +-
 wagon-providers/wagon-ssh-external/pom.xml         |    6 +-
 .../providers/ssh/external/ScpExternalWagon.java   |    1 -
 .../wagon-ssh-external/src/site/apt/index.apt      |    4 +-
 wagon-providers/wagon-ssh/pom.xml                  |    8 +-
 .../maven/wagon/providers/ssh/jsch/SftpWagon.java  |    3 +-
 wagon-providers/wagon-ssh/src/site/apt/index.apt   |    2 +-
 .../providers/ssh/jsch/EmbeddedScpWagonTest.java   |    2 -
 wagon-providers/wagon-webdav-jackrabbit/pom.xml    |    9 +-
 .../providers/webdav}/AbstractHttpClientWagon.java |    2 +-
 .../wagon/providers/webdav}/HttpConfiguration.java |    2 +-
 .../providers/webdav}/HttpMethodConfiguration.java |    2 +-
 .../maven/wagon/providers/webdav/WebDavWagon.java  |    3 +-
 .../wagon-webdav-jackrabbit/src/site/apt/index.apt |    2 +-
 .../providers/webdav/HttpClientWagonTest.java}     |    7 +-
 wagon-tcks/pom.xml                                 |    2 +-
 wagon-tcks/wagon-tck-http/pom.xml                  |    2 +-
 79 files changed, 419 insertions(+), 1859 deletions(-)

diff --git a/.gitignore b/.gitignore
index 77249d7..5eed4c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+#maven
 target
 
 #idea
@@ -9,4 +10,7 @@ target
 .classpath
 .settings
 
+# OSX
 .DS_Store
+
+.java-version
diff --git a/deploySite.sh b/deploySite.sh
old mode 100644
new mode 100755
index b6517a2..be6bc26
--- a/deploySite.sh
+++ b/deploySite.sh
@@ -19,4 +19,4 @@
 # under the License.
 #
 
-mvn clean site-deploy scm-publish:publish-scm $@
+mvn clean site site:stage scm-publish:publish-scm $@
diff --git a/pom.xml b/pom.xml
index 8282da9..db5b8d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ under the License.
 
   <groupId>org.apache.maven.wagon</groupId>
   <artifactId>wagon</artifactId>
-  <version>2.4</version>
+  <version>2.5</version>
   <packaging>pom</packaging>
 
   <name>Apache Maven Wagon</name>
@@ -119,6 +119,9 @@ under the License.
     <contributor>
       <name>Oleg Kalnichevski</name>
     </contributor>
+    <contributor>
+      <name>William Bernardet</name>
+    </contributor>
   </contributors>
 
   <mailingLists>
@@ -186,7 +189,7 @@ under the License.
     <connection>scm:git:https://git-wip-us.apache.org/repos/asf/maven-wagon.git</connection>
     <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven-wagon.git</developerConnection>
     <url>https://git-wip-us.apache.org/repos/asf?p=maven-wagon.git</url>
-    <tag>wagon-2.4</tag>
+    <tag>wagon-2.5</tag>
   </scm>
 
   <issueManagement>
@@ -349,10 +352,11 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.15</version>
           <configuration>
             <forkedProcessTimeoutInSeconds>400</forkedProcessTimeoutInSeconds>
             <systemPropertyVariables>
-              <java.io.tmpdir>${project.build.outputDirectory}</java.io.tmpdir>
+              <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
             </systemPropertyVariables>
           </configuration>
         </plugin>
@@ -360,10 +364,21 @@ under the License.
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-scm-publish-plugin</artifactId>
           <configuration>
+            <content>${project.build.directory}/staging/${maven.site.path}</content>
             <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
             <tryUpdate>true</tryUpdate>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.9.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.3</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -422,6 +437,16 @@ under the License.
     </plugins>
   </build>
 
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.7</version>
+      </plugin>
+    </plugins>
+  </reporting>
+
   <profiles>
 
     <profile>
@@ -431,6 +456,7 @@ under the License.
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.9.1</version>
             <configuration>
               <linksource>true</linksource>
               <links>
@@ -450,19 +476,6 @@ under the License.
                 <link>http://maven.apache.org/ref/current/maven-reporting/maven-reporting-api/apidocs/</link>
                 <link>http://maven.apache.org/ref/current/maven-settings/apidocs/</link>
               </links>
-              <!--
-              <doclet>gr.spinellis.umlgraph.doclet.UmlGraph</doclet>
-              <docletArtifact>
-                <groupId>gr.spinellis</groupId>
-                <artifactId>UmlGraph</artifactId>
-                <version>4.4</version>
-              </docletArtifact>
-              <additionalparam>
-                -inferrel -inferdep -quiet -hide java.* -collpackages java.util.* -qualify
-                -postfixpackage -nodefontsize 9
-                -nodefontpackagesize 7
-              </additionalparam>
-              -->
               <groups>
                 <group>
                   <title>API + Test</title>
diff --git a/src/site/resources/images/wagon-deps.png b/src/site/resources/images/wagon-deps.png
index 2a327c4..0bd1e00 100644
Binary files a/src/site/resources/images/wagon-deps.png and b/src/site/resources/images/wagon-deps.png differ
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index da63469..88c3c6b 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -54,10 +54,9 @@
           <area shape="rect" coords="330,0,459,32"    alt="wagon-provider-test" href="./wagon-provider-test/" />
           <area shape="rect" coords="329,37,425,70"   alt="wagon-tck-http" href="./wagon-tcks/wagon-tck-http/" />
           <area shape="rect" coords="159,68,226,100"  alt="wagon-file" href="./wagon-providers/wagon-file/" />
-          <area shape="rect" coords="13,133,138,164"  alt="wagon-http-shared4" href="./wagon-providers/wagon-http-shared4/" />
+          <area shape="rect" coords="13,133,138,164"  alt="wagon-http-shared" href="./wagon-providers/wagon-http-shared/" />
           <area shape="rect" coords="159,110,304,141" alt="wagon-http-lightweight" href="./wagon-providers/wagon-http-lightweight/" />
           <area shape="rect" coords="159,151,226,183" alt="wagon-http" href="./wagon-providers/wagon-http/" />
-          <area shape="rect" coords="13,193,138,225"  alt="wagon-http-shared" href="./wagon-providers/wagon-http-shared/" />
           <area shape="rect" coords="159,193,257,225" alt="wagon-webdav-jackrabbit" href="./wagon-providers/wagon-webdav-jackrabbit/" />
           <area shape="rect" coords="159,234,226,266" alt="wagon-ftp" href="./wagon-providers/wagon-ftp/" />
           <area shape="rect" coords="12,298,134,330"  alt="wagon-ssh-common" href="./wagon-providers/wagon-ssh-common/" />
diff --git a/src/site/xdoc/wagon-deps.odg b/src/site/xdoc/wagon-deps.odg
index 10b6fa0..5a4f0ed 100644
Binary files a/src/site/xdoc/wagon-deps.odg and b/src/site/xdoc/wagon-deps.odg differ
diff --git a/wagon-provider-api/pom.xml b/wagon-provider-api/pom.xml
index 28a664a..59d85ab 100644
--- a/wagon-provider-api/pom.xml
+++ b/wagon-provider-api/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
index 4494463..4d6bee5 100644
--- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
+++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
@@ -48,7 +48,6 @@ import java.util.List;
  * Implementation of common facilities for Wagon providers.
  *
  * @author <a href="michal.maczka at dimatics.com">Michal Maczka</a>
- *
  */
 public abstract class AbstractWagon
     implements Wagon
@@ -284,19 +283,27 @@ public abstract class AbstractWagon
     protected void getTransfer( Resource resource, File destination, InputStream input )
         throws TransferFailedException
     {
-        getTransfer( resource, destination, input, true, Integer.MAX_VALUE );
+        getTransfer( resource, destination, input, true, Long.MAX_VALUE );
     }
 
     protected void getTransfer( Resource resource, OutputStream output, InputStream input )
         throws TransferFailedException
     {
-        getTransfer( resource, output, input, true, Integer.MAX_VALUE );
+        getTransfer( resource, output, input, true, Long.MAX_VALUE );
     }
 
+    @Deprecated
     protected void getTransfer( Resource resource, File destination, InputStream input, boolean closeInput,
                                 int maxSize )
         throws TransferFailedException
     {
+        getTransfer( resource, destination, input, closeInput, (long) maxSize );
+    }
+
+    protected void getTransfer( Resource resource, File destination, InputStream input, boolean closeInput,
+                                long maxSize )
+        throws TransferFailedException
+    {
         // ensure that the destination is created only when we are ready to transfer
         fireTransferDebug( "attempting to create parent directories for destination: " + destination.getName() );
         createParentDirectories( destination );
@@ -330,10 +337,18 @@ public abstract class AbstractWagon
         fireGetCompleted( resource, destination );
     }
 
+    @Deprecated
     protected void getTransfer( Resource resource, OutputStream output, InputStream input, boolean closeInput,
                                 int maxSize )
         throws TransferFailedException
     {
+        getTransfer( resource, output, input, closeInput, (long) maxSize );
+    }
+
+    protected void getTransfer( Resource resource, OutputStream output, InputStream input, boolean closeInput,
+                                long maxSize )
+        throws TransferFailedException
+    {
         try
         {
             transfer( resource, input, output, TransferEvent.REQUEST_GET, maxSize );
@@ -418,7 +433,10 @@ public abstract class AbstractWagon
     {
         try
         {
-            transfer( resource, input, output, TransferEvent.REQUEST_PUT );
+            transfer( resource, input, output, TransferEvent.REQUEST_PUT,
+                      resource.getContentLength() == WagonConstants.UNKNOWN_LENGTH
+                          ? Long.MAX_VALUE
+                          : resource.getContentLength() );
 
             finishPutTransfer( resource, input, output );
         }
@@ -464,7 +482,7 @@ public abstract class AbstractWagon
     protected void transfer( Resource resource, InputStream input, OutputStream output, int requestType )
         throws IOException
     {
-        transfer( resource, input, output, requestType, Integer.MAX_VALUE );
+        transfer( resource, input, output, requestType, Long.MAX_VALUE );
     }
 
     /**
@@ -478,19 +496,40 @@ public abstract class AbstractWagon
      * @param requestType one of {@link TransferEvent#REQUEST_GET} or {@link TransferEvent#REQUEST_PUT}
      * @param maxSize     size of the buffer
      * @throws IOException
+     * @deprecated Please use the transfer using long as type of maxSize
      */
+    @Deprecated
     protected void transfer( Resource resource, InputStream input, OutputStream output, int requestType, int maxSize )
         throws IOException
     {
+        transfer( resource, input, output, requestType, (long) maxSize );
+    }
+
+    /**
+     * Write from {@link InputStream} to {@link OutputStream}.
+     * Equivalent to {@link #transfer(Resource, InputStream, OutputStream, int, long)} with a maxSize equals to
+     * {@link Integer#MAX_VALUE}
+     *
+     * @param resource    resource to transfer
+     * @param input       input stream
+     * @param output      output stream
+     * @param requestType one of {@link TransferEvent#REQUEST_GET} or {@link TransferEvent#REQUEST_PUT}
+     * @param maxSize     size of the buffer
+     * @throws IOException
+     */
+    protected void transfer( Resource resource, InputStream input, OutputStream output, int requestType, long maxSize )
+        throws IOException
+    {
         byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
 
         TransferEvent transferEvent = new TransferEvent( this, resource, TransferEvent.TRANSFER_PROGRESS, requestType );
         transferEvent.setTimestamp( System.currentTimeMillis() );
 
-        int remaining = maxSize;
+        long remaining = maxSize;
         while ( remaining > 0 )
         {
-            int n = input.read( buffer, 0, Math.min( buffer.length, remaining ) );
+            // let's safely cast to int because the min value will be lower than the buffer size.
+            int n = input.read( buffer, 0, (int) Math.min( buffer.length, remaining ) );
 
             if ( n == -1 )
             {
@@ -830,7 +869,7 @@ public abstract class AbstractWagon
         this.interactive = interactive;
     }
 
-    public List getFileList( String destinationDirectory )
+    public List<String> getFileList( String destinationDirectory )
         throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
     {
         throw new UnsupportedOperationException( "The wagon you are using has not implemented getFileList()" );
diff --git a/wagon-provider-api/src/site/apt/index.apt b/wagon-provider-api/src/site/apt/index.apt
index cc6ba24..af2b67c 100644
--- a/wagon-provider-api/src/site/apt/index.apt
+++ b/wagon-provider-api/src/site/apt/index.apt
@@ -28,7 +28,7 @@
 
 Maven Wagon API
 
- The Wagon API project defines {{{./apidocs/}a simple API}} for transferring resources
+ The Wagon API component defines {{{./apidocs/}a simple API}} for transferring resources
  (artifacts) to and from repositories. The word repository is used in this context as
  it is commonly used in
  {{{http://maven.apache.org/maven-1.x/reference/glossary.html}Maven}}
diff --git a/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java b/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java
index 37e0e17..ce6b611 100644
--- a/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java
+++ b/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java
@@ -44,7 +44,6 @@ import java.io.OutputStream;
 
 /**
  * @author <a href="michal.maczka at dimatics.com">Michal Maczka</a>
- * @version $Id: AbstractWagonTest.java 630808 2008-02-25 11:01:41Z brett $
  */
 public class AbstractWagonTest
     extends TestCase
diff --git a/wagon-provider-api/src/test/java/org/apache/maven/wagon/WagonMock.java b/wagon-provider-api/src/test/java/org/apache/maven/wagon/WagonMock.java
index 6d76bf1..311b21a 100644
--- a/wagon-provider-api/src/test/java/org/apache/maven/wagon/WagonMock.java
+++ b/wagon-provider-api/src/test/java/org/apache/maven/wagon/WagonMock.java
@@ -115,10 +115,10 @@ public class WagonMock
     	return timeout;
     }
 
-    public List getFileList( String destinationDirectory )
+    public List<String> getFileList( String destinationDirectory )
         throws TransferFailedException, AuthorizationException
     {
-        return Collections.EMPTY_LIST;
+        return Collections.<String>emptyList();
     }
 
     public boolean resourceExists( String resourceName )
diff --git a/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/TransferEventSupportTest.java b/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/TransferEventSupportTest.java
index c9cca3b..a42021f 100644
--- a/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/TransferEventSupportTest.java
+++ b/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/TransferEventSupportTest.java
@@ -25,8 +25,6 @@ import org.easymock.MockControl;
 
 /**
  * @author <a href="michal.maczka at dimatics.com">Michal Maczka</a>
- * @version $Id: TransferEventSupportTest.java,v 1.2 2003/11/16 12:41:02 michal
- *          Exp $
  */
 public class TransferEventSupportTest
     extends TestCase
diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml
index 1bc9826..814cc58 100644
--- a/wagon-provider-test/pom.xml
+++ b/wagon-provider-test/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
index ce9bb16..c6baed4 100644
--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
+++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
@@ -33,7 +33,6 @@ import java.text.SimpleDateFormat;
 
 /**
  * @author <a href="mailto:brett at apache.org">Brett Porter</a>
- * @version $Id: WagonTestCase.java 660462 2008-05-27 10:52:46Z brett $
  */
 public abstract class StreamingWagonTestCase
     extends WagonTestCase
diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
index 4ee5475..12a3fce 100644
--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
+++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
@@ -70,7 +70,7 @@ import java.util.Properties;
 import java.util.zip.GZIPOutputStream;
 
 /**
- * @version $Id: LightweightHttpWagonTest.java 680764 2008-07-29 16:45:51Z brett $
+ *
  */
 public abstract class HttpWagonTestCase
     extends StreamingWagonTestCase
diff --git a/wagon-providers/pom.xml b/wagon-providers/pom.xml
index d87c3be..63ed57d 100644
--- a/wagon-providers/pom.xml
+++ b/wagon-providers/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -34,7 +34,6 @@ under the License.
   <modules>
     <module>wagon-file</module>
     <module>wagon-ftp</module>
-    <module>wagon-http-shared4</module>
     <module>wagon-http</module>
     <module>wagon-http-shared</module>
     <module>wagon-http-lightweight</module>
@@ -51,17 +50,17 @@ under the License.
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
-        <version>4.2.3</version>
+        <version>4.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpcore</artifactId>
-        <version>4.2.3</version>
+        <version>4.2.4</version>
       </dependency>
       <dependency>
         <groupId>org.apache.sshd</groupId>
         <artifactId>sshd-core</artifactId>
-        <version>0.6.0</version>
+        <version>0.8.0</version>
         <scope>test</scope>
       </dependency>
     </dependencies>
diff --git a/wagon-providers/wagon-file/pom.xml b/wagon-providers/wagon-file/pom.xml
index 331a797..77279da 100644
--- a/wagon-providers/wagon-file/pom.xml
+++ b/wagon-providers/wagon-file/pom.xml
@@ -23,13 +23,19 @@ under the License.
   <parent>
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-file</artifactId>
   <name>Apache Maven Wagon :: Providers :: File Provider</name>
   <description>
-    Wagon that gets and puts artifacts using file system protocol
+    Wagon provider that gets and puts artifacts using file system protocol
   </description>
+  <dependencies>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java b/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
index d6ce25f..edce708 100644
--- a/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
+++ b/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
@@ -30,6 +30,7 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.maven.wagon.ConnectionException;
 import org.apache.maven.wagon.InputData;
 import org.apache.maven.wagon.LazyFileOutputStream;
@@ -40,7 +41,6 @@ import org.apache.maven.wagon.TransferFailedException;
 import org.apache.maven.wagon.authorization.AuthorizationException;
 import org.apache.maven.wagon.resource.Resource;
 import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
 
 /**
  * Wagon Provider for Local File System
diff --git a/wagon-providers/wagon-file/src/site/apt/index.apt b/wagon-providers/wagon-file/src/site/apt/index.apt
index 95047e8..1596451 100644
--- a/wagon-providers/wagon-file/src/site/apt/index.apt
+++ b/wagon-providers/wagon-file/src/site/apt/index.apt
@@ -28,7 +28,7 @@
 
 Maven Wagon File
 
- This project is an implementation of Wagon provider for File system access.
+ This component is an implementation of Wagon provider for File system access.
  
  It enables Maven to use remote repositories stored in local file system and to store Maven sites there also.
 
diff --git a/wagon-providers/wagon-ftp/pom.xml b/wagon-providers/wagon-ftp/pom.xml
index 5ecf600..c7c6c83 100644
--- a/wagon-providers/wagon-ftp/pom.xml
+++ b/wagon-providers/wagon-ftp/pom.xml
@@ -23,14 +23,14 @@ under the License.
   <parent>
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-ftp</artifactId>
   <name>Apache Maven Wagon :: Providers :: FTP Provider</name>
   <description>
-    Wagon that gets and puts artifacts from and to remote server using FTP protocol
+    Wagon provider that gets and puts artifacts from and to remote server using FTP protocol
   </description>
 
   <dependencies>
@@ -54,6 +54,10 @@ under the License.
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java b/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
index 7e961f9..0de2b7b 100644
--- a/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
+++ b/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
@@ -19,6 +19,7 @@ package org.apache.maven.wagon.providers.ftp;
  * under the License.
  */
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.net.ProtocolCommandEvent;
 import org.apache.commons.net.ProtocolCommandListener;
 import org.apache.commons.net.ftp.FTP;
@@ -38,7 +39,6 @@ import org.apache.maven.wagon.authentication.AuthenticationInfo;
 import org.apache.maven.wagon.authorization.AuthorizationException;
 import org.apache.maven.wagon.repository.RepositoryPermissions;
 import org.apache.maven.wagon.resource.Resource;
-import org.codehaus.plexus.util.IOUtil;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -664,7 +664,7 @@ public class FtpWagon
             }
             finally
             {
-                IOUtil.close( sourceFileStream );
+                IOUtils.closeQuietly( sourceFileStream );
             }
 
         }
diff --git a/wagon-providers/wagon-ftp/src/site/apt/index.apt b/wagon-providers/wagon-ftp/src/site/apt/index.apt
index e28e93f..0f7f47e 100644
--- a/wagon-providers/wagon-ftp/src/site/apt/index.apt
+++ b/wagon-providers/wagon-ftp/src/site/apt/index.apt
@@ -28,7 +28,7 @@
 
 Maven Wagon FTP
 
- This project is an implementation of Wagon provider for FTP access.
+ This component is an implementation of Wagon provider for FTP access.
  It uses {{{http://jakarta.apache.org/commons/net/}commons-net}} as lower level layer.
 
  It enables Maven to use remote repositories stored in FTP servers. It doesn't allow deployment of directories.
diff --git a/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java b/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
index fe61ac3..6c8f401 100644
--- a/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
+++ b/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
@@ -19,6 +19,7 @@ package org.apache.maven.wagon.providers.ftp;
  * under the License.
  */
 
+import org.apache.commons.io.FileUtils;
 import org.apache.ftpserver.FtpServer;
 import org.apache.ftpserver.FtpServerFactory;
 import org.apache.ftpserver.ftplet.Authority;
@@ -34,7 +35,7 @@ import org.apache.maven.wagon.authentication.AuthenticationException;
 import org.apache.maven.wagon.authentication.AuthenticationInfo;
 import org.apache.maven.wagon.repository.Repository;
 import org.apache.maven.wagon.resource.Resource;
-import org.codehaus.plexus.util.FileUtils;
+
 
 import java.io.File;
 import java.util.ArrayList;
@@ -199,7 +200,7 @@ public class FtpWagonTest
         {
             // do the cleanup first
             File destDir = new File( getRepositoryDirectory(), "dirExists" );
-            FileUtils.deleteDirectory(destDir);
+            FileUtils.deleteDirectory( destDir );
             destDir.mkdirs();
             destDir = new File( destDir, "not_yet_existing/also_not" );
 
diff --git a/wagon-providers/wagon-http-lightweight/pom.xml b/wagon-providers/wagon-http-lightweight/pom.xml
index 48e286d..cd09a90 100644
--- a/wagon-providers/wagon-http-lightweight/pom.xml
+++ b/wagon-providers/wagon-http-lightweight/pom.xml
@@ -23,31 +23,21 @@ under the License.
   <parent>
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-http-lightweight</artifactId>
   <name>Apache Maven Wagon :: Providers :: Lightweight HTTP Provider</name>
   <description>
-    Wagon that gets and puts artifacts through http using standard Java library
+    Wagon provider that gets and puts artifacts through http using standard Java library
   </description>
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>wagon-http-shared4</artifactId>
+      <artifactId>wagon-http-shared</artifactId>
       <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpclient</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <!-- used fo the TCK -->
diff --git a/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java b/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
index b15d059..ff1a25d 100644
--- a/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
+++ b/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
@@ -31,7 +31,7 @@ import org.apache.maven.wagon.authorization.AuthorizationException;
 import org.apache.maven.wagon.events.TransferEvent;
 import org.apache.maven.wagon.proxy.ProxyInfo;
 import org.apache.maven.wagon.resource.Resource;
-import org.apache.maven.wagon.shared.http4.HtmlFileListParser;
+import org.apache.maven.wagon.shared.http.HtmlFileListParser;
 import org.codehaus.plexus.util.Base64;
 
 import java.io.FileNotFoundException;
diff --git a/wagon-providers/wagon-http-lightweight/src/site/apt/index.apt b/wagon-providers/wagon-http-lightweight/src/site/apt/index.apt
index 980b085..3a123b3 100644
--- a/wagon-providers/wagon-http-lightweight/src/site/apt/index.apt
+++ b/wagon-providers/wagon-http-lightweight/src/site/apt/index.apt
@@ -28,7 +28,7 @@
 
 Maven Wagon HTTP lightweight
 
- This project is an implementation of Wagon provider for HTTP access.
+ This component is an implementation of Wagon provider for HTTP access.
  It uses standard JDK classes as lower lever layer.
  
  It enables Maven to use remote repositories stored in HTTP servers.
diff --git a/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java b/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java
index 6e08ac9..06929c4 100644
--- a/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java
+++ b/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java
@@ -20,10 +20,7 @@ package org.apache.maven.wagon.providers.http;
  */
 
 import org.apache.maven.wagon.StreamingWagon;
-import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.http.HttpWagonTestCase;
-import org.apache.maven.wagon.proxy.ProxyInfo;
-import org.apache.maven.wagon.repository.Repository;
 
 import java.util.Properties;
 
@@ -44,7 +41,6 @@ public class LightweightHttpWagonTest
         return getProtocol() + "://localhost:" + getTestRepositoryPort() + "/";
     }
 
-
     protected void setHttpHeaders( StreamingWagon wagon, Properties properties )
     {
         ( (LightweightHttpWagon) wagon ).setHttpHeaders( properties );
@@ -56,7 +52,6 @@ public class LightweightHttpWagonTest
         return false;
     }
 
-
     @Override
     protected boolean supportPreemptiveAuthenticationPut()
     {
diff --git a/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java b/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java
index abf102c..8342f40 100644
--- a/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java
+++ b/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java
@@ -20,9 +20,7 @@ package org.apache.maven.wagon.providers.http;
  */
 
 import org.apache.maven.wagon.tck.http.GetWagonTests;
-import org.apache.maven.wagon.tck.http.HttpWagonTests;
 import org.apache.maven.wagon.tck.http.HttpsGetWagonTests;
-import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/wagon-providers/wagon-http-shared/pom.xml b/wagon-providers/wagon-http-shared/pom.xml
index 1e6d058..cdc2add 100644
--- a/wagon-providers/wagon-http-shared/pom.xml
+++ b/wagon-providers/wagon-http-shared/pom.xml
@@ -23,57 +23,21 @@ under the License.
   <parent>
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-http-shared</artifactId>
   <name>Apache Maven Wagon :: Providers :: HTTP Shared Library</name>
   <description>
-    Shared Library for the wagon-http, and wagon-http-lightweight wagon
-    providers.
+    Shared Library for wagon providers supporting HTTP.
   </description>
 
   <dependencies>
     <dependency>
-      <groupId>nekohtml</groupId>
-      <artifactId>xercesMinimal</artifactId>
-      <version>1.9.6.2</version>
-    </dependency>
-    <dependency>
-      <groupId>nekohtml</groupId>
-      <artifactId>nekohtml</artifactId>
-      <version>1.9.6.2</version>
-      <exclusions>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xercesImpl</artifactId>
-        </exclusion>
-      </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>
-    <!--
-      This dependency is here to upgrade to a version of commons-logging that is
-      newer than the one that comes transitively from commons-httpclient above.
-    -->
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <groupId>org.jsoup</groupId>
+      <artifactId>jsoup</artifactId>
+      <version>1.7.2</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java
index 749bd5d..2008b99 100644
--- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java
+++ b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java
@@ -19,15 +19,13 @@ package org.apache.maven.wagon.shared.http;
  * under the License.
  */
 
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.maven.wagon.TransferFailedException;
-import org.apache.xerces.xni.Augmentations;
-import org.apache.xerces.xni.QName;
-import org.apache.xerces.xni.XMLAttributes;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.apache.xerces.xni.parser.XMLParserConfiguration;
-import org.codehaus.plexus.util.StringUtils;
-import org.cyberneko.html.HTMLConfiguration;
-import org.cyberneko.html.filters.DefaultFilter;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -46,9 +44,25 @@ import java.util.regex.Pattern;
  */
 public class HtmlFileListParser
 {
+    // Apache Fancy Index Sort Headers
+    private static final Pattern APACHE_INDEX_SKIP = Pattern.compile( "\\?[CDMNS]=.*" );
+
+    // URLs with excessive paths.
+    private static final Pattern URLS_WITH_PATHS = Pattern.compile( "/[^/]*/" );
+
+    // URLs that to a parent directory.
+    private static final Pattern URLS_TO_PARENT = Pattern.compile( "\\.\\./" );
+
+    // mailto urls
+    private static final Pattern MAILTO_URLS = Pattern.compile( "mailto:.*" );
+
+    private static final Pattern[] SKIPS =
+        new Pattern[]{ APACHE_INDEX_SKIP, URLS_WITH_PATHS, URLS_TO_PARENT, MAILTO_URLS };
+
     /**
      * Fetches a raw HTML from a provided InputStream, parses it, and returns the file list.
      *
+     * @param stream the input stream.
      * @return the file list.
      * @throws TransferFailedException if there was a problem fetching the raw html.
      */
@@ -57,126 +71,94 @@ public class HtmlFileListParser
     {
         try
         {
-            // Use URI object to get benefits of proper absolute and relative path resolution for free
             URI baseURI = new URI( baseurl );
+            // to make debugging easier, start with a string. This is assuming UTF-8, which might not be a safe
+            // assumption.
+            String content = IOUtils.toString( stream, "utf-8" );
+            Document doc = Jsoup.parse( content, baseurl );
+            Elements links = doc.select("a[href]");
+            Set<String> results = new HashSet<String>();
+            for ( int lx = 0; lx < links.size(); lx++ )
+            {
+                Element link = links.get( lx );
+                /*
+                 * The abs:href loses directories, so we deal with absolute paths ourselves below in cleanLink
+                 */
+                String target = link.attr( "href" );
+                if ( target != null )
+                {
+                    String clean = cleanLink( baseURI, target );
+                    if ( isAcceptableLink( clean ) )
+                    {
+                        results.add( clean );
+                    }
+                }
 
-            Parser handler = new Parser( baseURI );
-
-            XMLParserConfiguration parser = new HTMLConfiguration();
-            parser.setDocumentHandler( handler );
-            parser.setFeature( "http://cyberneko.org/html/features/augmentations", true );
-            parser.setProperty( "http://cyberneko.org/html/properties/names/elems", "upper" );
-            parser.setProperty( "http://cyberneko.org/html/properties/names/attrs", "upper" );
-            parser.parse( new XMLInputSource( null, baseurl, baseURI.toString(), stream, "UTF-8" ) );
-
-            return new ArrayList<String>( handler.getLinks() );
+            }
 
+            return new ArrayList<String>( results );
         }
         catch ( URISyntaxException e )
         {
-            throw new TransferFailedException( "Unable to parse as URI: " + baseurl, e );
+            throw new TransferFailedException( "Unable to parse as base URI: " + baseurl, e );
         }
         catch ( IOException e )
         {
-            throw new TransferFailedException( "I/O error: " + e.getMessage(), e );
+            throw new TransferFailedException( "I/O error reading HTML listing of artifacts: " + e.getMessage(), e );
         }
     }
 
-    private static class Parser
-        extends DefaultFilter
+    private static String cleanLink( URI baseURI, String link )
     {
-        // Apache Fancy Index Sort Headers
-        private static final Pattern APACHE_INDEX_SKIP = Pattern.compile( "\\?[CDMNS]=.*" );
-
-        // URLs with excessive paths.
-        private static final Pattern URLS_WITH_PATHS = Pattern.compile( "/[^/]*/" );
-
-        // URLs that to a parent directory.
-        private static final Pattern URLS_TO_PARENT = Pattern.compile( "\\.\\./" );
-
-        // mailto urls
-        private static final Pattern MAILTO_URLS = Pattern.compile( "mailto:.*" );
-
-        private static final Pattern[] SKIPS =
-            new Pattern[]{ APACHE_INDEX_SKIP, URLS_WITH_PATHS, URLS_TO_PARENT, MAILTO_URLS };
-
-        private Set<String> links = new HashSet<String>();
-
-        private URI baseURI;
-
-        public Parser( URI baseURI )
+        if ( StringUtils.isEmpty( link ) )
         {
-            this.baseURI = baseURI.normalize();
+            return "";
         }
 
-        public Set<String> getLinks()
-        {
-            return links;
-        }
+        String ret = link;
 
-        public void startElement( QName element, XMLAttributes attrs, Augmentations augs )
+        try
         {
-            if ( "A".equals( element.rawname ) )
+            URI linkuri = new URI( ret );
+            if ( link.startsWith( "/" ) )
             {
-                String href = attrs.getValue( "HREF" );
-                if ( href != null )
-                {
-                    String link = cleanLink( baseURI, href );
-                    if ( isAcceptableLink( link ) )
-                    {
-                        links.add( link );
-                    }
-                }
+                linkuri = baseURI.resolve( linkuri );
             }
-        }
-
-        private static String cleanLink( URI baseURI, String link )
-        {
-            if ( StringUtils.isEmpty( link ) )
+            URI relativeURI = baseURI.relativize( linkuri ).normalize();
+            ret = relativeURI.toASCIIString();
+            if ( ret.startsWith( baseURI.getPath() ) )
             {
-                return "";
+                ret = ret.substring( baseURI.getPath().length() );
             }
 
-            String ret = link;
-
-            try
-            {
-                URI linkuri = new URI( ret );
-                URI relativeURI = baseURI.relativize( linkuri ).normalize();
-                ret = relativeURI.toASCIIString();
-                if ( ret.startsWith( baseURI.getPath() ) )
-                {
-                    ret = ret.substring( baseURI.getPath().length() );
-                }
+            ret = URLDecoder.decode( ret, "UTF-8" );
+        }
+        catch ( URISyntaxException e )
+        {
+        }
+        catch ( UnsupportedEncodingException e )
+        {
+        }
 
-                ret = URLDecoder.decode( ret, "UTF-8" );
-            }
-            catch ( URISyntaxException e )
-            {
-            }
-            catch ( UnsupportedEncodingException e )
-            {
-            }
+        return ret;
+    }
 
-            return ret;
+    private static boolean isAcceptableLink( String link )
+    {
+        if ( StringUtils.isEmpty( link ) )
+        {
+            return false;
         }
 
-        private static boolean isAcceptableLink( String link )
+        for ( int i = 0; i < SKIPS.length; i++ )
         {
-            if ( StringUtils.isEmpty( link ) )
+            if ( SKIPS[i].matcher( link ).find() )
             {
                 return false;
             }
-
-            for ( int i = 0; i < SKIPS.length; i++ )
-            {
-                if ( SKIPS[i].matcher( link ).find() )
-                {
-                    return false;
-                }
-            }
-
-            return true;
         }
+
+        return true;
     }
-}
+
+}
\ No newline at end of file
diff --git a/wagon-providers/wagon-http-shared4/pom.xml b/wagon-providers/wagon-http-shared4/pom.xml
deleted file mode 100644
index c716c9d..0000000
--- a/wagon-providers/wagon-http-shared4/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.maven.wagon</groupId>
-    <artifactId>wagon-providers</artifactId>
-    <version>2.4</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>wagon-http-shared4</artifactId>
-  <name>Apache Maven Wagon :: Providers :: HTTP Shared Library 4</name>
-  <description>
-    Shared Library for the wagon-http, and wagon-http-lightweight wagon
-    providers based on httpclient-4.x.
-  </description>
-
-  <dependencies>
-  
-    <dependency>
-      <groupId>org.jsoup</groupId>
-      <artifactId>jsoup</artifactId>
-      <version>1.7.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-    </dependency>
-    <dependency>
-    	<groupId>commons-io</groupId>
-    	<artifactId>commons-io</artifactId>
-    	<version>2.0.1</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/HtmlFileListParser.java b/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/HtmlFileListParser.java
deleted file mode 100644
index 01303f5..0000000
--- a/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/HtmlFileListParser.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package org.apache.maven.wagon.shared.http4;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.commons.io.IOUtils;
-import org.apache.maven.wagon.TransferFailedException;
-import org.codehaus.plexus.util.StringUtils;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-/**
- * Html File List Parser.
- */
-public class HtmlFileListParser
-{
-    // Apache Fancy Index Sort Headers
-    private static final Pattern APACHE_INDEX_SKIP = Pattern.compile( "\\?[CDMNS]=.*" );
-
-    // URLs with excessive paths.
-    private static final Pattern URLS_WITH_PATHS = Pattern.compile( "/[^/]*/" );
-
-    // URLs that to a parent directory.
-    private static final Pattern URLS_TO_PARENT = Pattern.compile( "\\.\\./" );
-
-    // mailto urls
-    private static final Pattern MAILTO_URLS = Pattern.compile( "mailto:.*" );
-
-    private static final Pattern[] SKIPS =
-        new Pattern[]{ APACHE_INDEX_SKIP, URLS_WITH_PATHS, URLS_TO_PARENT, MAILTO_URLS };
-
-    /**
-     * Fetches a raw HTML from a provided InputStream, parses it, and returns the file list.
-     *
-     * @param stream the input stream.
-     * @return the file list.
-     * @throws TransferFailedException if there was a problem fetching the raw html.
-     */
-    public static List<String> parseFileList( String baseurl, InputStream stream )
-        throws TransferFailedException
-    {
-        try
-        {
-            URI baseURI = new URI( baseurl );
-            // to make debugging easier, start with a string. This is assuming UTF-8, which might not be a safe
-            // assumption.
-            String content = IOUtils.toString( stream, "utf-8" );
-            Document doc = Jsoup.parse( content, baseurl );
-            Elements links = doc.select("a[href]");
-            Set<String> results = new HashSet<String>();
-            for ( int lx = 0; lx < links.size(); lx++ )
-            {
-                Element link = links.get( lx );
-                /*
-                 * The abs:href loses directories, so we deal with absolute paths ourselves below in cleanLink
-                 */
-                String target = link.attr( "href" );
-                if ( target != null )
-                {
-                    String clean = cleanLink( baseURI, target );
-                    if ( isAcceptableLink( clean ) )
-                    {
-                        results.add( clean );
-                    }
-                }
-
-            }
-
-            return new ArrayList<String>( results );
-        }
-        catch ( URISyntaxException e )
-        {
-            throw new TransferFailedException( "Unable to parse as base URI: " + baseurl, e );
-        }
-        catch ( IOException e )
-        {
-            throw new TransferFailedException( "I/O error reading HTML listing of artifacts: " + e.getMessage(), e );
-        }
-    }
-
-    private static String cleanLink( URI baseURI, String link )
-    {
-        if ( StringUtils.isEmpty( link ) )
-        {
-            return "";
-        }
-
-        String ret = link;
-
-        try
-        {
-            URI linkuri = new URI( ret );
-            if ( link.startsWith( "/" ) )
-            {
-                linkuri = baseURI.resolve( linkuri );
-            }
-            URI relativeURI = baseURI.relativize( linkuri ).normalize();
-            ret = relativeURI.toASCIIString();
-            if ( ret.startsWith( baseURI.getPath() ) )
-            {
-                ret = ret.substring( baseURI.getPath().length() );
-            }
-
-            ret = URLDecoder.decode( ret, "UTF-8" );
-        }
-        catch ( URISyntaxException e )
-        {
-        }
-        catch ( UnsupportedEncodingException e )
-        {
-        }
-
-        return ret;
-    }
-
-    private static boolean isAcceptableLink( String link )
-    {
-        if ( StringUtils.isEmpty( link ) )
-        {
-            return false;
-        }
-
-        for ( int i = 0; i < SKIPS.length; i++ )
-        {
-            if ( SKIPS[i].matcher( link ).find() )
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-}
diff --git a/wagon-providers/wagon-http-shared4/src/site/site.xml b/wagon-providers/wagon-http-shared4/src/site/site.xml
deleted file mode 100644
index d3c7945..0000000
--- a/wagon-providers/wagon-http-shared4/src/site/site.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
-  <body>
-    <breadcrumbs>
-      <item name="HTTP Shared 4" href="http://maven.apache.org/wagon/wagon-providers/wagon-http-shared4/index.html" />
-    </breadcrumbs>
-
-    <menu ref="parent"/>
-    <menu ref="reports"/>
-  </body>
-</project>
\ No newline at end of file
diff --git a/wagon-providers/wagon-http-shared4/src/test/java/org/apache/maven/wagon/shared/http4/HtmlFileListParserTest.java b/wagon-providers/wagon-http-shared4/src/test/java/org/apache/maven/wagon/shared/http4/HtmlFileListParserTest.java
deleted file mode 100644
index 48ff006..0000000
--- a/wagon-providers/wagon-http-shared4/src/test/java/org/apache/maven/wagon/shared/http4/HtmlFileListParserTest.java
+++ /dev/null
@@ -1,728 +0,0 @@
-package org.apache.maven.wagon.shared.http4;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-import org.apache.log4j.Logger;
-import org.apache.maven.wagon.TransferFailedException;
-
-/**
- * Unit Tests for the HtmlFileListParser
- */
-public class HtmlFileListParserTest
-    extends TestCase
-{
-    private static Logger logger = Logger.getLogger( HtmlFileListParserTest.class );
-
-    private void assertContainsExpected( List<String>links, String[] expected )
-    {
-        if ( expected.length != links.size() )
-        {
-            Collections.sort( links );
-            for ( Iterator<String> iterator = links.iterator(); iterator.hasNext(); )
-            {
-                String link = iterator.next();
-                logger.info( "   \"" + link + "\", " );
-            }
-            assertEquals( "Links to Expected size", expected.length, links.size() );
-        }
-
-        for ( int i = 0; i < expected.length; i++ )
-        {
-            assertTrue( "Should find [" + expected[i] + "] in link list", links.contains( expected[i] ) );
-        }
-    }
-
-    private void assertNotContainingAvoided( List<String> links, String[] avoided )
-    {
-        for ( int i = 0; i < avoided.length; i++ )
-        {
-            assertFalse( "Should not find [" + avoided[i] + "] in link list", links.contains( avoided[i] ) );
-        }
-    }
-
-    private List<String> parseLinks( String url, String filename )
-        throws TransferFailedException
-    {
-        InputStream is = this.getClass().getResourceAsStream( "/filelistings/" + filename );
-        List<String> files = HtmlFileListParser.parseFileList( url, is );
-
-        assertNotNull( "file list should not be null.", files );
-        assertFalse( "file list should not be empty.", files.isEmpty() );
-
-        /* Debug */
-        if ( false )
-        {
-            Iterator it = files.iterator();
-            while ( it.hasNext() )
-            {
-                logger.info( "File: '" + it.next() + "'" );
-            }
-        }
-
-        return files;
-    }
-
-    /**
-     * Example showing jetty directory browsing of commons-lang
-     *
-     * @throws TransferFailedException
-     */
-    public void testParseCommonsLang()
-        throws TransferFailedException
-    {
-        List<String> links = parseLinks( "http://localhost/repository/commons-lang/commons-lang/2.3",
-                                             "commons-lang.html" );
-
-        String[] expected = new String[] {
-            "commons-lang-2.3-javadoc.jar",
-            "commons-lang-2.3-javadoc.jar.asc",
-            "commons-lang-2.3-javadoc.jar.md5",
-            "commons-lang-2.3-javadoc.jar.sha1",
-            "commons-lang-2.3-sources.jar",
-            "commons-lang-2.3-sources.jar.asc",
-            "commons-lang-2.3-sources.jar.md5",
-            "commons-lang-2.3-sources.jar.sha1",
-            "commons-lang-2.3.jar",
-            "commons-lang-2.3.jar.asc",
-            "commons-lang-2.3.jar.md5",
-            "commons-lang-2.3.jar.sha1",
-            "commons-lang-2.3.pom",
-            "commons-lang-2.3.pom.md5",
-            "commons-lang-2.3.pom.sha1",
-            "maven-metadata.xml",
-            "maven-metadata.xml.md5",
-            "maven-metadata.xml.sha1" };
-
-        assertContainsExpected( links, expected );
-
-        String[] avoided = new String[] { "../" };
-
-        assertNotContainingAvoided( links, avoided );
-    }
-
-    public void testParseIbiblio()
-        throws Exception
-    {
-        List<String> links = parseLinks( "http://www.ibiblio.org/maven2/org/apache/maven/wagon/",
-                                             "ibiblio-wagon.html" );
-
-        String[] expected = new String[] {
-            "wagon-1.0-alpha-2.pom",
-            "wagon-1.0-alpha-2.pom.asc",
-            "wagon-1.0-alpha-2.pom.md5",
-            "wagon-1.0-alpha-2.pom.sha1",
-            "wagon-1.0-alpha-3-20050413.021234-4.pom",
-            "wagon-1.0-alpha-3-20050413.021234-4.pom.md5",
-            "wagon-1.0-alpha-3-20050413.021234-4.pom.sha1",
-            "wagon-1.0-alpha-3-20050419.043745-5.pom",
-            "wagon-1.0-alpha-3-20050419.043745-5.pom.md5",
-            "wagon-1.0-alpha-3-20050419.043745-5.pom.sha1",
-            "wagon-1.0-alpha-3-20050419.044035-6.pom",
-            "wagon-1.0-alpha-3-20050419.044035-6.pom.md5",
-            "wagon-1.0-alpha-3-20050419.044035-6.pom.sha1",
-            "wagon-1.0-alpha-3-20050421.162738-7.pom",
-            "wagon-1.0-alpha-3-20050421.162738-7.pom.md5",
-            "wagon-1.0-alpha-3-20050421.162738-7.pom.sha1",
-            "wagon-1.0-alpha-3-20050422.075233-8.pom",
-            "wagon-1.0-alpha-3-20050422.075233-8.pom.md5",
-            "wagon-1.0-alpha-3-20050422.075233-8.pom.sha1",
-            "wagon-1.0-alpha-3-20050429.051847-9.pom",
-            "wagon-1.0-alpha-3-20050429.051847-9.pom.md5",
-            "wagon-1.0-alpha-3-20050429.051847-9.pom.sha1",
-            "wagon-file/",
-            "wagon-ftp/",
-            "wagon-http-lightweight/",
-            "wagon-http/",
-            "wagon-lightweight-http/",
-            "wagon-provider-api/",
-            "wagon-provider-test/",
-            "wagon-provider/",
-            "wagon-providers-1.0-alpha-2.pom",
-            "wagon-providers-1.0-alpha-2.pom.asc",
-            "wagon-providers-1.0-alpha-2.pom.md5",
-            "wagon-providers-1.0-alpha-2.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050407.202848-1.pom",
-            "wagon-providers-1.0-alpha-3-20050407.202848-1.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050407.202848-1.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050419.044035-2.pom",
-            "wagon-providers-1.0-alpha-3-20050419.044035-2.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050419.044035-2.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050421.162738-3.pom",
-            "wagon-providers-1.0-alpha-3-20050421.162738-3.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050421.162738-3.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050422.075233-4.pom",
-            "wagon-providers-1.0-alpha-3-20050422.075233-4.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050422.075233-4.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050429.051847-5.pom",
-            "wagon-providers-1.0-alpha-3-20050429.051847-5.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050429.051847-5.pom.sha1",
-            "wagon-providers/",
-            "wagon-scm/",
-            "wagon-ssh-external/",
-            "wagon-ssh/",
-            "wagon-webdav/",
-            "wagon/" };
-
-        assertContainsExpected( links, expected );
-
-        String[] avoided = new String[] { "/org/", "?C=S;O=A", "?C=D;O=A", "?C=M;O=A", "?D=A", "?M=A", "?N=D", "?S=A" };
-
-        assertNotContainingAvoided( links, avoided );
-    }
-
-    /**
-     * Test of an html which is improperly formatted, and contains full host-specific paths to the resources.
-     * @throws Exception
-     */
-    public void testParseJetty()
-        throws Exception
-    {
-        List<String> links = parseLinks( "http://www.ibiblio.org/maven2/org/apache/maven/wagon/",
-                                             "jetty-wagon.html" );
-
-        String[] expected = new String[] {
-            "wagon-1.0-alpha-2.pom",
-            "wagon-1.0-alpha-2.pom.asc",
-            "wagon-1.0-alpha-2.pom.md5",
-            "wagon-1.0-alpha-2.pom.sha1",
-            "wagon-1.0-alpha-3-20050413.021234-4.pom",
-            "wagon-1.0-alpha-3-20050413.021234-4.pom.md5",
-            "wagon-1.0-alpha-3-20050413.021234-4.pom.sha1",
-            "wagon-1.0-alpha-3-20050419.043745-5.pom",
-            "wagon-1.0-alpha-3-20050419.043745-5.pom.md5",
-            "wagon-1.0-alpha-3-20050419.043745-5.pom.sha1",
-            "wagon-1.0-alpha-3-20050419.044035-6.pom",
-            "wagon-1.0-alpha-3-20050419.044035-6.pom.md5",
-            "wagon-1.0-alpha-3-20050419.044035-6.pom.sha1",
-            "wagon-1.0-alpha-3-20050421.162738-7.pom",
-            "wagon-1.0-alpha-3-20050421.162738-7.pom.md5",
-            "wagon-1.0-alpha-3-20050421.162738-7.pom.sha1",
-            "wagon-1.0-alpha-3-20050422.075233-8.pom",
-            "wagon-1.0-alpha-3-20050422.075233-8.pom.md5",
-            "wagon-1.0-alpha-3-20050422.075233-8.pom.sha1",
-            "wagon-1.0-alpha-3-20050429.051847-9.pom",
-            "wagon-1.0-alpha-3-20050429.051847-9.pom.md5",
-            "wagon-1.0-alpha-3-20050429.051847-9.pom.sha1",
-            "wagon-file/",
-            "wagon-ftp/",
-            "wagon-http-lightweight/",
-            "wagon-http/",
-            "wagon-lightweight-http/",
-            "wagon-provider-api/",
-            "wagon-provider-test/",
-            "wagon-provider/",
-            "wagon-providers-1.0-alpha-2.pom",
-            "wagon-providers-1.0-alpha-2.pom.asc",
-            "wagon-providers-1.0-alpha-2.pom.md5",
-            "wagon-providers-1.0-alpha-2.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050407.202848-1.pom",
-            "wagon-providers-1.0-alpha-3-20050407.202848-1.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050407.202848-1.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050419.044035-2.pom",
-            "wagon-providers-1.0-alpha-3-20050419.044035-2.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050419.044035-2.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050421.162738-3.pom",
-            "wagon-providers-1.0-alpha-3-20050421.162738-3.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050421.162738-3.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050422.075233-4.pom",
-            "wagon-providers-1.0-alpha-3-20050422.075233-4.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050422.075233-4.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050429.051847-5.pom",
-            "wagon-providers-1.0-alpha-3-20050429.051847-5.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050429.051847-5.pom.sha1",
-            "wagon-providers/",
-            "wagon-scm/",
-            "wagon-ssh-external/",
-            "wagon-ssh/",
-            "wagon-webdav/",
-            "wagon/" };
-
-        assertContainsExpected( links, expected );
-
-        String[] avoided = new String[] { "/org/", "?C=S;O=A", "?C=D;O=A", "?C=M;O=A" };
-
-        assertNotContainingAvoided( links, avoided );
-    }
-
-    /**
-     * Test of an html which is improperly formatted, contains full host-specific paths to the resources and uses non-normalized base URI
-     * @throws Exception
-     */
-    public void testParseJettyWithNonNormalizedBaseURI()
-        throws Exception
-    {
-        List<String> links = parseLinks( "http://www.ibiblio.org/maven2/org/apache/maven/wagon//",
-                                             "jetty-wagon.html" );
-
-        String[] expected = new String[] {
-            "wagon-1.0-alpha-2.pom",
-            "wagon-1.0-alpha-2.pom.asc",
-            "wagon-1.0-alpha-2.pom.md5",
-            "wagon-1.0-alpha-2.pom.sha1",
-            "wagon-1.0-alpha-3-20050413.021234-4.pom",
-            "wagon-1.0-alpha-3-20050413.021234-4.pom.md5",
-            "wagon-1.0-alpha-3-20050413.021234-4.pom.sha1",
-            "wagon-1.0-alpha-3-20050419.043745-5.pom",
-            "wagon-1.0-alpha-3-20050419.043745-5.pom.md5",
-            "wagon-1.0-alpha-3-20050419.043745-5.pom.sha1",
-            "wagon-1.0-alpha-3-20050419.044035-6.pom",
-            "wagon-1.0-alpha-3-20050419.044035-6.pom.md5",
-            "wagon-1.0-alpha-3-20050419.044035-6.pom.sha1",
-            "wagon-1.0-alpha-3-20050421.162738-7.pom",
-            "wagon-1.0-alpha-3-20050421.162738-7.pom.md5",
-            "wagon-1.0-alpha-3-20050421.162738-7.pom.sha1",
-            "wagon-1.0-alpha-3-20050422.075233-8.pom",
-            "wagon-1.0-alpha-3-20050422.075233-8.pom.md5",
-            "wagon-1.0-alpha-3-20050422.075233-8.pom.sha1",
-            "wagon-1.0-alpha-3-20050429.051847-9.pom",
-            "wagon-1.0-alpha-3-20050429.051847-9.pom.md5",
-            "wagon-1.0-alpha-3-20050429.051847-9.pom.sha1",
-            "wagon-file/",
-            "wagon-ftp/",
-            "wagon-http-lightweight/",
-            "wagon-http/",
-            "wagon-lightweight-http/",
-            "wagon-provider-api/",
-            "wagon-provider-test/",
-            "wagon-provider/",
-            "wagon-providers-1.0-alpha-2.pom",
-            "wagon-providers-1.0-alpha-2.pom.asc",
-            "wagon-providers-1.0-alpha-2.pom.md5",
-            "wagon-providers-1.0-alpha-2.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050407.202848-1.pom",
-            "wagon-providers-1.0-alpha-3-20050407.202848-1.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050407.202848-1.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050419.044035-2.pom",
-            "wagon-providers-1.0-alpha-3-20050419.044035-2.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050419.044035-2.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050421.162738-3.pom",
-            "wagon-providers-1.0-alpha-3-20050421.162738-3.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050421.162738-3.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050422.075233-4.pom",
-            "wagon-providers-1.0-alpha-3-20050422.075233-4.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050422.075233-4.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050429.051847-5.pom",
-            "wagon-providers-1.0-alpha-3-20050429.051847-5.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050429.051847-5.pom.sha1",
-            "wagon-providers/",
-            "wagon-scm/",
-            "wagon-ssh-external/",
-            "wagon-ssh/",
-            "wagon-webdav/",
-            "wagon/" };
-
-        assertContainsExpected( links, expected );
-
-        String[] avoided = new String[] { "/org/", "?C=S;O=A", "?C=D;O=A", "?C=M;O=A" };
-
-        assertNotContainingAvoided( links, avoided );
-    }
-
-    /**
-     * Using repository.codehaus.org output as an example.
-     * This is an example of an older RHEL installation of apache httpd with old fancy indexing output
-     * This example tests how to detect directories properly.
-     *
-     * @throws TransferFailedException
-     */
-    public void testParseMevenIde()
-        throws TransferFailedException
-    {
-        List<String> links = parseLinks( "http://repository.codehaus.org/org/codehaus/mevenide/", "mevenide.html" );
-
-        String[] expected = new String[] {
-            "apisupport/",
-            "autoupdate/",
-            "continuum-rpc/",
-            "continuum/",
-            "debugger-bridge/",
-            "deployment-bridge/",
-            "feature/",
-            "grammar/",
-            "ide-mojos/",
-            "indexer/",
-            "j2ee/",
-            "junit/",
-            "maven-metadata.xml",
-            "maven-metadata.xml.md5",
-            "maven-metadata.xml.sha1",
-            "mevenide2-parent/",
-            "nb-mvn-embedder/",
-            "nb-project/",
-            "nb-repo-browser/",
-            "netbeans-debugger-plugin/",
-            "netbeans-deploy-plugin/",
-            "netbeans-libs/",
-            "netbeans-nbmreload-plugin/",
-            "netbeans-repository/",
-            "netbeans-run-plugin/",
-            "netbeans/",
-            "persistence/",
-            "plugin-bridges/",
-            "plugins/",
-            "reload-nbm-bridge/",
-            "run-jar-bridge/" };
-
-        assertContainsExpected( links, expected );
-
-        String[] avoided = new String[] { "/org/codehaus/", "?C=S;O=A", "?C=D;O=A", "?C=M;O=A" };
-
-        assertNotContainingAvoided( links, avoided );
-    }
-
-    public void testParseMirror()
-        throws Exception
-    {
-        List<String> links = parseLinks( "http://www.ibiblio.org/maven2/org/apache/maven/wagon/",
-                                             "mirror-wagon.html" );
-
-        String[] expected = new String[] {
-            "wagon-1.0-alpha-2.pom",
-            "wagon-1.0-alpha-2.pom.asc",
-            "wagon-1.0-alpha-2.pom.md5",
-            "wagon-1.0-alpha-2.pom.sha1",
-            "wagon-1.0-alpha-3-20050413.021234-4.pom",
-            "wagon-1.0-alpha-3-20050413.021234-4.pom.md5",
-            "wagon-1.0-alpha-3-20050413.021234-4.pom.sha1",
-            "wagon-1.0-alpha-3-20050419.043745-5.pom",
-            "wagon-1.0-alpha-3-20050419.043745-5.pom.md5",
-            "wagon-1.0-alpha-3-20050419.043745-5.pom.sha1",
-            "wagon-1.0-alpha-3-20050419.044035-6.pom",
-            "wagon-1.0-alpha-3-20050419.044035-6.pom.md5",
-            "wagon-1.0-alpha-3-20050419.044035-6.pom.sha1",
-            "wagon-1.0-alpha-3-20050421.162738-7.pom",
-            "wagon-1.0-alpha-3-20050421.162738-7.pom.md5",
-            "wagon-1.0-alpha-3-20050421.162738-7.pom.sha1",
-            "wagon-1.0-alpha-3-20050422.075233-8.pom",
-            "wagon-1.0-alpha-3-20050422.075233-8.pom.md5",
-            "wagon-1.0-alpha-3-20050422.075233-8.pom.sha1",
-            "wagon-1.0-alpha-3-20050429.051847-9.pom",
-            "wagon-1.0-alpha-3-20050429.051847-9.pom.md5",
-            "wagon-1.0-alpha-3-20050429.051847-9.pom.sha1",
-            "wagon-file/",
-            "wagon-ftp/",
-            "wagon-http-lightweight/",
-            "wagon-http/",
-            "wagon-lightweight-http/",
-            "wagon-provider-api/",
-            "wagon-provider-test/",
-            "wagon-provider/",
-            "wagon-providers-1.0-alpha-2.pom",
-            "wagon-providers-1.0-alpha-2.pom.asc",
-            "wagon-providers-1.0-alpha-2.pom.md5",
-            "wagon-providers-1.0-alpha-2.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050407.202848-1.pom",
-            "wagon-providers-1.0-alpha-3-20050407.202848-1.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050407.202848-1.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050419.044035-2.pom",
-            "wagon-providers-1.0-alpha-3-20050419.044035-2.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050419.044035-2.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050421.162738-3.pom",
-            "wagon-providers-1.0-alpha-3-20050421.162738-3.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050421.162738-3.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050422.075233-4.pom",
-            "wagon-providers-1.0-alpha-3-20050422.075233-4.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050422.075233-4.pom.sha1",
-            "wagon-providers-1.0-alpha-3-20050429.051847-5.pom",
-            "wagon-providers-1.0-alpha-3-20050429.051847-5.pom.md5",
-            "wagon-providers-1.0-alpha-3-20050429.051847-5.pom.sha1",
-            "wagon-providers/",
-            "wagon-scm/",
-            "wagon-ssh-external/",
-            "wagon-ssh/",
-            "wagon-webdav/",
-            "wagon/" };
-
-        assertContainsExpected( links, expected );
-
-        String[] avoided = new String[] {
-            "/org/codehaus/",
-            "?C=S;O=A",
-            "?C=D;O=A",
-            "?C=M;O=A",
-            "mailto:mirror.admin at mirror.com" };
-
-        assertNotContainingAvoided( links, avoided );
-    }
-
-    /**
-     * Example of output from repo1.maven.org
-     * This example is of nekohtml specifically.
-     *
-     * @throws TransferFailedException
-     */
-    public void testParseNekoHtml()
-        throws TransferFailedException
-    {
-        List<String> links = parseLinks( "http://repo1.maven.org//maven2/nekohtml/nekohtml/1.9.6/", "nekohtml.html" );
-
-        String[] expected = new String[] {
-            "nekohtml-1.9.6-javadoc.jar",
-            "nekohtml-1.9.6-javadoc.jar.md5",
-            "nekohtml-1.9.6-javadoc.jar.sha1",
-            "nekohtml-1.9.6-sources.jar",
-            "nekohtml-1.9.6-sources.jar.md5",
-            "nekohtml-1.9.6-sources.jar.sha1",
-            "nekohtml-1.9.6.jar",
-            "nekohtml-1.9.6.jar.md5",
-            "nekohtml-1.9.6.jar.sha1",
-            "nekohtml-1.9.6.pom",
-            "nekohtml-1.9.6.pom.md5",
-            "nekohtml-1.9.6.pom.sha1" };
-
-        assertContainsExpected( links, expected );
-
-        String[] avoided = new String[] { "/maven2/nekohtml/nekohtml/", "?C=S;O=A", "?C=D;O=A", "?C=M;O=A" };
-
-        assertNotContainingAvoided( links, avoided );
-    }
-
-    /**
-     * Example of detecting directories on repo1.maven.org
-     *
-     * @throws TransferFailedException
-     */
-    public void testParseNetSourceforge()
-        throws TransferFailedException
-    {
-        List<String> links = parseLinks( "http://repo1.maven.org/maven2/net/sf/", "net_sf.html" );
-
-        String[] expected = new String[] {
-            "a2j/",
-            "aislib/",
-            "alchim/",
-            "antenna/",
-            "apt-jelly/",
-            "beanlib/",
-            "bluecove/",
-            "buildbox/",
-            "click/",
-            "clirr/",
-            "datavision/",
-            "dozer/",
-            "dtddoc/",
-            "dynpageplus/",
-            "ehcache/",
-            "ezmorph/",
-            "falcon/",
-            "grester/",
-            "gwt-widget/",
-            "hermesftp/",
-            "hibernate/",
-            "jcharts/",
-            "jdatabaseimport/",
-            "jeceira/",
-            "jfcunit/",
-            "jfig/",
-            "jguard/",
-            "jipcam/",
-            "jlynx/",
-            "jour/",
-            "jpf/",
-            "json-lib/",
-            "jsptest/",
-            "jsr107cache/",
-            "jt400/",
-            "jxls/",
-            "kxml/",
-            "ldaptemplate/",
-            "locale4j/",
-            "mapasuta/",
-            "maven-har/",
-            "maven-sar/",
-            "opencsv/",
-            "oval/",
-            "proguard/",
-            "qdwizard/",
-            "resultsetmapper/",
-            "retrotranslator/",
-            "saxon/",
-            "shadesdb/",
-            "smc/",
-            "speculoos/",
-            "springlayout/",
-            "stat-scm/",
-            "statsvn/",
-            "stax/",
-            "struts/",
-            "tacos/",
-            "testextensions/",
-            "webdav-servlet/" };
-
-        assertContainsExpected( links, expected );
-
-        String[] avoided = new String[] { "/maven2/net/", "?C=S;O=A", "?C=D;O=A", "?C=M;O=A" };
-
-        assertNotContainingAvoided( links, avoided );
-    }
-
-    /**
-     * Another larger example of the directory link detection on repository.codehaus.org
-     *
-     * @throws TransferFailedException
-     */
-    public void testParseOrgCodehaus()
-        throws TransferFailedException
-    {
-        List<String> links = parseLinks( "http://repository.codehaus.org/org/codehaus", "org.codehaus.html" );
-
-        String[] expected = new String[] {
-            "agilifier/",
-            "benji/",
-            "bruce/",
-            "btm/",
-            "cargo/",
-            "castor-spring/",
-            "castor/",
-            "cozmos/",
-            "dataforge/",
-            "dimple/",
-            "droolsdotnet/",
-            "enunciate/",
-            "fabric3/",
-            "gant/",
-            "grails-plugins/",
-            "groovy/",
-            "gsoc/",
-            "guessencoding/",
-            "gumtree/",
-            "gwt-openlayers/",
-            "haus/",
-            "izpack/",
-            "javasim/",
-            "jedi/",
-            "jequel/",
-            "jet/",
-            "jettison/",
-            "jfdi/",
-            "jikesrvm/",
-            "jra/",
-            "jremoting/",
-            "jtestme/",
-            "jtestr/",
-            "labs-ng/",
-            "logicabyss/",
-            "marionette/",
-            "mevenide/",
-            "modello/",
-            "mojo/",
-            "mvel/",
-            "mvflex/",
-            "native-mojo/",
-            "openim/",
-            "plexus/",
-            "polymap/",
-            "prometheus/",
-            "prophit/",
-            "quaere/",
-            "redback/",
-            "rulessandpit/",
-            "rvm/",
-            "savana/",
-            "scala-ide/",
-            "senro/",
-            "sonar/",
-            "staxmate/",
-            "stomp/",
-            "svn4j/",
-            "swiby/",
-            "swizzle/",
-            "sxc/",
-            "testdox/",
-            "wadi/",
-            "waffle/",
-            "woodstox/",
-            "xdoclet/",
-            "xfire/",
-            "xharness/",
-            "xsite/",
-            "xstream/",
-            "xwire/" };
-
-        assertContainsExpected( links, expected );
-
-        String[] avoided = new String[] { "/org/", "?C=S;O=A", "?C=D;O=A", "?C=M;O=A" };
-
-        assertNotContainingAvoided( links, avoided );
-    }
-
-    /**
-     * Test the output found from apache httpd with fancy indexing and dav module.
-     * Using people.apache.org output as source material.
-     *
-     * @throws TransferFailedException
-     */
-    public void testParsePeopleApacheOrg()
-        throws TransferFailedException
-    {
-        List<String> links = parseLinks(
-                                             "http://people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/maven/archiva/archiva-plexus-runtime/1.0.1/",
-                                             "org.apache.maven.html" );
-
-        String[] expected = new String[] {
-            "archiva-plexus-runtime-1.0.1-bin.tar.gz",
-            "archiva-plexus-runtime-1.0.1-bin.tar.gz.asc",
-            "archiva-plexus-runtime-1.0.1-bin.tar.gz.asc.md5",
-            "archiva-plexus-runtime-1.0.1-bin.tar.gz.asc.sha1",
-            "archiva-plexus-runtime-1.0.1-bin.tar.gz.md5",
-            "archiva-plexus-runtime-1.0.1-bin.tar.gz.sha1",
-            "archiva-plexus-runtime-1.0.1-bin.zip",
-            "archiva-plexus-runtime-1.0.1-bin.zip.asc",
-            "archiva-plexus-runtime-1.0.1-bin.zip.asc.md5",
-            "archiva-plexus-runtime-1.0.1-bin.zip.asc.sha1",
-            "archiva-plexus-runtime-1.0.1-bin.zip.md5",
-            "archiva-plexus-runtime-1.0.1-bin.zip.sha1",
-            "archiva-plexus-runtime-1.0.1-sources.jar",
-            "archiva-plexus-runtime-1.0.1-sources.jar.asc",
-            "archiva-plexus-runtime-1.0.1-sources.jar.asc.md5",
-            "archiva-plexus-runtime-1.0.1-sources.jar.asc.sha1",
-            "archiva-plexus-runtime-1.0.1-sources.jar.md5",
-            "archiva-plexus-runtime-1.0.1-sources.jar.sha1",
-            "archiva-plexus-runtime-1.0.1.jar",
-            "archiva-plexus-runtime-1.0.1.jar.asc",
-            "archiva-plexus-runtime-1.0.1.jar.asc.md5",
-            "archiva-plexus-runtime-1.0.1.jar.asc.sha1",
-            "archiva-plexus-runtime-1.0.1.jar.md5",
-            "archiva-plexus-runtime-1.0.1.jar.sha1",
-            "archiva-plexus-runtime-1.0.1.pom",
-            "archiva-plexus-runtime-1.0.1.pom.asc",
-            "archiva-plexus-runtime-1.0.1.pom.asc.md5",
-            "archiva-plexus-runtime-1.0.1.pom.asc.sha1",
-            "archiva-plexus-runtime-1.0.1.pom.md5",
-            "archiva-plexus-runtime-1.0.1.pom.sha1",
-            "readme artifacts.txt"};
-
-        assertContainsExpected( links, expected );
-
-        String[] avoided = new String[] {
-            "/repo/m2-ibiblio-rsync-repository/org/apache/maven/archiva/archiva-plexus-runtime/",
-            "?C=S;O=A",
-            "?C=D;O=A",
-            "?C=M;O=A" };
-
-        assertNotContainingAvoided( links, avoided );
-    }
-}
diff --git a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/commons-lang.html b/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/commons-lang.html
deleted file mode 100644
index 66659ef..0000000
--- a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/commons-lang.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-<head>
-<title>Collection: /commons-lang/commons-lang/2.3/</title>
-</head>
-<body>
-<h2>Collection: /commons-lang/commons-lang/2.3/</h2>
-<ul>
-<li><a href="../">commons-lang/</a> <i><small>(Parent)</small></i></li>
-</ul>
-<ul>
-<li><a href="./commons-lang-2.3-javadoc.jar">commons-lang-2.3-javadoc.jar</li>
-<li><a href="./commons-lang-2.3-javadoc.jar.asc">commons-lang-2.3-javadoc.jar.asc</li>
-<li><a href="./commons-lang-2.3-javadoc.jar.md5">commons-lang-2.3-javadoc.jar.md5</li>
-<li><a href="./commons-lang-2.3-javadoc.jar.sha1">commons-lang-2.3-javadoc.jar.sha1</li>
-<li><a href="./commons-lang-2.3-sources.jar">commons-lang-2.3-sources.jar</li>
-<li><a href="./commons-lang-2.3-sources.jar.asc">commons-lang-2.3-sources.jar.asc</li>
-<li><a href="./commons-lang-2.3-sources.jar.md5">commons-lang-2.3-sources.jar.md5</li>
-<li><a href="./commons-lang-2.3-sources.jar.sha1">commons-lang-2.3-sources.jar.sha1</li>
-<li><a href="./commons-lang-2.3.jar">commons-lang-2.3.jar</li>
-<li><a href="./commons-lang-2.3.jar.asc">commons-lang-2.3.jar.asc</li>
-<li><a href="./commons-lang-2.3.jar.md5">commons-lang-2.3.jar.md5</li>
-<li><a href="./commons-lang-2.3.jar.sha1">commons-lang-2.3.jar.sha1</li>
-<li><a href="./commons-lang-2.3.pom">commons-lang-2.3.pom</li>
-<li><a href="./commons-lang-2.3.pom.md5">commons-lang-2.3.pom.md5</li>
-<li><a href="./commons-lang-2.3.pom.sha1">commons-lang-2.3.pom.sha1</li>
-<li><a href="./maven-metadata.xml">maven-metadata.xml</li>
-<li><a href="./maven-metadata.xml.md5">maven-metadata.xml.md5</li>
-<li><a href="./maven-metadata.xml.sha1">maven-metadata.xml.sha1</li>
-</ul>
-</body>
-</html>
diff --git a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/ibiblio-wagon.html b/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/ibiblio-wagon.html
deleted file mode 100644
index 618bfa1..0000000
--- a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/ibiblio-wagon.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
- <HEAD>
-  <TITLE>Index of /maven2/org/apache/maven/wagon</TITLE>
- </HEAD>
- <BODY>
-<H1>Index of /maven2/org/apache/maven/wagon</H1>
-<PRE><IMG SRC="/icons/blank.gif" ALT="     "> <A HREF="?N=D">Name</A>                                                   <A HREF="?M=A">Last modified</A>       <A HREF="?S=A">Size</A>  <A HREF="?D=A">Description</A>
-
-<HR>
-<IMG SRC="/icons/back.gif" ALT="[DIR]"> <A HREF="/maven2/org/apache/maven/">Parent Directory</A>                                       09-May-2006 10:57      -  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-2.pom">wagon-1.0-alpha-2.pom</A>                                  07-May-2006 18:31     3k  
-<IMG SRC="/icons/text.gif" ALT="[TXT]"> <A HREF="wagon-1.0-alpha-2.pom.asc">wagon-1.0-alpha-2.pom.asc</A>                              07-May-2006 18:31     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-2.pom.md5">wagon-1.0-alpha-2.pom.md5</A>                              07-May-2006 18:31     1k  
-
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-2.pom.sha1">wagon-1.0-alpha-2.pom.sha1</A>                             07-May-2006 18:31     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050413.021234-4.pom">wagon-1.0-alpha-3-20050413.021234-4.pom</A>                08-Nov-2005 17:25     3k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050413.021234-4.pom.md5">wagon-1.0-alpha-3-20050413.021234-4.pom.md5</A>            10-May-2006 00:11     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050413.021234-4.pom.sha1">wagon-1.0-alpha-3-20050413.021234-4.pom.sha1</A>           10-May-2006 00:11     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050419.043745-5.pom">wagon-1.0-alpha-3-20050419.043745-5.pom</A>                08-Nov-2005 17:25     3k  
-
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050419.043745-5.pom.md5">wagon-1.0-alpha-3-20050419.043745-5.pom.md5</A>            10-May-2006 00:11     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050419.043745-5.pom.sha1">wagon-1.0-alpha-3-20050419.043745-5.pom.sha1</A>           10-May-2006 00:11     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050419.044035-6.pom">wagon-1.0-alpha-3-20050419.044035-6.pom</A>                08-Nov-2005 17:25     3k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050419.044035-6.pom.md5">wagon-1.0-alpha-3-20050419.044035-6.pom.md5</A>            10-May-2006 00:11     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050419.044035-6.pom.sha1">wagon-1.0-alpha-3-20050419.044035-6.pom.sha1</A>           10-May-2006 00:11     1k  
-
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050421.162738-7.pom">wagon-1.0-alpha-3-20050421.162738-7.pom</A>                08-Nov-2005 17:25     3k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050421.162738-7.pom.md5">wagon-1.0-alpha-3-20050421.162738-7.pom.md5</A>            10-May-2006 00:11     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050421.162738-7.pom.sha1">wagon-1.0-alpha-3-20050421.162738-7.pom.sha1</A>           10-May-2006 00:11     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050422.075233-8.pom">wagon-1.0-alpha-3-20050422.075233-8.pom</A>                08-Nov-2005 17:25     3k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050422.075233-8.pom.md5">wagon-1.0-alpha-3-20050422.075233-8.pom.md5</A>            10-May-2006 00:11     1k  
-
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050422.075233-8.pom.sha1">wagon-1.0-alpha-3-20050422.075233-8.pom.sha1</A>           10-May-2006 00:11     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050429.051847-9.pom">wagon-1.0-alpha-3-20050429.051847-9.pom</A>                08-Nov-2005 17:25     3k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050429.051847-9.pom.md5">wagon-1.0-alpha-3-20050429.051847-9.pom.md5</A>            10-May-2006 00:11     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-1.0-alpha-3-20050429.051847-9.pom.sha1">wagon-1.0-alpha-3-20050429.051847-9.pom.sha1</A>           10-May-2006 00:11     1k  
-<IMG SRC="/icons/folder.gif" ALT="[DIR]"> <A HREF="wagon-file/">wagon-file/</A>                                            19-Jun-2006 08:27      -  
-
-<IMG SRC="/icons/folder.gif" ALT="[DIR]"> <A HREF="wagon-ftp/">wagon-ftp/</A>                                             19-Jun-2006 08:28      -  
-<IMG SRC="/icons/folder.gif" ALT="[DIR]"> <A HREF="wagon-http-lightweight/">wagon-http-lightweight/</A>                                19-Jun-2006 08:30      -  
-<IMG SRC="/icons/folder.gif" ALT="[DIR]"> <A HREF="wagon-http/">wagon-http/</A>                                            19-Jun-2006 08:32      -  
-<IMG SRC="/icons/folder.gif" ALT="[DIR]"> <A HREF="wagon-lightweight-http/">wagon-lightweight-http/</A>                                07-May-2006 18:31      -  
-<IMG SRC="/icons/folder.gif" ALT="[DIR]"> <A HREF="wagon-provider-api/">wagon-provider-api/</A>                                    19-Jun-2006 08:20      -  
-
-<IMG SRC="/icons/folder.gif" ALT="[DIR]"> <A HREF="wagon-provider-test/">wagon-provider-test/</A>                                   19-Jun-2006 08:25      -  
-<IMG SRC="/icons/folder.gif" ALT="[DIR]"> <A HREF="wagon-provider/">wagon-provider/</A>                                        13-May-2006 04:11      -  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-2.pom">wagon-providers-1.0-alpha-2.pom</A>                        07-May-2006 18:31     1k  
-<IMG SRC="/icons/text.gif" ALT="[TXT]"> <A HREF="wagon-providers-1.0-alpha-2.pom.asc">wagon-providers-1.0-alpha-2.pom.asc</A>                    07-May-2006 18:31     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-2.pom.md5">wagon-providers-1.0-alpha-2.pom.md5</A>                    07-May-2006 18:31     1k  
-
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-2.pom.sha1">wagon-providers-1.0-alpha-2.pom.sha1</A>                   07-May-2006 18:31     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-3-20050407.202848-1.pom">wagon-providers-1.0-alpha-3-20050407.202848-1.pom</A>      08-Nov-2005 17:25     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-3-20050407.202848-1.pom.md5">wagon-providers-1.0-alpha-3-20050407.202848-1.pom.md5</A>  10-May-2006 00:11     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-3-20050407.202848-1.pom.sha1">wagon-providers-1.0-alpha-3-20050407.202848-1.pom.sha1</A> 10-May-2006 00:11     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-3-20050419.044035-2.pom">wagon-providers-1.0-alpha-3-20050419.044035-2.pom</A>      08-Nov-2005 17:25     1k  
-
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-3-20050419.044035-2.pom.md5">wagon-providers-1.0-alpha-3-20050419.044035-2.pom.md5</A>  10-May-2006 00:11     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-3-20050419.044035-2.pom.sha1">wagon-providers-1.0-alpha-3-20050419.044035-2.pom.sha1</A> 10-May-2006 00:11     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-3-20050421.162738-3.pom">wagon-providers-1.0-alpha-3-20050421.162738-3.pom</A>      08-Nov-2005 17:25     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-3-20050421.162738-3.pom.md5">wagon-providers-1.0-alpha-3-20050421.162738-3.pom.md5</A>  10-May-2006 00:11     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-3-20050421.162738-3.pom.sha1">wagon-providers-1.0-alpha-3-20050421.162738-3.pom.sha1</A> 10-May-2006 00:11     1k  
-
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-3-20050422.075233-4.pom">wagon-providers-1.0-alpha-3-20050422.075233-4.pom</A>      08-Nov-2005 17:25     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-3-20050422.075233-4.pom.md5">wagon-providers-1.0-alpha-3-20050422.075233-4.pom.md5</A>  10-May-2006 00:11     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-3-20050422.075233-4.pom.sha1">wagon-providers-1.0-alpha-3-20050422.075233-4.pom.sha1</A> 10-May-2006 00:11     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-3-20050429.051847-5.pom">wagon-providers-1.0-alpha-3-20050429.051847-5.pom</A>      08-Nov-2005 17:25     1k  
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-3-20050429.051847-5.pom.md5">wagon-providers-1.0-alpha-3-20050429.051847-5.pom.md5</A>  10-May-2006 00:11     1k  
-
-<IMG SRC="/icons/unknown.gif" ALT="[   ]"> <A HREF="wagon-providers-1.0-alpha-3-20050429.051847-5.pom.sha1">wagon-providers-1.0-alpha-3-20050429.051847-5.pom.sha1</A> 10-May-2006 00:11     1k  
-<IMG SRC="/icons/folder.gif" ALT="[DIR]"> <A HREF="wagon-providers/">wagon-providers/</A>                                       19-Jun-2006 08:26      -  
-<IMG SRC="/icons/folder.gif" ALT="[DIR]"> <A HREF="wagon-scm/">wagon-scm/</A>                                             07-May-2006 19:40      -  
-<IMG SRC="/icons/folder.gif" ALT="[DIR]"> <A HREF="wagon-ssh-external/">wagon-ssh-external/</A>                                    19-Jun-2006 08:34      -  
-<IMG SRC="/icons/folder.gif" ALT="[DIR]"> <A HREF="wagon-ssh/">wagon-ssh/</A>                                             19-Jun-2006 08:35      -  
-
-<IMG SRC="/icons/folder.gif" ALT="[DIR]"> <A HREF="wagon-webdav/">wagon-webdav/</A>                                          19-Jun-2006 08:38      -  
-<IMG SRC="/icons/folder.gif" ALT="[DIR]"> <A HREF="wagon/">wagon/</A>                                                 19-Jun-2006 08:17      -  
-</PRE><HR>
-<ADDRESS>Apache/1.3.33 Server at www.ibiblio.org Port 80</ADDRESS>
-</BODY></HTML>
diff --git a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/jetty-wagon.html b/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/jetty-wagon.html
deleted file mode 100644
index 45187e4..0000000
--- a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/jetty-wagon.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<HTML><HEAD><TITLE>Directory: /maven2/</TITLE></HEAD><BODY>
-<H1>Directory: /maven2/</H1><TABLE BORDER=0><TR><TD><A HREF=/maven2/org/apache/maven/wagon/../>Parent Directory</A></TD><TD></TD><TD></TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-2.pom">wagon-1.0-alpha-2.pom </TD><TD ALIGN=right>3k </TD><TD>07-May-2006 18:31</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-2.pom.asc">wagon-1.0-alpha-2.pom.asc </TD><TD ALIGN=right>1k </TD><TD>07-May-2006 18:31</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-2.pom.md5">wagon-1.0-alpha-2.pom.md5 </TD><TD ALIGN=right>1k </TD><TD>07-May-2006 18:31</TD></TR>
-
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-2.pom.sha1">wagon-1.0-alpha-2.pom.sha1 </TD><TD ALIGN=right>1k </TD><TD>07-May-2006 18:31</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050413.021234-4.pom">wagon-1.0-alpha-3-20050413.021234-4.pom </TD><TD ALIGN=right>3k </TD><TD>08-Nov-2005 17:25</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050413.021234-4.pom.md5">wagon-1.0-alpha-3-20050413.021234-4.pom.md5 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050413.021234-4.pom.sha1">wagon-1.0-alpha-3-20050413.021234-4.pom.sha1 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050419.043745-5.pom">wagon-1.0-alpha-3-20050419.043745-5.pom </TD><TD ALIGN=right>3k </TD><TD>08-Nov-2005 17:25</TD></TR>
-
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050419.043745-5.pom.md5">wagon-1.0-alpha-3-20050419.043745-5.pom.md5 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050419.043745-5.pom.sha1">wagon-1.0-alpha-3-20050419.043745-5.pom.sha1 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050419.044035-6.pom">wagon-1.0-alpha-3-20050419.044035-6.pom </TD><TD ALIGN=right>3k </TD><TD>08-Nov-2005 17:25</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050419.044035-6.pom.md5">wagon-1.0-alpha-3-20050419.044035-6.pom.md5 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050419.044035-6.pom.sha1">wagon-1.0-alpha-3-20050419.044035-6.pom.sha1 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050421.162738-7.pom">wagon-1.0-alpha-3-20050421.162738-7.pom </TD><TD ALIGN=right>3k </TD><TD>08-Nov-2005 17:25</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050421.162738-7.pom.md5">wagon-1.0-alpha-3-20050421.162738-7.pom.md5 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050421.162738-7.pom.sha1">wagon-1.0-alpha-3-20050421.162738-7.pom.sha1 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050422.075233-8.pom">wagon-1.0-alpha-3-20050422.075233-8.pom </TD><TD ALIGN=right>3k </TD><TD>08-Nov-2005 17:25</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050422.075233-8.pom.md5">wagon-1.0-alpha-3-20050422.075233-8.pom.md5 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050422.075233-8.pom.sha1">wagon-1.0-alpha-3-20050422.075233-8.pom.sha1 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050429.051847-9.pom">wagon-1.0-alpha-3-20050429.051847-9.pom </TD><TD ALIGN=right>3k </TD><TD>08-Nov-2005 17:25</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050429.051847-9.pom.md5">wagon-1.0-alpha-3-20050429.051847-9.pom.md5 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050429.051847-9.pom.sha1">wagon-1.0-alpha-3-20050429.051847-9.pom.sha1 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-file/">wagon-file/ </TD><TD ALIGN=right>- </TD><TD>19-Jun-2006 08:27</TD></TR>
-
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-ftp/">wagon-ftp/ </TD><TD ALIGN=right>- </TD><TD>19-Jun-2006 08:28</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-http-lightweight/">wagon-http-lightweight/ </TD><TD ALIGN=right>- </TD><TD>19-Jun-2006 08:30</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-http/">wagon-http/ </TD><TD ALIGN=right>- </TD><TD>19-Jun-2006 08:32</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-lightweight-http/">wagon-lightweight-http/ </TD><TD ALIGN=right>- </TD><TD>07-May-2006 18:31</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-provider-api/">wagon-provider-api/ </TD><TD ALIGN=right>- </TD><TD>19-Jun-2006 08:20</TD></TR>
-
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-provider-test/">wagon-provider-test/ </TD><TD ALIGN=right>- </TD><TD>19-Jun-2006 08:25</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-provider/">wagon-provider/ </TD><TD ALIGN=right>- </TD><TD>13-May-2006 04:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-2.pom">wagon-providers-1.0-alpha-2.pom </TD><TD ALIGN=right>1k </TD><TD>07-May-2006 18:31</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-2.pom.asc">wagon-providers-1.0-alpha-2.pom.asc </TD><TD ALIGN=right>1k </TD><TD>07-May-2006 18:31</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-2.pom.md5">wagon-providers-1.0-alpha-2.pom.md5 </TD><TD ALIGN=right>1k </TD><TD>07-May-2006 18:31</TD></TR>
-
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-2.pom.sha1">wagon-providers-1.0-alpha-2.pom.sha1 </TD><TD ALIGN=right>1k </TD><TD>07-May-2006 18:31</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-3-20050407.202848-1.pom">wagon-providers-1.0-alpha-3-20050407.202848-1.pom </TD><TD ALIGN=right>1k </TD><TD>08-Nov-2005 17:25</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-3-20050407.202848-1.pom.md5">wagon-providers-1.0-alpha-3-20050407.202848-1.pom.md5 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-3-20050407.202848-1.pom.sha1">wagon-providers-1.0-alpha-3-20050407.202848-1.pom.sha1 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-3-20050419.044035-2.pom">wagon-providers-1.0-alpha-3-20050419.044035-2.pom </TD><TD ALIGN=right>1k </TD><TD>08-Nov-2005 17:25</TD></TR>
-
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-3-20050419.044035-2.pom.md5">wagon-providers-1.0-alpha-3-20050419.044035-2.pom.md5 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-3-20050419.044035-2.pom.sha1">wagon-providers-1.0-alpha-3-20050419.044035-2.pom.sha1 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-3-20050421.162738-3.pom">wagon-providers-1.0-alpha-3-20050421.162738-3.pom </TD><TD ALIGN=right>1k </TD><TD>08-Nov-2005 17:25</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-3-20050421.162738-3.pom.md5">wagon-providers-1.0-alpha-3-20050421.162738-3.pom.md5 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-3-20050421.162738-3.pom.sha1">wagon-providers-1.0-alpha-3-20050421.162738-3.pom.sha1 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-3-20050422.075233-4.pom">wagon-providers-1.0-alpha-3-20050422.075233-4.pom </TD><TD ALIGN=right>1k </TD><TD>08-Nov-2005 17:25</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-3-20050422.075233-4.pom.md5">wagon-providers-1.0-alpha-3-20050422.075233-4.pom.md5 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-3-20050422.075233-4.pom.sha1">wagon-providers-1.0-alpha-3-20050422.075233-4.pom.sha1 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-3-20050429.051847-5.pom">wagon-providers-1.0-alpha-3-20050429.051847-5.pom </TD><TD ALIGN=right>1k </TD><TD>08-Nov-2005 17:25</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-3-20050429.051847-5.pom.md5">wagon-providers-1.0-alpha-3-20050429.051847-5.pom.md5 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers-1.0-alpha-3-20050429.051847-5.pom.sha1">wagon-providers-1.0-alpha-3-20050429.051847-5.pom.sha1 </TD><TD ALIGN=right>1k </TD><TD>10-May-2006 00:11</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-providers/">wagon-providers/ </TD><TD ALIGN=right>- </TD><TD>19-Jun-2006 08:26</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-scm/">wagon-scm/ </TD><TD ALIGN=right>- </TD><TD>07-May-2006 19:40</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-ssh-external/">wagon-ssh-external/ </TD><TD ALIGN=right>- </TD><TD>19-Jun-2006 08:34</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-ssh/">wagon-ssh/ </TD><TD ALIGN=right>- </TD><TD>19-Jun-2006 08:35</TD></TR>
-
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon-webdav/">wagon-webdav/ </TD><TD ALIGN=right>- </TD><TD>19-Jun-2006 08:38</TD></TR>
-<TR><TD><A HREF="/maven2/org/apache/maven/wagon/wagon/">wagon/ </TD><TD ALIGN=right>- </TD><TD>19-Jun-2006 08:17</TD></TR>
-
-
-</TABLE>
diff --git a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/mevenide.html b/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/mevenide.html
deleted file mode 100644
index 9d09cfb..0000000
--- a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/mevenide.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
- <head>
-  <title>Index of /org/codehaus/mevenide</title>
- </head>
- <body>
-<h1>Index of /org/codehaus/mevenide</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/codehaus/">Parent Directory</a>                                -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="apisupport/">apisupport/</a>                22-Jan-2008 03:01    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="autoupdate/">autoupdate/</a>                22-Jan-2008 02:57    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="continuum-rpc/">continuum-rpc/</a>             09-Aug-2006 12:41    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="continuum/">continuum/</a>                 09-Aug-2006 12:41    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="debugger-bridge/">debugger-bridge/</a>           22-Jan-2008 02:53    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="deployment-bridge/">deployment-bridge/</a>         22-Jan-2008 02:55    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="feature/">feature/</a>                   22-Jan-2008 03:01    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="grammar/">grammar/</a>                   22-Jan-2008 02:55    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="ide-mojos/">ide-mojos/</a>                 31-Aug-2007 06:04    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="indexer/">indexer/</a>                   22-Jan-2008 02:54    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="j2ee/">j2ee/</a>                      22-Jan-2008 02:56    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="junit/">junit/</a>                     22-Jan-2008 03:02    -   
-<img src="/icons/text.gif" alt="[TXT]"> <a href="maven-metadata.xml">maven-metadata.xml</a>         22-Jan-2008 02:59  780   
-<img src="/icons/text.gif" alt="[TXT]"> <a href="maven-metadata.xml.md5">maven-metadata.xml.md5</a>     22-Jan-2008 02:59   32   
-<img src="/icons/text.gif" alt="[TXT]"> <a href="maven-metadata.xml.sha1">maven-metadata.xml.sha1</a>    22-Jan-2008 02:59   40   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="mevenide2-parent/">mevenide2-parent/</a>          18-Dec-2007 11:47    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="nb-mvn-embedder/">nb-mvn-embedder/</a>           22-Jan-2008 02:52    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="nb-project/">nb-project/</a>                22-Jan-2008 02:54    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="nb-repo-browser/">nb-repo-browser/</a>           24-Oct-2006 13:06    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="netbeans-debugger-plugin/">netbeans-debugger-plugin/</a>  31-Aug-2007 06:35    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="netbeans-deploy-plugin/">netbeans-deploy-plugin/</a>    31-Aug-2007 06:36    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="netbeans-libs/">netbeans-libs/</a>             22-Jan-2008 02:52    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="netbeans-nbmreload-plugin/">netbeans-nbmreload-plugin/</a> 31-Aug-2007 06:37    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="netbeans-repository/">netbeans-repository/</a>       22-Jan-2008 03:00    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="netbeans-run-plugin/">netbeans-run-plugin/</a>       31-Aug-2007 06:36    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="netbeans/">netbeans/</a>                  22-Jan-2008 02:52    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="persistence/">persistence/</a>               22-Jan-2008 02:57    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="plugin-bridges/">plugin-bridges/</a>            22-Jan-2008 02:53    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="plugins/">plugins/</a>                   17-May-2006 17:24    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="reload-nbm-bridge/">reload-nbm-bridge/</a>         22-Jan-2008 02:59    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="run-jar-bridge/">run-jar-bridge/</a>            22-Jan-2008 02:53    -   
-<hr></pre>
-<address>Apache/2.0.52 (Red Hat) Server at repository.codehaus.org Port 80</address>
-</body></html>
diff --git a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/mirror-wagon.html b/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/mirror-wagon.html
deleted file mode 100644
index 33da508..0000000
--- a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/mirror-wagon.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-<title>Index of /maven2/org/apache/maven/wagon/</title>
-<link rel="stylesheet" type="text/css" href="/css/mirror.css" />
-</head>
-<body>
-<h2>Index of /maven2/org/apache/maven/wagon/</h2>
-<div class="list">
-<table cellpadding="0" cellspacing="0">
-<thead><tr><th class="n">Name</th><th class="m">Last Modified</th><th class="s">Size</th><th class="t">Type</th></tr></thead>
-
-<tbody>
-<tr><td class="n"><a href="../">Parent Directory</a>/</td><td class="m"> </td><td class="s">-  </td><td class="t">Directory</td></tr>
-<tr><td class="n"><a href="wagon/">wagon</a>/</td><td class="m">2006-Aug-04 20:01:55</td><td class="s">-  </td><td class="t">Directory</td></tr>
-<tr><td class="n"><a href="wagon-file/">wagon-file</a>/</td><td class="m">2006-Aug-04 21:01:11</td><td class="s">-  </td><td class="t">Directory</td></tr>
-
-<tr><td class="n"><a href="wagon-ftp/">wagon-ftp</a>/</td><td class="m">2006-Aug-04 21:01:11</td><td class="s">-  </td><td class="t">Directory</td></tr>
-<tr><td class="n"><a href="wagon-http/">wagon-http</a>/</td><td class="m">2006-Aug-04 21:01:11</td><td class="s">-  </td><td class="t">Directory</td></tr>
-<tr><td class="n"><a href="wagon-http-lightweight/">wagon-http-lightweight</a>/</td><td class="m">2006-Aug-04 21:01:11</td><td class="s">-  </td><td class="t">Directory</td></tr>
-
-<tr><td class="n"><a href="wagon-lightweight-http/">wagon-lightweight-http</a>/</td><td class="m">2005-Nov-01 05:17:24</td><td class="s">-  </td><td class="t">Directory</td></tr>
-<tr><td class="n"><a href="wagon-provider/">wagon-provider</a>/</td><td class="m">2006-Aug-04 20:01:55</td><td class="s">-  </td><td class="t">Directory</td></tr>
-<tr><td class="n"><a href="wagon-provider-api/">wagon-provider-api</a>/</td><td class="m">2006-Aug-04 21:01:11</td><td class="s">-  </td><td class="t">Directory</td></tr>
-
-<tr><td class="n"><a href="wagon-provider-test/">wagon-provider-test</a>/</td><td class="m">2006-Aug-04 21:01:11</td><td class="s">-  </td><td class="t">Directory</td></tr>
-<tr><td class="n"><a href="wagon-providers/">wagon-providers</a>/</td><td class="m">2006-Aug-04 20:01:55</td><td class="s">-  </td><td class="t">Directory</td></tr>
-<tr><td class="n"><a href="wagon-scm/">wagon-scm</a>/</td><td class="m">2006-Aug-04 20:01:55</td><td class="s">-  </td><td class="t">Directory</td></tr>
-
-<tr><td class="n"><a href="wagon-ssh/">wagon-ssh</a>/</td><td class="m">2006-Aug-04 20:01:55</td><td class="s">-  </td><td class="t">Directory</td></tr>
-<tr><td class="n"><a href="wagon-ssh-external/">wagon-ssh-external</a>/</td><td class="m">2006-Aug-04 20:01:55</td><td class="s">-  </td><td class="t">Directory</td></tr>
-<tr><td class="n"><a href="wagon-webdav/">wagon-webdav</a>/</td><td class="m">2006-Aug-04 20:01:55</td><td class="s">-  </td><td class="t">Directory</td></tr>
-
-<tr><td class="n"><a href="wagon-1.0-alpha-2.pom">wagon-1.0-alpha-2.pom</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">3.1K</td><td class="t">text/xml</td></tr>
-<tr><td class="n"><a href="wagon-1.0-alpha-2.pom.asc">wagon-1.0-alpha-2.pom.asc</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-1.0-alpha-2.pom.md5">wagon-1.0-alpha-2.pom.md5</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-1.0-alpha-2.pom.sha1">wagon-1.0-alpha-2.pom.sha1</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050413.021234-4.pom">wagon-1.0-alpha-3-20050413.021234-4.pom</a></td><td class="m">2005-Nov-08 22:25:32</td><td class="s">3.1K</td><td class="t">text/xml</td></tr>
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050413.021234-4.pom.md5">wagon-1.0-alpha-3-20050413.021234-4.pom.md5</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050413.021234-4.pom.sha1">wagon-1.0-alpha-3-20050413.021234-4.pom.sha1</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050419.043745-5.pom">wagon-1.0-alpha-3-20050419.043745-5.pom</a></td><td class="m">2005-Nov-08 22:25:32</td><td class="s">3.1K</td><td class="t">text/xml</td></tr>
-
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050419.043745-5.pom.md5">wagon-1.0-alpha-3-20050419.043745-5.pom.md5</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050419.043745-5.pom.sha1">wagon-1.0-alpha-3-20050419.043745-5.pom.sha1</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050419.044035-6.pom">wagon-1.0-alpha-3-20050419.044035-6.pom</a></td><td class="m">2005-Nov-08 22:25:32</td><td class="s">3.1K</td><td class="t">text/xml</td></tr>
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050419.044035-6.pom.md5">wagon-1.0-alpha-3-20050419.044035-6.pom.md5</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050419.044035-6.pom.sha1">wagon-1.0-alpha-3-20050419.044035-6.pom.sha1</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050421.162738-7.pom">wagon-1.0-alpha-3-20050421.162738-7.pom</a></td><td class="m">2005-Nov-08 22:25:32</td><td class="s">3.1K</td><td class="t">text/xml</td></tr>
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050421.162738-7.pom.md5">wagon-1.0-alpha-3-20050421.162738-7.pom.md5</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050421.162738-7.pom.sha1">wagon-1.0-alpha-3-20050421.162738-7.pom.sha1</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050422.075233-8.pom">wagon-1.0-alpha-3-20050422.075233-8.pom</a></td><td class="m">2005-Nov-08 22:25:32</td><td class="s">3.1K</td><td class="t">text/xml</td></tr>
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050422.075233-8.pom.md5">wagon-1.0-alpha-3-20050422.075233-8.pom.md5</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050422.075233-8.pom.sha1">wagon-1.0-alpha-3-20050422.075233-8.pom.sha1</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050429.051847-9.pom">wagon-1.0-alpha-3-20050429.051847-9.pom</a></td><td class="m">2005-Nov-08 22:25:32</td><td class="s">3.1K</td><td class="t">text/xml</td></tr>
-
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050429.051847-9.pom.md5">wagon-1.0-alpha-3-20050429.051847-9.pom.md5</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-1.0-alpha-3-20050429.051847-9.pom.sha1">wagon-1.0-alpha-3-20050429.051847-9.pom.sha1</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-2.pom">wagon-providers-1.0-alpha-2.pom</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.9K</td><td class="t">text/xml</td></tr>
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-2.pom.asc">wagon-providers-1.0-alpha-2.pom.asc</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-2.pom.md5">wagon-providers-1.0-alpha-2.pom.md5</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-2.pom.sha1">wagon-providers-1.0-alpha-2.pom.sha1</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-3-20050407.202848-1.pom">wagon-providers-1.0-alpha-3-20050407.202848-1.pom</a></td><td class="m">2005-Nov-08 22:25:32</td><td class="s">0.9K</td><td class="t">text/xml</td></tr>
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-3-20050407.202848-1.pom.md5">wagon-providers-1.0-alpha-3-20050407.202848-1.pom.md5</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-3-20050407.202848-1.pom.sha1">wagon-providers-1.0-alpha-3-20050407.202848-1.pom.sha1</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-3-20050419.044035-2.pom">wagon-providers-1.0-alpha-3-20050419.044035-2.pom</a></td><td class="m">2005-Nov-08 22:25:32</td><td class="s">0.9K</td><td class="t">text/xml</td></tr>
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-3-20050419.044035-2.pom.md5">wagon-providers-1.0-alpha-3-20050419.044035-2.pom.md5</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-3-20050419.044035-2.pom.sha1">wagon-providers-1.0-alpha-3-20050419.044035-2.pom.sha1</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-3-20050421.162738-3.pom">wagon-providers-1.0-alpha-3-20050421.162738-3.pom</a></td><td class="m">2005-Nov-08 22:25:32</td><td class="s">0.9K</td><td class="t">text/xml</td></tr>
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-3-20050421.162738-3.pom.md5">wagon-providers-1.0-alpha-3-20050421.162738-3.pom.md5</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-3-20050421.162738-3.pom.sha1">wagon-providers-1.0-alpha-3-20050421.162738-3.pom.sha1</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-3-20050422.075233-4.pom">wagon-providers-1.0-alpha-3-20050422.075233-4.pom</a></td><td class="m">2005-Nov-08 22:25:32</td><td class="s">0.9K</td><td class="t">text/xml</td></tr>
-
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-3-20050422.075233-4.pom.md5">wagon-providers-1.0-alpha-3-20050422.075233-4.pom.md5</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-3-20050422.075233-4.pom.sha1">wagon-providers-1.0-alpha-3-20050422.075233-4.pom.sha1</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-3-20050429.051847-5.pom">wagon-providers-1.0-alpha-3-20050429.051847-5.pom</a></td><td class="m">2005-Nov-08 22:25:32</td><td class="s">1.0K</td><td class="t">text/xml</td></tr>
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-3-20050429.051847-5.pom.md5">wagon-providers-1.0-alpha-3-20050429.051847-5.pom.md5</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-
-<tr><td class="n"><a href="wagon-providers-1.0-alpha-3-20050429.051847-5.pom.sha1">wagon-providers-1.0-alpha-3-20050429.051847-5.pom.sha1</a></td><td class="m">2006-Aug-04 21:01:11</td><td class="s">0.1K</td><td class="t">text/plain</td></tr>
-</tbody>
-</table>
-</div>
-<div class="foot"><br />ibiblio.org - Mirror Site<br />
-<a href="mailto:mirror.admin at mirror.com">Mirror Admin</a></div>
-
-</body>
-</html>
diff --git a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/nekohtml.html b/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/nekohtml.html
deleted file mode 100644
index 1738029..0000000
--- a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/nekohtml.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
- <head>
-  <title>Index of /maven2/nekohtml/nekohtml/1.9.6</title>
- </head>
- <body>
-<h1>Index of /maven2/nekohtml/nekohtml/1.9.6</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="/maven2/nekohtml/nekohtml/">Parent Directory</a>                                     -   
-<img src="/icons/unknown.gif" alt="[   ]"> <a href="nekohtml-1.9.6-javadoc.jar">nekohtml-1.9.6-javadoc.jar</a>      02-Jan-2008 15:07  235K  
-<img src="/icons/unknown.gif" alt="[   ]"> <a href="nekohtml-1.9.6-javadoc.jar.md5">nekohtml-1.9.6-javadoc.jar.md5</a>  17-Jan-2008 21:35  134   
-<img src="/icons/unknown.gif" alt="[   ]"> <a href="nekohtml-1.9.6-javadoc.jar.sha1">nekohtml-1.9.6-javadoc.jar.sha1</a> 17-Jan-2008 21:35  142   
-<img src="/icons/unknown.gif" alt="[   ]"> <a href="nekohtml-1.9.6-sources.jar">nekohtml-1.9.6-sources.jar</a>      17-Jan-2008 21:35   88K  
-<img src="/icons/unknown.gif" alt="[   ]"> <a href="nekohtml-1.9.6-sources.jar.md5">nekohtml-1.9.6-sources.jar.md5</a>  17-Jan-2008 21:35  134   
-<img src="/icons/unknown.gif" alt="[   ]"> <a href="nekohtml-1.9.6-sources.jar.sha1">nekohtml-1.9.6-sources.jar.sha1</a> 17-Jan-2008 21:35  142   
-<img src="/icons/unknown.gif" alt="[   ]"> <a href="nekohtml-1.9.6.jar">nekohtml-1.9.6.jar</a>              02-Jan-2008 15:07  108K  
-<img src="/icons/unknown.gif" alt="[   ]"> <a href="nekohtml-1.9.6.jar.md5">nekohtml-1.9.6.jar.md5</a>          17-Jan-2008 21:35  126   
-<img src="/icons/unknown.gif" alt="[   ]"> <a href="nekohtml-1.9.6.jar.sha1">nekohtml-1.9.6.jar.sha1</a>         17-Jan-2008 21:35  134   
-<img src="/icons/text.gif" alt="[TXT]"> <a href="nekohtml-1.9.6.pom">nekohtml-1.9.6.pom</a>              02-Jan-2008 15:07  702   
-<img src="/icons/text.gif" alt="[TXT]"> <a href="nekohtml-1.9.6.pom.md5">nekohtml-1.9.6.pom.md5</a>          17-Jan-2008 21:35  126   
-<img src="/icons/text.gif" alt="[TXT]"> <a href="nekohtml-1.9.6.pom.sha1">nekohtml-1.9.6.pom.sha1</a>         17-Jan-2008 21:35  134   
-<hr></pre>
-<address>Apache/2.0.52 (Red Hat) Server at repo1.maven.org Port 80</address>
-</body></html>
diff --git a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/net_sf.html b/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/net_sf.html
deleted file mode 100644
index eb89c62..0000000
--- a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/net_sf.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
- <head>
-  <title>Index of /maven2/net/sf</title>
- </head>
- <body>
-<h1>Index of /maven2/net/sf</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="/maven2/net/">Parent Directory</a>                             -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="a2j/">a2j/</a>                    28-Nov-2005 11:32    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="aislib/">aislib/</a>                 10-Feb-2008 06:40    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="alchim/">alchim/</a>                 22-Nov-2007 08:27    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="antenna/">antenna/</a>                09-Jul-2007 11:45    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="apt-jelly/">apt-jelly/</a>              02-Apr-2007 15:48    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="beanlib/">beanlib/</a>                20-Apr-2006 07:32    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="bluecove/">bluecove/</a>               25-Jan-2007 01:03    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="buildbox/">buildbox/</a>               13-Jan-2008 20:07    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="click/">click/</a>                  10-Dec-2005 19:31    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="clirr/">clirr/</a>                  11-Feb-2006 20:41    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="datavision/">datavision/</a>             26-Jan-2008 18:46    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="dozer/">dozer/</a>                  09-Feb-2006 23:31    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="dtddoc/">dtddoc/</a>                 03-Feb-2007 07:32    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="dynpageplus/">dynpageplus/</a>            03-Jan-2006 11:36    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="ehcache/">ehcache/</a>                04-May-2007 20:14    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="ezmorph/">ezmorph/</a>                17-Aug-2006 11:57    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="falcon/">falcon/</a>                 31-Jan-2007 11:35    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="grester/">grester/</a>                22-Oct-2007 18:25    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="gwt-widget/">gwt-widget/</a>             17-Sep-2007 12:58    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="hermesftp/">hermesftp/</a>              14-Jun-2006 17:06    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="hibernate/">hibernate/</a>              31-Oct-2005 23:08    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="jcharts/">jcharts/</a>                16-May-2007 17:26    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="jdatabaseimport/">jdatabaseimport/</a>        20-Oct-2006 10:45    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="jeceira/">jeceira/</a>                26-Jun-2007 16:50    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="jfcunit/">jfcunit/</a>                07-Feb-2006 00:49    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="jfig/">jfig/</a>                   25-Jan-2007 01:03    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="jguard/">jguard/</a>                 31-Jul-2007 18:36    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="jipcam/">jipcam/</a>                 02-Mar-2006 15:32    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="jlynx/">jlynx/</a>                  02-Aug-2007 22:04    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="jour/">jour/</a>                   27-Aug-2007 20:09    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="jpf/">jpf/</a>                    26-Apr-2007 10:45    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="json-lib/">json-lib/</a>               11-Feb-2007 19:12    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="jsptest/">jsptest/</a>                07-Aug-2007 16:17    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="jsr107cache/">jsr107cache/</a>            25-Jan-2007 00:45    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="jt400/">jt400/</a>                  11-Nov-2005 15:31    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="jxls/">jxls/</a>                   29-Jul-2007 17:54    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="kxml/">kxml/</a>                   19-Mar-2007 20:25    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="ldaptemplate/">ldaptemplate/</a>           27-Feb-2006 19:41    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="locale4j/">locale4j/</a>               31-Aug-2007 07:23    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="mapasuta/">mapasuta/</a>               12-Nov-2006 12:05    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="maven-har/">maven-har/</a>              24-Aug-2007 07:09    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="maven-sar/">maven-sar/</a>              28-Aug-2007 18:28    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="opencsv/">opencsv/</a>                14-Mar-2007 12:55    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="oval/">oval/</a>                   15-Jan-2007 15:30    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="proguard/">proguard/</a>               19-Jan-2006 15:41    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="qdwizard/">qdwizard/</a>               19-Dec-2007 16:02    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="resultsetmapper/">resultsetmapper/</a>        18-Mar-2007 16:23    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="retrotranslator/">retrotranslator/</a>        26-Apr-2006 15:31    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="saxon/">saxon/</a>                  04-Apr-2006 23:32    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="shadesdb/">shadesdb/</a>               19-Oct-2006 14:58    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="smc/">smc/</a>                    30-May-2006 01:13    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="speculoos/">speculoos/</a>              20-Nov-2006 17:04    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="springlayout/">springlayout/</a>           26-Mar-2007 15:24    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="stat-scm/">stat-scm/</a>               25-Apr-2007 10:56    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="statsvn/">statsvn/</a>                29-Nov-2006 13:55    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="stax/">stax/</a>                   31-Oct-2005 23:08    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="struts/">struts/</a>                 28-Nov-2005 11:32    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="tacos/">tacos/</a>                  19-Dec-2007 04:16    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="testextensions/">testextensions/</a>         21-May-2007 12:54    -   
-<img src="/icons/folder.gif" alt="[DIR]"> <a href="webdav-servlet/">webdav-servlet/</a>         30-Jan-2006 19:36    -   
-<hr></pre>
-<address>Apache/2.0.52 (Red Hat) Server at repo1.maven.org Port 80</address>
-</body></html>
diff --git a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/org.apache.maven.html b/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/org.apache.maven.html
deleted file mode 100644
index fd674c8..0000000
--- a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/org.apache.maven.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!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>
diff --git a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/org.codehaus.html b/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/org.codehaus.html
deleted file mode 100644
index 57c3439..0000000
--- a/wagon-providers/wagon-http-shared4/src/test/resources/filelistings/org.codehaus.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!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>
diff --git a/wagon-providers/wagon-http/pom.xml b/wagon-providers/wagon-http/pom.xml
index 8c9bc30..9c58163 100644
--- a/wagon-providers/wagon-http/pom.xml
+++ b/wagon-providers/wagon-http/pom.xml
@@ -23,21 +23,21 @@ under the License.
   <parent>
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-http</artifactId>
   <name>Apache Maven Wagon :: Providers :: HTTP Provider</name>
   <description>
-    Wagon that gets and puts artifacts through http using Apache httpclient-4.x.
+    Wagon provider that gets and puts artifacts through HTTP(S) using Apache HttpClient-4.x.
   </description>
 
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>wagon-http-shared4</artifactId>
+      <artifactId>wagon-http-shared</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -45,11 +45,16 @@ under the License.
       <artifactId>httpclient</artifactId>
     </dependency>
     <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1.3</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
     </dependency>
 
-    <!-- used fo the TCK -->
+    <!-- used for the TCK -->
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-tck-http</artifactId>
@@ -81,7 +86,6 @@ under the License.
                   <include>org.apache.httpcomponents:httpcore</include>
                   <include>commons-logging:commons-logging</include>
                   <include>commons-codec:commons-codec</include>
-                  <include>${project.groupId}:wagon-http-shared4</include>
                 </includes>
               </artifactSet>
               <shadedArtifactAttached>true</shadedArtifactAttached>
diff --git a/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/AbstractHttpClientWagon.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
similarity index 99%
rename from wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/AbstractHttpClientWagon.java
rename to wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index 0c2d199..995c1f2 100644
--- a/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/AbstractHttpClientWagon.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -1,4 +1,4 @@
-package org.apache.maven.wagon.shared.http4;
+package org.apache.maven.wagon.providers.http;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -270,7 +270,7 @@ public abstract class AbstractHttpClientWagon
      * <b>disabled by default</b>
      *
      * @since 2.0
-     * @see BrowserCompatHostnameVerifier
+     * @see RelaxedHostNameVerifier
      */
     protected static boolean sslAllowAll =
         Boolean.valueOf( System.getProperty( "maven.wagon.http.ssl.allowall", "false" ) );
@@ -737,7 +737,7 @@ public abstract class AbstractHttpClientWagon
                     creds = new UsernamePasswordCredentials( proxyInfo.getUserName(), proxyInfo.getPassword() );
                 }
 
-                Header bs = new BasicScheme().authenticate( creds, httpMethod );
+                Header bs = new BasicScheme().authenticate( creds, httpMethod, localContext );
                 httpMethod.addHeader( "Proxy-Authorization", bs.getValue() );
             }
 
diff --git a/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/ConfigurableSSLSocketFactoryDecorator.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/ConfigurableSSLSocketFactoryDecorator.java
similarity index 98%
rename from wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/ConfigurableSSLSocketFactoryDecorator.java
rename to wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/ConfigurableSSLSocketFactoryDecorator.java
index ce9182a..d3ab658 100644
--- a/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/ConfigurableSSLSocketFactoryDecorator.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/ConfigurableSSLSocketFactoryDecorator.java
@@ -1,4 +1,4 @@
-package org.apache.maven.wagon.shared.http4;
+package org.apache.maven.wagon.providers.http;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/HttpConfiguration.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpConfiguration.java
similarity index 98%
rename from wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/HttpConfiguration.java
rename to wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpConfiguration.java
index 8055fbb..cacad63 100644
--- a/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/HttpConfiguration.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpConfiguration.java
@@ -1,4 +1,4 @@
-package org.apache.maven.wagon.shared.http4;
+package org.apache.maven.wagon.providers.http;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/HttpMethodConfiguration.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpMethodConfiguration.java
similarity index 99%
rename from wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/HttpMethodConfiguration.java
rename to wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpMethodConfiguration.java
index 2be4be8..8fb01e1 100644
--- a/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/HttpMethodConfiguration.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpMethodConfiguration.java
@@ -1,4 +1,4 @@
-package org.apache.maven.wagon.shared.http4;
+package org.apache.maven.wagon.providers.http;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
index 26b611f..acc8533 100644
--- a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
@@ -26,8 +26,7 @@ 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;
-import org.apache.maven.wagon.shared.http4.AbstractHttpClientWagon;
-import org.apache.maven.wagon.shared.http4.HtmlFileListParser;
+import org.apache.maven.wagon.shared.http.HtmlFileListParser;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/RelaxedX509TrustManager.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/RelaxedX509TrustManager.java
similarity index 98%
rename from wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/RelaxedX509TrustManager.java
rename to wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/RelaxedX509TrustManager.java
index 82b07bf..f0d14eb 100644
--- a/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/RelaxedX509TrustManager.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/RelaxedX509TrustManager.java
@@ -1,4 +1,4 @@
-package org.apache.maven.wagon.shared.http4;
+package org.apache.maven.wagon.providers.http;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/wagon-providers/wagon-http/src/site/apt/index.apt b/wagon-providers/wagon-http/src/site/apt/index.apt
index 77f69a5..732af58 100644
--- a/wagon-providers/wagon-http/src/site/apt/index.apt
+++ b/wagon-providers/wagon-http/src/site/apt/index.apt
@@ -29,7 +29,7 @@
 
 Maven Wagon HTTP
 
- This project is an implementation of Wagon provider for HTTP access.
+ This component is an implementation of Wagon provider for HTTP access.
  It uses {{{http://hc.apache.org/httpcomponents-client-ga/}Apache HttpComponents client}} as lower level layer.
  
  It enables Maven to use remote repositories stored in HTTP servers.
diff --git a/wagon-providers/wagon-http-shared4/src/test/java/org/apache/maven/wagon/shared/http4/AbstractHttpClientWagonTest.java b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpClientWagonTest.java
similarity index 98%
rename from wagon-providers/wagon-http-shared4/src/test/java/org/apache/maven/wagon/shared/http4/AbstractHttpClientWagonTest.java
rename to wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpClientWagonTest.java
index 3eac6ec..c70f1a3 100644
--- a/wagon-providers/wagon-http-shared4/src/test/java/org/apache/maven/wagon/shared/http4/AbstractHttpClientWagonTest.java
+++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpClientWagonTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.wagon.shared.http4;
+package org.apache.maven.wagon.providers.http;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,7 +28,7 @@ import org.apache.http.params.HttpParams;
 import org.apache.maven.wagon.OutputData;
 import org.apache.maven.wagon.TransferFailedException;
 
-public class AbstractHttpClientWagonTest
+public class HttpClientWagonTest
     extends TestCase
 {
 
diff --git a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonPreemptiveTest.java b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonPreemptiveTest.java
index f3e4308..f8c8be5 100644
--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonPreemptiveTest.java
+++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonPreemptiveTest.java
@@ -20,8 +20,6 @@ package org.apache.maven.wagon.providers.http;
  */
 
 import org.apache.maven.wagon.Wagon;
-import org.apache.maven.wagon.shared.http4.HttpConfiguration;
-import org.apache.maven.wagon.shared.http4.HttpMethodConfiguration;
 
 /**
  * @author <a href="michal.maczka at dimatics.com">Michal Maczka</a>
diff --git a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
index c00c6fb..e38046c 100644
--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
+++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
@@ -20,18 +20,14 @@ package org.apache.maven.wagon.providers.http;
  */
 
 import org.apache.http.impl.conn.PoolingClientConnectionManager;
-import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
 import org.apache.maven.wagon.StreamingWagon;
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.http.HttpWagonTestCase;
-import org.apache.maven.wagon.shared.http4.HttpConfiguration;
-import org.apache.maven.wagon.shared.http4.HttpMethodConfiguration;
 
 import java.util.Properties;
 
 /**
  * @author <a href="michal.maczka at dimatics.com">Michal Maczka</a>
- *
  */
 public class HttpWagonTest
     extends HttpWagonTestCase
diff --git a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTimeoutTest.java b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTimeoutTest.java
index f986b83..c223f23 100644
--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTimeoutTest.java
+++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTimeoutTest.java
@@ -23,8 +23,6 @@ import org.apache.maven.wagon.FileTestUtils;
 import org.apache.maven.wagon.TransferFailedException;
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.repository.Repository;
-import org.apache.maven.wagon.shared.http4.HttpConfiguration;
-import org.apache.maven.wagon.shared.http4.HttpMethodConfiguration;
 import org.mortbay.jetty.servlet.ServletHolder;
 
 import java.io.File;
diff --git a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpsWagonPreemptiveTest.java b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpsWagonPreemptiveTest.java
index 6f5179a..396823b 100644
--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpsWagonPreemptiveTest.java
+++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpsWagonPreemptiveTest.java
@@ -20,8 +20,6 @@ package org.apache.maven.wagon.providers.http;
  */
 
 import org.apache.maven.wagon.Wagon;
-import org.apache.maven.wagon.shared.http4.HttpConfiguration;
-import org.apache.maven.wagon.shared.http4.HttpMethodConfiguration;
 import org.mortbay.jetty.Connector;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.security.SslSocketConnector;
diff --git a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
new file mode 100644
index 0000000..c11ea21
--- /dev/null
+++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
@@ -0,0 +1,156 @@
+package org.apache.maven.wagon.providers.http;
+
+import junit.framework.Assert;
+import org.apache.maven.wagon.FileTestUtils;
+import org.apache.maven.wagon.Wagon;
+import org.apache.maven.wagon.observers.Debug;
+import org.apache.maven.wagon.repository.Repository;
+import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringOutputStream;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.servlet.Context;
+import org.mortbay.jetty.servlet.DefaultServlet;
+import org.mortbay.jetty.servlet.ServletHolder;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.math.BigInteger;
+
+/**
+ * @author Olivier Lamy
+ */
+public class HugeFileDownloadTest
+    extends PlexusTestCase
+{
+
+    private static long HUGE_FILE_SIZE =
+        Integer.valueOf( Integer.MAX_VALUE ).longValue() + Integer.valueOf( Integer.MAX_VALUE ).longValue();
+
+    private Server server;
+
+    public void testDownloadHugeFileWithContentLength()
+        throws Exception
+    {
+        File hugeFile = new File( getBasedir(), "/target/hugefile.txt" );
+        if ( !hugeFile.exists() || hugeFile.length() < HUGE_FILE_SIZE )
+        {
+            makeHugeFile( hugeFile );
+        }
+
+        server = new Server( 0 );
+
+        Context root = new Context( server, "/", Context.SESSIONS );
+        root.setResourceBase( new File( getBasedir(), "/target" ).getAbsolutePath() );
+        ServletHolder servletHolder = new ServletHolder( new DefaultServlet() );
+        root.addServlet( servletHolder, "/*" );
+
+        server.start();
+
+        try
+        {
+            Wagon wagon = getWagon();
+            wagon.connect( new Repository( "id", "http://localhost:" + server.getConnectors()[0].getLocalPort() ) );
+
+            File dest = File.createTempFile( "huge", "txt" );
+
+            wagon.get( "hugefile.txt", dest );
+
+            Assert.assertTrue( dest.length() >= HUGE_FILE_SIZE );
+
+            wagon.disconnect();
+        }
+        finally
+        {
+            server.start();
+        }
+
+
+    }
+
+    public void testDownloadHugeFileWithChunked()
+        throws Exception
+    {
+        final File hugeFile = new File( getBasedir(), "/target/hugefile.txt" );
+        if ( !hugeFile.exists() || hugeFile.length() < HUGE_FILE_SIZE )
+        {
+            makeHugeFile( hugeFile );
+        }
+
+        server = new Server( 0 );
+
+        Context root = new Context( server, "/", Context.SESSIONS );
+        root.setResourceBase( new File( getBasedir(), "/target" ).getAbsolutePath() );
+        ServletHolder servletHolder = new ServletHolder( new HttpServlet()
+        {
+            @Override
+            protected void doGet( HttpServletRequest req, HttpServletResponse resp )
+                throws ServletException, IOException
+            {
+                FileInputStream fis = new FileInputStream( hugeFile );
+
+                byte[] buffer = new byte[8192];
+                int len = 0;
+                while ( ( len = fis.read( buffer ) ) != -1 )
+                {
+                    resp.getOutputStream().write( buffer, 0, len );
+                }
+                fis.close();
+            }
+        } );
+        root.addServlet( servletHolder, "/*" );
+
+        server.start();
+
+        try
+        {
+            Wagon wagon = getWagon();
+            wagon.connect( new Repository( "id", "http://localhost:" + server.getConnectors()[0].getLocalPort() ) );
+
+            File dest = File.createTempFile( "huge", "txt" );
+
+            wagon.get( "hugefile.txt", dest );
+
+            Assert.assertTrue( dest.length() >= HUGE_FILE_SIZE );
+
+            wagon.disconnect();
+        }
+        finally
+        {
+            server.start();
+        }
+
+
+    }
+
+
+    protected Wagon getWagon()
+        throws Exception
+    {
+        Wagon wagon = (Wagon) lookup( Wagon.ROLE, "http" );
+
+        Debug debug = new Debug();
+
+        wagon.addSessionListener( debug );
+
+        return wagon;
+    }
+
+    private void makeHugeFile( File hugeFile )
+        throws Exception
+    {
+        RandomAccessFile ra = new RandomAccessFile( hugeFile.getPath(), "rw" );
+        ra.setLength( HUGE_FILE_SIZE + 1 );
+        ra.seek( HUGE_FILE_SIZE );
+        ra.write( 1 );
+
+    }
+
+}
diff --git a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java
index 8342f40..dc56e31 100644
--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java
+++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java
@@ -25,7 +25,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 /**
- * This test will runn the TCK suite on wagon-http-lightweight
+ * This test will run the TCK suite on wagon-http-lightweight
  */
 @RunWith( Suite.class )
 @Suite.SuiteClasses( { GetWagonTests.class, HttpsGetWagonTests.class } )
diff --git a/wagon-providers/wagon-http/src/test/resources/log4j.xml b/wagon-providers/wagon-http/src/test/resources/log4j.xml
index aaabcde..dd6eb4f 100644
--- a/wagon-providers/wagon-http/src/test/resources/log4j.xml
+++ b/wagon-providers/wagon-http/src/test/resources/log4j.xml
@@ -27,11 +27,17 @@
     </layout>
   </appender>
 
-  <logger name="org.apache.http.wire">
+  <logger name="org.apache.http.headers">
     <level value="debug"/>
   </logger>
 
+  <logger name="org.apache.http">
+    <level value="info"/>
+  </logger>
 
+  <logger name="org.apache.http.wire">
+    <level value="info"/>
+  </logger>
 
   <root>
     <priority value ="info" />
diff --git a/wagon-providers/wagon-scm/pom.xml b/wagon-providers/wagon-scm/pom.xml
index e07008e..71377c2 100644
--- a/wagon-providers/wagon-scm/pom.xml
+++ b/wagon-providers/wagon-scm/pom.xml
@@ -23,14 +23,14 @@ under the License.
   <parent>
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-scm</artifactId>
   <name>Apache Maven Wagon :: Providers :: SCM Provider</name>
   <description>
-    Wagon that gets and puts artifacts using a Source Control Management system
+    Wagon provider that gets and puts artifacts using a Source Control Management system
   </description>
 
   <properties>
diff --git a/wagon-providers/wagon-scm/src/site/apt/index.apt b/wagon-providers/wagon-scm/src/site/apt/index.apt
index 5fff816..56ba227 100644
--- a/wagon-providers/wagon-scm/src/site/apt/index.apt
+++ b/wagon-providers/wagon-scm/src/site/apt/index.apt
@@ -28,7 +28,7 @@
 
 Maven Wagon SCM
 
- This project is an implementation of Wagon provider for SCM (Source Control Management) systems,
+ This component is an implementation of Wagon provider for SCM (Source Control Management) systems,
  using {{{http://maven.apache.org/scm}Maven SCM}}.
  
  It enables Maven to use remote repositories stored in SCM systems (Subversion, CVS, ...)
diff --git a/wagon-providers/wagon-ssh-common-test/pom.xml b/wagon-providers/wagon-ssh-common-test/pom.xml
index 8de43c5..02b2e41 100644
--- a/wagon-providers/wagon-ssh-common-test/pom.xml
+++ b/wagon-providers/wagon-ssh-common-test/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/wagon-providers/wagon-ssh-common/pom.xml b/wagon-providers/wagon-ssh-common/pom.xml
index 9cfd8cc..c41c227 100644
--- a/wagon-providers/wagon-ssh-common/pom.xml
+++ b/wagon-providers/wagon-ssh-common/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/wagon-providers/wagon-ssh-external/pom.xml b/wagon-providers/wagon-ssh-external/pom.xml
index 343ecf6..ff81b53 100644
--- a/wagon-providers/wagon-ssh-external/pom.xml
+++ b/wagon-providers/wagon-ssh-external/pom.xml
@@ -23,14 +23,14 @@ under the License.
   <parent>
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-ssh-external</artifactId>
   <name>Apache Maven Wagon :: Providers :: SSH External Provider</name>
   <description>
-    Wagon that gets and puts artifacts using SSH protocol with a preinstalled SSH client
+    Wagon provider that gets and puts artifacts using SSH protocol with a preinstalled SSH client
   </description>
 
   <properties>
@@ -99,7 +99,7 @@ under the License.
                 <exclude>**/EmbeddedScp*WagonWithKeyTest.*</exclude>
               </excludes>
               <systemPropertyVariables>
-                <java.io.tmpdir>${project.build.outputDirectory}</java.io.tmpdir>
+                <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
                 <test.user>olamy</test.user>
                 <sshd.stopImmediatly>${sshd.stopImmediatly}</sshd.stopImmediatly>
               </systemPropertyVariables>
diff --git a/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java b/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
index 912fe49..1a15e7e 100644
--- a/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
+++ b/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
@@ -50,7 +50,6 @@ import java.util.Locale;
  * ssh-agent type behavior, until we can construct a Java SSH Agent and interface for JSch.
  *
  * @author <a href="mailto:brett at apache.org">Brett Porter</a>
- * @version $Id:ScpExternalWagon.java 477260 2006-11-20 17:11:39Z brett $
  * @todo [BP] add compression flag
  * @plexus.component role="org.apache.maven.wagon.Wagon"
  * role-hint="scpexe"
diff --git a/wagon-providers/wagon-ssh-external/src/site/apt/index.apt b/wagon-providers/wagon-ssh-external/src/site/apt/index.apt
index 3056777..1e37e6e 100644
--- a/wagon-providers/wagon-ssh-external/src/site/apt/index.apt
+++ b/wagon-providers/wagon-ssh-external/src/site/apt/index.apt
@@ -28,10 +28,10 @@
 
 Maven Wagon SSH External
 
- This project is an implementation of Wagon provider for SSH servers access.
+ This component is an implementation of Wagon provider for SSH servers access.
  
  It enables Maven to deploy artifacts and sites to SSH servers.
- it uses an external SSH program that has to be already installed in the system
+ it uses an external SSH program that has to be already installed in the system.
 
  Getting files from SSH servers is not fully tested.
 
diff --git a/wagon-providers/wagon-ssh/pom.xml b/wagon-providers/wagon-ssh/pom.xml
index e5d3db9..7d551a2 100644
--- a/wagon-providers/wagon-ssh/pom.xml
+++ b/wagon-providers/wagon-ssh/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -98,7 +98,7 @@ under the License.
                 <exclude>**/Embedded*Test.*</exclude>
               </excludes>
               <systemPropertyVariables>
-                <java.io.tmpdir>${project.build.outputDirectory}</java.io.tmpdir>
+                <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
                 <test.user>olamy</test.user>
                 <sshd.stopImmediatly>${sshd.stopImmediatly}</sshd.stopImmediatly>
               </systemPropertyVariables>
@@ -128,7 +128,7 @@ under the License.
                 <exclude>**/Embedded*Test.*</exclude>
               </excludes>
               <systemPropertyVariables>
-                <java.io.tmpdir>${project.build.outputDirectory}</java.io.tmpdir>
+                <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
                 <test.user>olamy</test.user>
               </systemPropertyVariables>
             </configuration>
@@ -157,7 +157,7 @@ under the License.
                 <exclude>**/ScpWagon*Test.*</exclude>
               </excludes>
               <systemPropertyVariables>
-                <java.io.tmpdir>${project.build.outputDirectory}</java.io.tmpdir>
+                <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
                 <test.user>olamy</test.user>
                 <sshd.stopImmediatly>${sshd.stopImmediatly}</sshd.stopImmediatly>
               </systemPropertyVariables>
diff --git a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
index e831539..e8b7388 100644
--- a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
+++ b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
@@ -292,7 +292,8 @@ public class SftpWagon
 
         if ( sourceFile.isDirectory() )
         {
-            if ( !fileName.equals( "." ) )
+        	//ScpHelper.getResourceFilename( destinationDirectory ) - could return empty string
+            if ( !fileName.equals( "." ) && !fileName.equals("") )
             {
                 prefix = getFileName( prefix, fileName );
                 mkdir( fileName, directoryMode );
diff --git a/wagon-providers/wagon-ssh/src/site/apt/index.apt b/wagon-providers/wagon-ssh/src/site/apt/index.apt
index 12333b3..c74977a 100644
--- a/wagon-providers/wagon-ssh/src/site/apt/index.apt
+++ b/wagon-providers/wagon-ssh/src/site/apt/index.apt
@@ -28,7 +28,7 @@
 
 Maven Wagon SSH
 
- This project is an implementation of Wagon provider for SCP and SFTP access.
+ This component is an implementation of Wagon provider for SCP and SFTP access.
 
  It enables Maven to deploy artifacts and sites to SSH servers.
  It uses {{{http://www.jcraft.com/jsch/}JSch - Java Secure Channel}} as lower level layer.
diff --git a/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java b/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java
index 28db68c..6a33d42 100644
--- a/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java
+++ b/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java
@@ -39,8 +39,6 @@ public class EmbeddedScpWagonTest
     extends AbstractEmbeddedScpWagonTest
 {
 
-    SshServerEmbedded sshServerEmbedded;
-
     @Override
     protected Wagon getWagon()
         throws Exception
diff --git a/wagon-providers/wagon-webdav-jackrabbit/pom.xml b/wagon-providers/wagon-webdav-jackrabbit/pom.xml
index 77025e6..f56e17b 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml
+++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml
@@ -23,14 +23,14 @@ under the License.
   <parent>
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-webdav-jackrabbit</artifactId>
   <name>Apache Maven Wagon :: Providers :: WebDav Provider</name>
   <description>
-    Wagon that gets and puts artifacts through webdav protocol
+    Wagon provider that gets and puts artifacts through webdav protocol
   </description>
 
   <contributors>
@@ -46,11 +46,6 @@ under the License.
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>wagon-http-shared</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-webdav</artifactId>
       <version>2.5.2</version>
diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/AbstractHttpClientWagon.java
similarity index 99%
rename from wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
rename to wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/AbstractHttpClientWagon.java
index 62b5c12..e2ed2f8 100644
--- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/AbstractHttpClientWagon.java
@@ -1,4 +1,4 @@
-package org.apache.maven.wagon.shared.http;
+package org.apache.maven.wagon.providers.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HttpConfiguration.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/HttpConfiguration.java
similarity index 98%
rename from wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HttpConfiguration.java
rename to wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/HttpConfiguration.java
index 492e24a..9c3e9e6 100644
--- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HttpConfiguration.java
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/HttpConfiguration.java
@@ -1,4 +1,4 @@
-package org.apache.maven.wagon.shared.http;
+package org.apache.maven.wagon.providers.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/HttpMethodConfiguration.java
similarity index 99%
rename from wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java
rename to wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/HttpMethodConfiguration.java
index 9bbc433..f752697 100644
--- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/HttpMethodConfiguration.java
@@ -1,4 +1,4 @@
-package org.apache.maven.wagon.shared.http;
+package org.apache.maven.wagon.providers.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
index 5256b89..4eebe0f 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
@@ -37,7 +37,6 @@ import org.apache.maven.wagon.TransferFailedException;
 import org.apache.maven.wagon.WagonConstants;
 import org.apache.maven.wagon.authorization.AuthorizationException;
 import org.apache.maven.wagon.repository.Repository;
-import org.apache.maven.wagon.shared.http.AbstractHttpClientWagon;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
 import org.w3c.dom.Node;
@@ -211,7 +210,7 @@ public class WebDavWagon
                 MultiStatus multiStatus = method.getResponseBodyAsMultiStatus();
                 MultiStatusResponse response = multiStatus.getResponses()[0];
                 DavPropertySet propertySet = response.getProperties( HttpStatus.SC_OK );
-                DavProperty property = propertySet.get( DavConstants.PROPERTY_RESOURCETYPE );
+                DavProperty<?> property = propertySet.get( DavConstants.PROPERTY_RESOURCETYPE );
                 if ( property != null )
                 {
                     Node node = (Node) property.getValue();
diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/site/apt/index.apt b/wagon-providers/wagon-webdav-jackrabbit/src/site/apt/index.apt
index d082d01..be1ce58 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/src/site/apt/index.apt
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/site/apt/index.apt
@@ -28,7 +28,7 @@
 
 Maven Wagon WebDAV
 
- This project is an implementation of Wagon provider for WebDAV server access.
+ This component is an implementation of Wagon provider for WebDAV server access.
  You will need to use at least Java 1.6 if you want to use this Wagon provider.
  
  It enables Maven to deploy artifacts and files to WebDAV enabled servers.
diff --git a/wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagonTest.java b/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/HttpClientWagonTest.java
similarity index 96%
rename from wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagonTest.java
rename to wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/HttpClientWagonTest.java
index cb2bef8..9aeeccd 100644
--- a/wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagonTest.java
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/HttpClientWagonTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.wagon.shared.http;
+package org.apache.maven.wagon.providers.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -32,10 +32,13 @@ import org.apache.maven.wagon.OutputData;
 import org.apache.maven.wagon.TransferFailedException;
 import org.apache.maven.wagon.authentication.AuthenticationException;
 import org.apache.maven.wagon.authentication.AuthenticationInfo;
+import org.apache.maven.wagon.providers.webdav.AbstractHttpClientWagon;
+import org.apache.maven.wagon.providers.webdav.HttpConfiguration;
+import org.apache.maven.wagon.providers.webdav.HttpMethodConfiguration;
 import org.apache.maven.wagon.proxy.ProxyInfo;
 import org.apache.maven.wagon.repository.Repository;
 
-public class AbstractHttpClientWagonTest
+public class HttpClientWagonTest
     extends TestCase
 {
 
diff --git a/wagon-tcks/pom.xml b/wagon-tcks/pom.xml
index 6fac3c2..4e4de7e 100644
--- a/wagon-tcks/pom.xml
+++ b/wagon-tcks/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/wagon-tcks/wagon-tck-http/pom.xml b/wagon-tcks/wagon-tck-http/pom.xml
index 824b72e..8dd88d2 100644
--- a/wagon-tcks/wagon-tck-http/pom.xml
+++ b/wagon-tcks/wagon-tck-http/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-tcks</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wagon2.git



More information about the pkg-java-commits mailing list