svn commit: r541911 - in /maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant: AbstractArtifactTask.java InstallWagonProviderTask.java

[jv...@apache.org]

Author: jvanzyl
Date: Sat May 26 09:16:33 2007
New Revision: 541911

URL: http://svn.apache.org/viewvc?view=rev&rev=541911
Log:
MANTASKS-15 fix wagon ssh usage
Submitted by: Herve Boutemy

Modified:
    maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
    maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java

Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?view=diff&rev=541911&r1=541910&r2=541911
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Sat May 26 09:16:33 2007
@@ -35,6 +35,7 @@
 import org.apache.maven.settings.Settings;
 import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
 import org.apache.maven.usability.diagnostics.ErrorDiagnostics;
+import org.apache.maven.wagon.Wagon;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
@@ -52,6 +53,10 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Base class for artifact tasks.
@@ -388,7 +393,31 @@
 
         return pom;
     }
+    
+    public String[] getSupportedProtocols()
+    {
+        try
+        {
+            Map wagonMap = getContainer().lookupMap( Wagon.ROLE );
+            List protocols = new ArrayList();
+            for ( Iterator iter = wagonMap.entrySet().iterator(); iter.hasNext(); )
+            {
+                Map.Entry entry = (Map.Entry) iter.next();
+                protocols.add( entry.getKey() );
+            }
+            return (String[]) protocols.toArray( new String[protocols.size()] );
+        }
+        catch ( ComponentLookupException e )
+        {
+            throw new BuildException( "Unable to lookup Wagon providers", e );
+        }
+    }
 
+    public String getSupportedProtocolsAsString()
+    {
+        return StringUtils.join( getSupportedProtocols(), ", " );
+    }
+    
     public void diagnoseError( Throwable error )
     {
         try

Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java?view=diff&rev=541911&r1=541910&r2=541911
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java Sat May 26 09:16:33 2007
@@ -32,8 +32,8 @@
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.project.artifact.MavenMetadataSource;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
 import org.codehaus.plexus.PlexusContainerException;
-
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -129,6 +129,8 @@
         {
             throw new BuildException( "Unable to locate wagon provider in remote repository", e );
         }
+        
+        log( "Protocols now supported: " + getSupportedProtocolsAsString(), Project.MSG_VERBOSE );
     }
 
 }