From 24a54ebe78410c6a0bb508bed839809d5e34a753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <hboutemy@apache.org>
Date: Sat, 9 Feb 2013 08:25:22 +0100
Subject: [PATCH] [WAGON-388] moved code dependant on HttpComponents 3.x from
 wagon-http-shared to wagon-webdav-jackrabbit

---
 .../wagon-http-lightweight/pom.xml            | 10 -------
 wagon-providers/wagon-http-shared/pom.xml     | 30 +------------------
 .../webdav}/AbstractHttpClientWagon.java      |  2 +-
 .../providers/webdav}/HttpConfiguration.java  |  2 +-
 .../webdav}/HttpMethodConfiguration.java      |  2 +-
 .../wagon/providers/webdav/WebDavWagon.java   |  1 -
 .../webdav}/AbstractHttpClientWagonTest.java  |  5 +++-
 7 files changed, 8 insertions(+), 44 deletions(-)
 rename wagon-providers/{wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http => wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav}/AbstractHttpClientWagon.java (99%)
 rename wagon-providers/{wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http => wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav}/HttpConfiguration.java (98%)
 rename wagon-providers/{wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http => wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav}/HttpMethodConfiguration.java (99%)
 rename wagon-providers/{wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http => wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav}/AbstractHttpClientWagonTest.java (97%)

diff --git a/wagon-providers/wagon-http-lightweight/pom.xml b/wagon-providers/wagon-http-lightweight/pom.xml
index 734b792e6..9b7c69155 100644
--- a/wagon-providers/wagon-http-lightweight/pom.xml
+++ b/wagon-providers/wagon-http-lightweight/pom.xml
@@ -38,16 +38,6 @@ under the License.
       <groupId>${project.groupId}</groupId>
       <artifactId>wagon-http-shared4</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-shared/pom.xml b/wagon-providers/wagon-http-shared/pom.xml
index a1fdb3685..4a4b4ed98 100644
--- a/wagon-providers/wagon-http-shared/pom.xml
+++ b/wagon-providers/wagon-http-shared/pom.xml
@@ -30,7 +30,7 @@ under the License.
   <artifactId>wagon-http-shared</artifactId>
   <name>Apache Maven Wagon :: Providers :: HTTP Shared Library</name>
   <description>
-    Shared Library for the wagon-webdav wagon provider based on httpclient-3.x.
+    Shared Library for wagon providers supporting HTTP.
   </description>
 
   <dependencies>
@@ -50,34 +50,6 @@ under the License.
         </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>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
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 62b5c122d..e2ed2f887 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 492e24ad6..9c3e9e601 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 9bbc43321..f75269791 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 5256b8957..a545d9e28 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.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;
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/AbstractHttpClientWagonTest.java
similarity index 97%
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/AbstractHttpClientWagonTest.java
index cb2bef8a1..da55ad7c4 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/AbstractHttpClientWagonTest.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,6 +32,9 @@
 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;