Author: jvanzyl
Date: Wed Jul 1 22:16:29 2009
New Revision: 790408
URL: http://svn.apache.org/viewvc?rev=790408&view=rev
Log:
o restored the WagonManager, the archetype system and the nexus indexer both
use this directly. doesn't matter we can now support them forever.
Added:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(with props)
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
(with props)
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
Added:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=790408&view=auto
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(added)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Wed Jul 1 22:16:29 2009
@@ -0,0 +1,11 @@
+package org.apache.maven.artifact.manager;
+
+import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.codehaus.plexus.component.annotations.Component;
+
+...@component(role=WagonManager.class)
+public class DefaultWagonManager
+ extends org.apache.maven.repository.legacy.DefaultWagonManager
+ implements WagonManager
+{
+}
Propchange:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java?rev=790408&view=auto
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
(added)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
Wed Jul 1 22:16:29 2009
@@ -0,0 +1,52 @@
+package org.apache.maven.artifact.manager;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.metadata.ArtifactMetadata;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.WagonConfigurationException;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
+import org.apache.maven.wagon.TransferFailedException;
+import org.apache.maven.wagon.UnsupportedProtocolException;
+import org.apache.maven.wagon.Wagon;
+import org.apache.maven.wagon.authentication.AuthenticationInfo;
+import org.apache.maven.wagon.events.TransferListener;
+import org.apache.maven.wagon.proxy.ProxyInfo;
+import org.apache.maven.wagon.repository.Repository;
+import org.apache.maven.wagon.repository.RepositoryPermissions;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Manages <a href="http://maven.apache.org/wagon";>Wagon</a> related
operations in Maven.
+ *
+ * @author <a href="[email protected]">Michal Maczka </a>
+ * @version $Id$
+ */
+...@deprecated
+public interface WagonManager
+ extends org.apache.maven.repository.legacy.WagonManager
+{
+}
Propchange:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java?rev=790408&r1=790407&r2=790408&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
Wed Jul 1 22:16:29 2009
@@ -645,6 +645,13 @@
}
@Deprecated
+ public Wagon getWagon( Repository repository )
+ throws UnsupportedProtocolException
+ {
+ return getWagon( repository.getProtocol() );
+ }
+
+ @Deprecated
public Wagon getWagon( String protocol )
throws UnsupportedProtocolException
{
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java?rev=790408&r1=790407&r2=790408&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
Wed Jul 1 22:16:29 2009
@@ -23,10 +23,21 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
+import org.apache.maven.wagon.UnsupportedProtocolException;
+import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.events.TransferListener;
+import org.apache.maven.wagon.repository.Repository;
public interface WagonManager
{
+ @Deprecated
+ Wagon getWagon( String protocol )
+ throws UnsupportedProtocolException;
+
+ @Deprecated
+ Wagon getWagon( Repository repository )
+ throws UnsupportedProtocolException, WagonConfigurationException;
+
//
// Retriever
//
