Author: brett
Date: Tue Jun 7 19:10:26 2005
New Revision: 189493
URL: http://svn.apache.org/viewcvs?rev=189493&view=rev
Log:
PR: MNG-440
add mirrors support
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=189493&r1=189492&r2=189493&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
(original)
+++
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Tue Jun 7 19:10:26 2005
@@ -21,6 +21,7 @@
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
+import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -199,6 +200,10 @@
protected RemoteRepository createAntRemoteRepository(
org.apache.maven.model.Repository pomRepository )
{
+ // 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
+
RemoteRepository r = new RemoteRepository();
r.setUrl( pomRepository.getUrl() );
r.setSnapshotPolicy( pomRepository.getSnapshotPolicy() );
@@ -215,6 +220,9 @@
{
r.addProxy( new Proxy( proxy ) );
}
+
+ Mirror mirror = getSettings().getMirrorOf( pomRepository.getId() );
+ r.setUrl( mirror.getUrl() );
return r;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
