Author: hboutemy
Date: Sat Nov 17 03:48:29 2007
New Revision: 595938
URL: http://svn.apache.org/viewvc?rev=595938&view=rev
Log:
[MANTTASKS-97] added support for <mirrorOf>*</mirrorOf>
Added:
maven/ant-tasks/trunk/src/test/settings-mirror-wildcard.xml (with props)
Modified:
maven/ant-tasks/trunk/sample.build.xml
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Modified: maven/ant-tasks/trunk/sample.build.xml
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/sample.build.xml?rev=595938&r1=595937&r2=595938&view=diff
==============================================================================
--- maven/ant-tasks/trunk/sample.build.xml (original)
+++ maven/ant-tasks/trunk/sample.build.xml Sat Nov 17 03:48:29 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/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=595938&r1=595937&r2=595938&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
Sat Nov 17 03:48:29 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() );
Added: maven/ant-tasks/trunk/src/test/settings-mirror-wildcard.xml
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/test/settings-mirror-wildcard.xml?rev=595938&view=auto
==============================================================================
--- maven/ant-tasks/trunk/src/test/settings-mirror-wildcard.xml (added)
+++ maven/ant-tasks/trunk/src/test/settings-mirror-wildcard.xml Sat Nov 17
03:48:29 2007
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<settings xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd";>
+ <mirrors>
+ <mirror>
+ <id>wildcard</id>
+ <url>file:./src/test/repo</url>
+ <mirrorOf>*</mirrorOf>
+ </mirror>
+ </mirrors>
+</settings>
\ No newline at end of file
Propchange: maven/ant-tasks/trunk/src/test/settings-mirror-wildcard.xml
------------------------------------------------------------------------------
svn:eol-style = native
