[WAGON-109] use plexus annotations
git-svn-id: https://svn.apache.org/repos/asf/maven/wagon/branches/WAGON-109@658097 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
index 383f591..10e836c 100644
--- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
+++ b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
@@ -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()
{
diff --git a/wagon-providers/wagon-http/src/main/resources/META-INF/plexus/components.xml b/wagon-providers/wagon-http/src/main/resources/META-INF/plexus/components.xml
index d01c45e..49c61e5 100644
--- a/wagon-providers/wagon-http/src/main/resources/META-INF/plexus/components.xml
+++ b/wagon-providers/wagon-http/src/main/resources/META-INF/plexus/components.xml
@@ -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>
diff --git a/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java b/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
index 33cefa1..e974ef7 100644
--- a/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
+++ b/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
@@ -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
diff --git a/wagon-providers/wagon-webdav/src/main/resources/META-INF/plexus/components.xml b/wagon-providers/wagon-webdav/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index c4346dc..0000000
--- a/wagon-providers/wagon-webdav/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,38 +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.
- -->
-
-<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>dav</role-hint>
- <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <requirements>
- <requirement>
- <role>org.apache.commons.httpclient.HttpConnectionManager</role>
- </requirement>
- </requirements>
- </component>
- </components>
-</component-set>
