Author: maartenc
Date: Sun Apr 4 06:01:37 2010
New Revision: 930629
URL: http://svn.apache.org/viewvc?rev=930629&view=rev
Log:
- DOCUMENTATION: Added documentation of the 'changing' attribute on the
ivy:resolve Ant task (IVY-1180)
- IMPROVEMENT: Support changing="true" for inline retrieve (IVY-1180)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/doc/use/postresolvetask.html
ant/ivy/core/trunk/doc/use/resolve.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=930629&r1=930628&r2=930629&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Sun Apr 4 06:01:37 2010
@@ -107,9 +107,11 @@ for detailed view of each issue, please
=====================================
- DOCUMENTATION: Fixed several grammatical and typographic errors in
documentation (IVY-1172) (thanks to J. Lewis Muir)
- DOCUMENTATION: ivy-doc.xsl does not show configurations (IVY-1151) (thanks
to Jasper Blues)
+- DOCUMENTATION: Added documentation of the 'changing' attribute on the
ivy:resolve Ant task (IVY-1180)
- NEW: Make ivy.xml <conf description> available (IVY-1158)
+- IMPROVEMENT: Support changing="true" for inline retrieve (IVY-1180)
- IMPROVEMENT: Enhance <info/> task to access the 'publication', 'branch' and
published artifacts as ant propeties (IVY-395) (thanks to Carl Quinn)
- IMPROVEMENT: Ivy doesn't support Maven 2.0.9 'import' scope (IVY-807)
- IMPROVEMENT: resolver attribute for listmodules task (IVY-1057)
Modified: ant/ivy/core/trunk/doc/use/postresolvetask.html
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/use/postresolvetask.html?rev=930629&r1=930628&r2=930629&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/use/postresolvetask.html (original)
+++ ant/ivy/core/trunk/doc/use/postresolvetask.html Sun Apr 4 06:01:37 2010
@@ -64,6 +64,7 @@ The attributes listed are then mostly us
<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)</span></td><td>Defaults to no branch in inline
mode, nothing in standard mode.</td></tr>
+ <tr><td>changing</td><td>indicates that the module may change when
resolving in inline mode. See <a href="../concept.html#change">cache and change
management</a> for details. Ignored when resolving in standard mode. <span
class="since">(since 2.2.0)</span></td><td>No. Defaults to false.</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>keep</td><td>true to keep the results of the automatic resolve in
memory, false to discard them. When this is false, the standard ivy properties
won't be set and other postresolve-tasks (like retrieve and cachepath) won't be
able to resuse the results of this resolve!</td><td>No. defaults to false for
an inline resolve and to true in any other case</td></tr>
Modified: ant/ivy/core/trunk/doc/use/resolve.html
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/use/resolve.html?rev=930629&r1=930628&r2=930629&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/use/resolve.html (original)
+++ ant/ivy/core/trunk/doc/use/resolve.html Sun Apr 4 06:01:37 2010
@@ -133,6 +133,8 @@ After the call to this task, a reference
<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>changing</td><td>indicates that the module may change when
resolving in inline mode. See <a href="../concept.html#change">cache and change
management</a> for details. Ignored when resolving in standard mode. <span
class="since">(since 1.4)</span></td><td>No. Defaults to false.</td></tr>
+
<tr><td>type</td><td>comma separated list of accepted artifact types
(<span class="since">since 1.2</span>)</td><td>No. defaults to
${ivy.resolve.default.type.filter}</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>
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=930629&r1=930628&r2=930629&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 Sun
Apr 4 06:01:37 2010
@@ -73,6 +73,8 @@ public abstract class IvyPostResolveTask
private String resolveMode = null;
private String log = ResolveOptions.LOG_DEFAULT;
+
+ private boolean changing = false;
public boolean isUseOrigin() {
return useOrigin;
@@ -138,6 +140,7 @@ public abstract class IvyPostResolveTask
resolve.setBranch(getBranch());
resolve.setRevision(getRevision());
resolve.setInline(true);
+ resolve.setChanging(isChanging());
resolve.setConf(conf);
resolve.setResolveId(resolveId);
resolve.setTransitive(isTransitive());
@@ -420,6 +423,14 @@ public abstract class IvyPostResolveTask
public boolean isKeep() {
return this.keep == null ? !isInline() : this.keep.booleanValue();
}
+
+ public void setChanging(boolean changing) {
+ this.changing = changing;
+ }
+
+ public boolean isChanging() {
+ return this.changing;
+ }
public void setRefresh(boolean refresh) {
this.refresh = refresh;
