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

[carlos]

Author: carlos
Date: Wed May  1 01:07:40 2013
New Revision: 1477896

URL: http://svn.apache.org/r1477896
Log:
[MANTTASKS-174] Mirror declaration replaces repository url when deploying

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/DeployTask.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?rev=1477896&r1=1477895&r2=1477896&view=diff
==============================================================================
--- 
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
 Wed May  1 01:07:40 2013
@@ -425,14 +425,21 @@ public abstract class AbstractArtifactTa
         // TODO: actually, we need to not funnel this through the ant 
repository - we should pump settings into wagon
         // manager at the start like m2 does, and then match up by repository 
id
         // As is, this could potentially cause a problem with 2 remote 
repositories with different authentication info
+        updateRepositoryMirror( repository );
+        updateRepositoryAuthentication( repository );
+        updateRepositoryProxy( repository );
+    }
 
+    protected void updateRepositoryMirror(RemoteRepository repository) {
         Mirror mirror = getMirror( getSettings().getMirrors(), repository );
         if ( mirror != null )
         {
             repository.setUrl( mirror.getUrl() );
             repository.setId( mirror.getId() );
         }
+    }
 
+    protected void updateRepositoryAuthentication(RemoteRepository repository) 
{
         if ( repository.getAuthentication() == null )
         {
             Server server = getSettings().getServer( repository.getId() );
@@ -443,21 +450,23 @@ public abstract class AbstractArtifactTa
                 String password = authentication.getPassword();
                 
                 if (password != null) {
-                                       try {
-                                               SecDispatcher 
securityDispatcher = (SecDispatcher) container.lookup(SecDispatcher.ROLE);
-                                               password = 
securityDispatcher.decrypt(password);
-                                               
authentication.setPassword(password);
-                                       } catch (SecDispatcherException e) {
-                                               log(e, Project.MSG_ERR);
-                                       } catch (ComponentLookupException e) {
-                                               log(e, Project.MSG_ERR);
-                                       }
+                    try {
+                        SecDispatcher securityDispatcher = (SecDispatcher) 
container.lookup(SecDispatcher.ROLE);
+                        password = securityDispatcher.decrypt(password);
+                        authentication.setPassword(password);
+                    } catch (SecDispatcherException e) {
+                        log(e, Project.MSG_ERR);
+                    } catch (ComponentLookupException e) {
+                        log(e, Project.MSG_ERR);
+                    }
                 }
                 
-                               repository.addAuthentication( authentication );
+                repository.addAuthentication( authentication );
             }
         }
+    }
 
+    protected void updateRepositoryProxy(RemoteRepository repository) {
         if ( repository.getProxy() == null )
         {
             org.apache.maven.settings.Proxy proxy = 
getSettings().getActiveProxy();

Modified: 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java
URL: 
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java?rev=1477896&r1=1477895&r2=1477896&view=diff
==============================================================================
--- 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java
 (original)
+++ 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java
 Wed May  1 01:07:40 2013
@@ -59,7 +59,8 @@ public class DeployTask
             repository.setId( "remote" );
         }
 
-        updateRepositoryWithSettings( repository );
+        updateRepositoryAuthentication( repository );
+        updateRepositoryProxy( repository );
 
         ArtifactRepositoryLayout repositoryLayout =
             (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, 
repository.getLayout() );