svn commit: r675907 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java

[vs...@apache.org]

Author: vsiveton
Date: Fri Jul 11 03:28:10 2008
New Revision: 675907

URL: http://svn.apache.org/viewvc?rev=675907&view=rev
Log:
o updated code due to wagon:1.0-beta-3
o make wagon debug mode available only if Maven debug mode is enabled

Modified:
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java?rev=675907&r1=675906&r2=675907&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java Fri Jul 11 03:28:10 2008
@@ -21,6 +21,7 @@
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.manager.WagonConfigurationException;
 import org.apache.maven.artifact.manager.WagonManager;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
@@ -124,29 +125,42 @@
         resolver.resolve( artifact, remoteRepositories, localRepository );
     }
 
+    /**
+     * @param repo not null
+     * @param artifact not null
+     * @return <code>true</code> if the artifact exists in the given repo, <code>false</ccode> otherwise
+     */
     public boolean dependencyExistsInRepo( ArtifactRepository repo, Artifact artifact )
     {
-        Wagon wagon;
+        String id = repo.getId();
+        Repository repository = new Repository( id, repo.getUrl() );
 
+        Wagon wagon;
         try
         {
-            wagon = wagonManager.getWagon( repo.getProtocol() );
+            wagon = wagonManager.getWagon( repository );
         }
         catch ( UnsupportedProtocolException e )
         {
             log.error( "Unsupported protocol: '" + repo.getProtocol() + "'", e );
             return false;
         }
+        catch ( WagonConfigurationException e )
+        {
+            log.error( "Unsupported protocol: '" + repo.getProtocol() + "'", e );
+            return false;
+        }
 
-        try
+        if ( log.isDebugEnabled() )
         {
             Debug debug = new Debug();
 
             wagon.addSessionListener( debug );
             wagon.addTransferListener( debug );
+        }
 
-            String id = repo.getId();
-            Repository repository = new Repository( id, repo.getUrl() );
+        try
+        {
             AuthenticationInfo auth = wagonManager.getAuthenticationInfo( repo.getId() );
 
             ProxyInfo proxyInfo = getProxyInfo( settings );
@@ -158,6 +172,7 @@
             {
                 wagon.connect( repository, auth );
             }
+
             return ( wagon.resourceExists( repo.pathOf( artifact ) ) );
         }
         catch ( ConnectionException e )