maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r825301 - in /maven/maven-3/trunk: maven-compat/src/main/java/org/apache/maven/artifact/resolver/ maven-compat/src/main/java/org/apache/maven/repository/legacy/ maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/apache/...
Date Wed, 14 Oct 2009 21:48:52 GMT
Author: bentmann
Date: Wed Oct 14 21:48:51 2009
New Revision: 825301

URL: http://svn.apache.org/viewvc?rev=825301&view=rev
Log:
o Removed duplicate class

Added:
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
      - copied, changed from r825289, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/TransferListenerAdapter.java
Removed:
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/TransferListenerAdapter.java
Modified:
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java?rev=825301&r1=825300&r2=825301&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
(original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
Wed Oct 14 21:48:51 2009
@@ -588,7 +588,9 @@
     {
         try
         {
-            wagonManager.getRemoteFile( repository, destination, remotePath, new TransferListenerAdapter(
transferListener ), ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN, true );
+            wagonManager.getRemoteFile( repository, destination, remotePath,
+                                        TransferListenerAdapter.newAdapter( transferListener
),
+                                        ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN, true
);
         }
         catch ( org.apache.maven.wagon.TransferFailedException e )
         {
@@ -605,7 +607,8 @@
     {
         try
         {
-            wagonManager.putRemoteFile( repository, source, remotePath, new TransferListenerAdapter(
transferListener ) );
+            wagonManager.putRemoteFile( repository, source, remotePath,
+                                        TransferListenerAdapter.newAdapter( transferListener
) );
         }
         catch ( org.apache.maven.wagon.TransferFailedException e )
         {

Copied: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
(from r825289, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/TransferListenerAdapter.java)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java?p2=maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java&p1=maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/TransferListenerAdapter.java&r1=825289&r2=825301&rev=825301&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/TransferListenerAdapter.java
(original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
Wed Oct 14 21:48:51 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver;
+package org.apache.maven.repository.legacy;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java?rev=825301&r1=825300&r2=825301&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
Wed Oct 14 21:48:51 2009
@@ -34,12 +34,12 @@
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;
 import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
-import org.apache.maven.artifact.resolver.TransferListenerAdapter;
 import org.apache.maven.artifact.resolver.filter.CumulativeScopeArtifactFilter;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.artifact.ProjectArtifact;
 import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.TransferListenerAdapter;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=825301&r1=825300&r2=825301&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Wed Oct 14 21:48:51 2009
@@ -26,7 +26,6 @@
 import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
-import org.apache.maven.artifact.resolver.TransferListenerAdapter;
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Profile;
@@ -43,6 +42,7 @@
 import org.apache.maven.model.resolution.ModelResolver;
 import org.apache.maven.project.artifact.ProjectArtifact;
 import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.TransferListenerAdapter;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.Os;

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java?rev=825301&r1=825300&r2=825301&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
Wed Oct 14 21:48:51 2009
@@ -30,7 +30,6 @@
 import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
-import org.apache.maven.artifact.resolver.TransferListenerAdapter;
 import org.apache.maven.model.Repository;
 import org.apache.maven.model.building.FileModelSource;
 import org.apache.maven.model.building.ModelSource;
@@ -38,6 +37,7 @@
 import org.apache.maven.model.resolution.ModelResolver;
 import org.apache.maven.model.resolution.UnresolvableModelException;
 import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.TransferListenerAdapter;
 
 /**
  * Implements a model resolver backed by the Maven Repository API and the reactor.



Mime
View raw message