Author: hboutemy
Date: Sat Nov 17 05:45:21 2007
New Revision: 595949
URL: http://svn.apache.org/viewvc?rev=595949&view=rev
Log:
[MANTTASKS-97] added support for <mirrorOf>*</mirrorOf>
Added:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/test/settings-mirror-wildcard.xml
(contents, props changed)
- copied, changed from r595938,
maven/ant-tasks/trunk/src/test/settings-mirror-wildcard.xml
Modified:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml?rev=595949&r1=595948&r2=595949&view=diff
==============================================================================
--- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml (original)
+++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml Sat Nov 17
05:45:21 2007
@@ -166,11 +166,19 @@
<target name="test-deps-mirror" depends="initTaskDefs">
<delete dir="${basedir}/target/tmp"/>
- <!-- the remoteRepository specified doesn't really exist, but settings
declares an existing mirror-->
- <artifact:dependencies filesetId="mirror.fileset"
settingsFile="${basedir}/src/test/settings-mirror.xml" verbose="true">
+ <!-- the remoteRepository specified doesn't really exist, but settings
declares an existing mirror -->
+ <artifact:dependencies
settingsFile="${basedir}/src/test/settings-mirror.xml">
<dependency groupId="it.ant-tasks" artifactId="snapshotUniqueFalse"
version="2.0.7-SNAPSHOT"/>
<localRepository path="${basedir}/target/tmp"/>
<remoteRepository url="file://${basedir}/target/fake/repository"
id="fake-repository" />
+ </artifact:dependencies>
+
+ <delete dir="${basedir}/target/tmp"/>
+ <!-- the remoteRepository specified doesn't really exist, but settings
declares an existing mirror for * -->
+ <artifact:dependencies
settingsFile="${basedir}/src/test/settings-mirror-wildcard.xml">
+ <dependency groupId="it.ant-tasks" artifactId="snapshotUniqueFalse"
version="2.0.7-SNAPSHOT"/>
+ <localRepository path="${basedir}/target/tmp"/>
+ <remoteRepository url="file://${basedir}/target/fake/repository"
id="any" />
</artifact:dependencies>
</target>
Modified:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=595949&r1=595948&r2=595949&view=diff
==============================================================================
---
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
(original)
+++
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Sat Nov 17 05:45:21 2007
@@ -404,7 +404,7 @@
// As is, this could potentially cause a problem with 2 remote
repositories with different authentication info
if ( repository.getAuthentication() == null )
- {
+ {
Server server = getSettings().getServer( repository.getId() );
if ( server != null )
{
@@ -422,6 +422,10 @@
}
Mirror mirror = getSettings().getMirrorOf( repository.getId() );
+ if ( mirror == null )
+ {
+ mirror = getSettings().getMirrorOf( "*" );
+ }
if ( mirror != null )
{
repository.setUrl( mirror.getUrl() );
Copied:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/test/settings-mirror-wildcard.xml
(from r595938, maven/ant-tasks/trunk/src/test/settings-mirror-wildcard.xml)
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/test/settings-mirror-wildcard.xml?p2=maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/test/settings-mirror-wildcard.xml&p1=maven/ant-tasks/trunk/src/test/settings-mirror-wildcard.xml&r1=595938&r2=595949&rev=595949&view=diff
==============================================================================
(empty)
Propchange:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/test/settings-mirror-wildcard.xml
------------------------------------------------------------------------------
svn:eol-style = native
