You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2009/08/04 23:17:09 UTC
svn commit: r800978 - in
/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo:
DependenciesReport.java dependencies/RepositoryUtils.java
Author: olamy
Date: Tue Aug 4 21:17:08 2009
New Revision: 800978
URL: http://svn.apache.org/viewvc?rev=800978&view=rev
Log:
remove extra work with logging.
Avoid use of container.getLoggerManager().
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
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/DependenciesReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java?rev=800978&r1=800977&r2=800978&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java Tue Aug 4 21:17:08 2009
@@ -220,7 +220,7 @@
}
RepositoryUtils repoUtils =
- new RepositoryUtils( getLog(), container.getLoggerManager(), wagonManager, settings,
+ new RepositoryUtils( getLog(), wagonManager, settings,
mavenProjectBuilder, factory, resolver, project.getRemoteArtifactRepositories(),
project.getPluginArtifactRepositories(), localRepository,
repositoryMetadataManager );
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=800978&r1=800977&r2=800978&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 Tue Aug 4 21:17:08 2009
@@ -19,6 +19,10 @@
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -28,7 +32,6 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
@@ -49,14 +52,8 @@
import org.apache.maven.wagon.observers.Debug;
import org.apache.maven.wagon.proxy.ProxyInfo;
import org.apache.maven.wagon.repository.Repository;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.LoggerManager;
import org.codehaus.plexus.util.StringUtils;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
/**
* Utilities methods to play with repository
*
@@ -67,8 +64,6 @@
{
private final Log log;
- private final LoggerManager loggerManager;
-
private final WagonManager wagonManager;
private final Settings settings;
@@ -85,11 +80,8 @@
private final ArtifactRepository localRepository;
- private final RepositoryMetadataManager repositoryMetadataManager;
-
/**
* @param log
- * @param loggerManager
* @param wagonManager
* @param settings
* @param mavenProjectBuilder
@@ -100,13 +92,12 @@
* @param localRepository
* @param repositoryMetadataManager
*/
- public RepositoryUtils( Log log, LoggerManager loggerManager, WagonManager wagonManager, Settings settings,
+ public RepositoryUtils( Log log, WagonManager wagonManager, Settings settings,
MavenProjectBuilder mavenProjectBuilder, ArtifactFactory factory,
ArtifactResolver resolver, List remoteRepositories, List pluginRepositories,
ArtifactRepository localRepository, RepositoryMetadataManager repositoryMetadataManager )
{
this.log = log;
- this.loggerManager = loggerManager;
this.wagonManager = wagonManager;
this.settings = settings;
this.mavenProjectBuilder = mavenProjectBuilder;
@@ -115,7 +106,6 @@
this.remoteRepositories = remoteRepositories;
this.pluginRepositories = pluginRepositories;
this.localRepository = localRepository;
- this.repositoryMetadataManager = repositoryMetadataManager;
}
/**
@@ -361,31 +351,6 @@
{
SnapshotArtifactRepositoryMetadata snapshotMetadata = (SnapshotArtifactRepositoryMetadata) m;
- // Removed not found log
- int oldThreshold = loggerManager.getThreshold();
- loggerManager.setThreshold( RepositoryMetadataManager.class.getName(), Logger.LEVEL_DISABLED );
- try
- {
- repositoryMetadataManager.resolveAlways( snapshotMetadata, localRepository, repo );
- }
- catch ( RepositoryMetadataResolutionException e )
- {
- loggerManager.setThreshold( RepositoryMetadataManager.class.getName(), oldThreshold );
- if ( log.isDebugEnabled() )
- {
- log.error( "Unable to connect to: " + repo.getUrl(), e );
- }
- else
- {
- log.error( "Unable to connect to: " + repo.getUrl() );
- }
- return repo.getUrl() + "/" + repo.pathOf( copyArtifact );
- }
- finally
- {
- loggerManager.setThreshold( RepositoryMetadataManager.class.getName(), oldThreshold );
- }
-
Metadata metadata = snapshotMetadata.getMetadata();
if ( metadata.getVersioning() == null || metadata.getVersioning().getSnapshot() == null
|| metadata.getVersioning().getSnapshot().isLocalCopy()