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 ae5d720f8..4b810ff42 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 @@ -18,9 +18,12 @@ */ package org.apache.maven.wagon.providers.http; +import javax.inject.Named; + import org.apache.maven.wagon.shared.http.AbstractHttpClientWagon; /** * @author Michal Maczka */ +@Named("http") public class HttpWagon extends AbstractHttpClientWagon {} diff --git a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpsWagon.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpsWagon.java new file mode 100644 index 000000000..8cf36d979 --- /dev/null +++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpsWagon.java @@ -0,0 +1,27 @@ +/* + * 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. + */ +package org.apache.maven.wagon.providers.http; + +import javax.inject.Named; + +/** + * Publishes {@link HttpWagon} under the https protocol. + */ +@Named("https") +public class HttpsWagon extends HttpWagon {} 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 deleted file mode 100644 index 49c61e51c..000000000 --- a/wagon-providers/wagon-http/src/main/resources/META-INF/plexus/components.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - org.apache.maven.wagon.Wagon - http - org.apache.maven.wagon.providers.http.HttpWagon - per-lookup - - - org.apache.maven.wagon.Wagon - https - org.apache.maven.wagon.providers.http.HttpWagon - per-lookup - - - diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavHttpWagon.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavHttpWagon.java new file mode 100644 index 000000000..3d97e893e --- /dev/null +++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavHttpWagon.java @@ -0,0 +1,27 @@ +/* + * 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. + */ +package org.apache.maven.wagon.providers.webdav; + +import javax.inject.Named; + +/** + * Publishes {@link WebDavWagon} under the dav+http protocol. + */ +@Named("dav+http") +public class WebDavHttpWagon extends WebDavWagon {} diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavHttpsWagon.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavHttpsWagon.java new file mode 100644 index 000000000..650f512dd --- /dev/null +++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavHttpsWagon.java @@ -0,0 +1,27 @@ +/* + * 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. + */ +package org.apache.maven.wagon.providers.webdav; + +import javax.inject.Named; + +/** + * Publishes {@link WebDavWagon} under the dav+https protocol. + */ +@Named("dav+https") +public class WebDavHttpsWagon extends WebDavWagon {} 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 7c3eb3da0..49ef3625e 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 @@ -18,6 +18,8 @@ */ package org.apache.maven.wagon.providers.webdav; +import javax.inject.Named; + import java.io.File; import java.io.IOException; import java.net.URLDecoder; @@ -54,6 +56,7 @@ * @author Carlos Sanchez * @author James William Dumay */ +@Named("dav") public class WebDavWagon extends AbstractHttpClientWagon { protected static final String CONTINUE_ON_FAILURE_PROPERTY = "wagon.webdav.continueOnFailure"; diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavsWagon.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavsWagon.java new file mode 100644 index 000000000..f3bf12cd8 --- /dev/null +++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavsWagon.java @@ -0,0 +1,27 @@ +/* + * 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. + */ +package org.apache.maven.wagon.providers.webdav; + +import javax.inject.Named; + +/** + * Publishes {@link WebDavWagon} under the davs protocol. + */ +@Named("davs") +public class WebDavsWagon extends WebDavWagon {} diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/resources/META-INF/plexus/components.xml b/wagon-providers/wagon-webdav-jackrabbit/src/main/resources/META-INF/plexus/components.xml deleted file mode 100644 index c2a53db47..000000000 --- a/wagon-providers/wagon-webdav-jackrabbit/src/main/resources/META-INF/plexus/components.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - org.apache.maven.wagon.Wagon - dav - org.apache.maven.wagon.providers.webdav.WebDavWagon - per-lookup - <p>WebDavWagon</p> -<p/> -<p>Allows using a WebDAV remote repository for downloads and deployments</p> - false - - - org.apache.maven.wagon.Wagon - davs - org.apache.maven.wagon.providers.webdav.WebDavWagon - per-lookup - <p>WebDavWagon</p> -<p/> -<p>Allows using a WebDAV remote repository for downloads and deployments</p> - false - - - org.apache.maven.wagon.Wagon - dav+http - org.apache.maven.wagon.providers.webdav.WebDavWagon - per-lookup - <p>WebDavWagon</p> -<p/> -<p>Allows using a WebDAV remote repository for downloads and deployments</p> - false - - - org.apache.maven.wagon.Wagon - dav+https - org.apache.maven.wagon.providers.webdav.WebDavWagon - per-lookup - <p>WebDavWagon</p> -<p/> -<p>Allows using a webdav remote repository for downloads and deployments</p> - false - - -