You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wagon-commits@maven.apache.org by br...@apache.org on 2008/05/20 06:28:13 UTC

svn commit: r658097 - in /maven/wagon/branches/WAGON-109/wagon-providers: wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/ wagon-http/src/main/resources/META-INF/plexus/ wagon-webdav/src/main/java/org/apache/maven/wagon/providers/web...

Author: brett
Date: Mon May 19 21:28:12 2008
New Revision: 658097

URL: http://svn.apache.org/viewvc?rev=658097&view=rev
Log:
[WAGON-109] use plexus annotations

Removed:
    maven/wagon/branches/WAGON-109/wagon-providers/wagon-webdav/src/main/resources/
Modified:
    maven/wagon/branches/WAGON-109/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
    maven/wagon/branches/WAGON-109/wagon-providers/wagon-http/src/main/resources/META-INF/plexus/components.xml
    maven/wagon/branches/WAGON-109/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java

Modified: maven/wagon/branches/WAGON-109/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/WAGON-109/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java?rev=658097&r1=658096&r2=658097&view=diff
==============================================================================
--- maven/wagon/branches/WAGON-109/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java (original)
+++ maven/wagon/branches/WAGON-109/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java Mon May 19 21:28:12 2008
@@ -36,6 +36,7 @@
 import org.apache.commons.httpclient.HttpConnectionManager;
 import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.commons.httpclient.NTCredentials;
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.methods.GetMethod;
@@ -65,7 +66,7 @@
 
     private HttpClient client;
 
-    protected HttpConnectionManager connectionManager;
+    protected HttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager();
 
     public void openConnectionInternal()
     {

Modified: maven/wagon/branches/WAGON-109/wagon-providers/wagon-http/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/wagon/branches/WAGON-109/wagon-providers/wagon-http/src/main/resources/META-INF/plexus/components.xml?rev=658097&r1=658096&r2=658097&view=diff
==============================================================================
--- maven/wagon/branches/WAGON-109/wagon-providers/wagon-http/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/wagon/branches/WAGON-109/wagon-providers/wagon-http/src/main/resources/META-INF/plexus/components.xml Mon May 19 21:28:12 2008
@@ -19,31 +19,17 @@
 
 <component-set>
     <components>
-	  <component>
-	    <role>org.apache.commons.httpclient.HttpConnectionManager</role>
-	    <implementation>org.apache.commons.httpclient.MultiThreadedHttpConnectionManager</implementation>
-	  </component>
       <component>
         <role>org.apache.maven.wagon.Wagon</role>
         <role-hint>http</role-hint>
         <implementation>org.apache.maven.wagon.providers.http.HttpWagon</implementation>
         <instantiation-strategy>per-lookup</instantiation-strategy>
-	    <requirements>
-		  <requirement>
-		    <role>org.apache.commons.httpclient.HttpConnectionManager</role>
-		  </requirement>
-	    </requirements>
       </component>
       <component>
         <role>org.apache.maven.wagon.Wagon</role>
         <role-hint>https</role-hint>
         <implementation>org.apache.maven.wagon.providers.http.HttpWagon</implementation>
         <instantiation-strategy>per-lookup</instantiation-strategy>
-	    <requirements>
-		  <requirement>
-		    <role>org.apache.commons.httpclient.HttpConnectionManager</role>
-		  </requirement>
-	    </requirements>
       </component>
     </components>
 </component-set>

Modified: maven/wagon/branches/WAGON-109/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/WAGON-109/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java?rev=658097&r1=658096&r2=658097&view=diff
==============================================================================
--- maven/wagon/branches/WAGON-109/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java (original)
+++ maven/wagon/branches/WAGON-109/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java Mon May 19 21:28:12 2008
@@ -25,6 +25,7 @@
 import java.util.List;
 
 import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.DavException;
 import org.apache.jackrabbit.webdav.MultiStatus;
@@ -55,6 +56,10 @@
  * @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
  * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
  * @author <a href="mailto:james@atlassian.com>James William Dumay</a>
+ * 
+ * @plexus.component role="org.apache.maven.wagon.Wagon" 
+ *   role-hint="dav"
+ *   instantiation-strategy="per-lookup"
  */
 public class WebDavWagon
     extends AbstractHttpClientWagon



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