Author: maartenc
Date: Wed Jul 1 23:00:23 2009
New Revision: 790415
URL: http://svn.apache.org/viewvc?rev=790415&view=rev
Log:
IMPROVEMENT: Retrieve ant task doesn't support dynamic resolve mode (IVY-1085)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/doc/use/postresolvetask.html
ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=790415&r1=790414&r2=790415&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Wed Jul 1 23:00:23 2009
@@ -97,6 +97,7 @@
- NEW: configuration groups (IVY-1097)
- NEW: added built-in versionmatcher: 'Version Pattern Matcher' (IVY-871)
+- IMPROVEMENT: Retrieve ant task doesn't support dynamic resolve mode
(IVY-1085)
- IMPROVEMENT: Added support for NTLM authentication (IVY-1094) (thanks to
Mathieu Anquetin)
- IMPROVEMENT: Standalone runner should accept all the same parameters as ant
tasks (IVY-1090)
- IMPROVEMENT: Pre and post retrieve artifact events (IVY-1084)
Modified: ant/ivy/core/trunk/doc/use/postresolvetask.html
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/use/postresolvetask.html?rev=790415&r1=790414&r2=790415&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/use/postresolvetask.html (original)
+++ ant/ivy/core/trunk/doc/use/postresolvetask.html Wed Jul 1 23:00:23 2009
@@ -63,8 +63,9 @@
<tr><td>organisation</td><td>the organisation of the module to retrieve.
This usually doesn't need to be set since it defaults to the last resolved one,
except for inline mode where it is required.</td><td>Yes in inline mode,
otherwise no, it then defaults to last resolved module name</td></tr>
<tr><td>module</td><td>the name of the module to retrieve. This usually
doesn't need to be set since it defaults to the last resolved one, except for
inline mode where it is required.</td><td>Yes in inline mode, otherwise no, it
then defaults to last resolved module name</td></tr>
<tr><td>revision</td><td>the revision constraint of the module to
retrieve. Used only in inline mode. <span class="since">since
1.4</span></td><td>No. Defaults to latest.integration</td></tr>
- <tr><td>branch</td><td>the name of the branch to resolve in inline mode
<span class="since">(since 2.1.0)</span></td><td>Defaults to no branch in
inline mode, nothing in standard mode.</td></tr>
+ <tr><td>branch</td><td>the name of the branch to resolve in inline mode
<span class="since">(since 2.1)</span></td><td>Defaults to no branch in inline
mode, nothing in standard mode.</td></tr>
<tr><td>transitive</td><td>true to resolve dependencies transitively,
false otherwise <span class="since">since 1.4</span></td><td>No. Defaults to
true</td></tr>
+ <tr><td>resolveMode</td><td>the [[ant:resolve resolve mode]] to use when
an automatic resolve is triggered <span class="since">(since
2.1)</span></td><td>No. defaults to using the resolve mode set in the
[[settings settings]]</td></tr>
<tr><td>haltonfailure</td><td>true to halt the build on ivy failure, false
to continue</td><td>No. Defaults to true</td></tr>
<tr><td>validate</td><td>true to force ivy files validation against
ivy.xsd, false to force no validation</td><td>No. Defaults to default ivy value
(as configured in configuration file)</td></tr>
<tr><td>refresh</td><td>true to force Ivy to resolve dynamic revision in
this resolve process, false to use cached resolved revision <span
class="since">since 2.1</span></td><td>No. defaults to false</td></tr>
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java?rev=790415&r1=790414&r2=790415&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java Wed
Jul 1 23:00:23 2009
@@ -57,7 +57,7 @@
private String revision = "latest.integration";
private String resolveId;
-
+
private String type;
private File file;
@@ -70,6 +70,8 @@
private boolean refresh = false;
+ private String resolveMode = null;
+
private String log = ResolveOptions.LOG_DEFAULT;
public boolean isUseOrigin() {
@@ -296,6 +298,7 @@
resolve.setRefresh(isRefresh());
resolve.setLog(getLog());
resolve.setSettingsRef(getSettingsRef());
+ resolve.setResolveMode(getResolveMode());
return resolve;
}
@@ -425,5 +428,12 @@
public boolean isRefresh() {
return refresh;
}
+
+ public String getResolveMode() {
+ return resolveMode;
+ }
+ public void setResolveMode(String resolveMode) {
+ this.resolveMode = resolveMode;
+ }
}
