[WAGON-388] moved code dependant on HttpComponents from

wagon-http-shared4 to wagon-http
apache · Feb 9, 2013 · 34e9c2a · 34e9c2a
1 parent 2cdb65f
commit 34e9c2a
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 36 deletions.
diff --git a/wagon-providers/wagon-http-shared4/pom.xml b/wagon-providers/wagon-http-shared4/pom.xml
@@ -30,8 +30,7 @@ under the License.
   <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.
+    Shared Library for wagon providers supporting HTTP.
   </description>
 
   <dependencies>
@@ -42,22 +41,9 @@ under the License.
       <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>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.0.1</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/wagon-providers/wagon-http/pom.xml b/wagon-providers/wagon-http/pom.xml
@@ -30,7 +30,7 @@ under the License.
   <artifactId>wagon-http</artifactId>
   <name>Apache Maven Wagon :: Providers :: HTTP Provider</name>
   <description>
-    Wagon provider 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>
 
 
@@ -49,7 +49,7 @@ under the License.
       <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 +81,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/...shared/http4/AbstractHttpClientWagon.java → ...oviders/http/AbstractHttpClientWagon.java b/...shared/http4/AbstractHttpClientWagon.java → ...oviders/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

diff --git a/...onfigurableSSLSocketFactoryDecorator.java → ...onfigurableSSLSocketFactoryDecorator.java b/...onfigurableSSLSocketFactoryDecorator.java → ...onfigurableSSLSocketFactoryDecorator.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/shared/http4/HttpConfiguration.java → ...gon/providers/http/HttpConfiguration.java b/...wagon/shared/http4/HttpConfiguration.java → ...gon/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/...shared/http4/HttpMethodConfiguration.java → ...oviders/http/HttpMethodConfiguration.java b/...shared/http4/HttpMethodConfiguration.java → ...oviders/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/...n-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java b/...n-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
@@ -26,7 +26,6 @@
 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 java.io.IOException;

diff --git a/...shared/http4/RelaxedX509TrustManager.java → ...oviders/http/RelaxedX509TrustManager.java b/...shared/http4/RelaxedX509TrustManager.java → ...oviders/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/...ed/http4/AbstractHttpClientWagonTest.java → ...ers/http/AbstractHttpClientWagonTest.java b/...ed/http4/AbstractHttpClientWagonTest.java → ...ers/http/AbstractHttpClientWagonTest.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
@@ -27,6 +27,9 @@
 import org.apache.http.params.HttpParams;
 import org.apache.maven.wagon.OutputData;
 import org.apache.maven.wagon.TransferFailedException;
+import org.apache.maven.wagon.providers.http.AbstractHttpClientWagon;
+import org.apache.maven.wagon.providers.http.HttpConfiguration;
+import org.apache.maven.wagon.providers.http.HttpMethodConfiguration;
 
 public class AbstractHttpClientWagonTest
     extends TestCase

diff --git a/...gon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonPreemptiveTest.java b/...gon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonPreemptiveTest.java
@@ -20,8 +20,6 @@
  */
 
 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@dimatics.com">Michal Maczka</a>

diff --git a/...oviders/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java b/...oviders/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
@@ -24,8 +24,6 @@
 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;
 

diff --git a/.../wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTimeoutTest.java b/.../wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTimeoutTest.java
@@ -23,8 +23,6 @@
 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/...on-http/src/test/java/org/apache/maven/wagon/providers/http/HttpsWagonPreemptiveTest.java b/...on-http/src/test/java/org/apache/maven/wagon/providers/http/HttpsWagonPreemptiveTest.java
@@ -20,8 +20,6 @@
  */
 
 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;