svn commit: r737669 - in /ant/ivy/core/trunk: CHANGES.txt doc/use/postresolvetask.html src/java/org/apache/ivy/ant/IvyPostResolveTask.java

[xa...@apache.org]

Author: xavier
Date: Mon Jan 26 10:45:12 2009
New Revision: 737669

URL: http://svn.apache.org/viewvc?rev=737669&view=rev
Log:
IMPROVEMENT: add refresh parameter to post resolve tasks (IVY-1017)

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=737669&r1=737668&r2=737669&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Mon Jan 26 10:45:12 2009
@@ -85,6 +85,7 @@
 	
    trunk
 =====================================
+- IMPROVEMENT: add refresh parameter to post resolve tasks (IVY-1017)
 - IMPROVEMENT: Remove excessive HEAD requests for URL repository (IVY-996)
 - IMPROVEMENT: add -version option on command line (IVY-1014)
 - IMPROVEMENT: support resolve refresh in command line (IVY-1013)

Modified: ant/ivy/core/trunk/doc/use/postresolvetask.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/use/postresolvetask.html?rev=737669&r1=737668&r2=737669&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/use/postresolvetask.html (original)
+++ ant/ivy/core/trunk/doc/use/postresolvetask.html Mon Jan 26 10:45:12 2009
@@ -66,6 +66,7 @@
     <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>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>
     <tr><td>file</td><td>the file to resolve if a resolve is necessary <span class="since">since 2.0</span></td><td>No. Defaults to the previous resolved Ivy file or to ${ivy.dep.file}</td></tr>
 	<tr><td>settingsRef</td><td>A reference to the ivy settings that must be used by this task <span class="since">(since 2.0)</span></td><td>No, 'ivy.instance' is taken by default.</td></tr>
 	<tr><td>resolveId</td><td>The id which was used for a previous resolve, or the resolveId if a new resolve is performed <span class="since">(since 2.0)</span></td><td>No, defaults to '[org]-[module]'.</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=737669&r1=737668&r2=737669&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 Mon Jan 26 10:45:12 2009
@@ -66,6 +66,8 @@
 
     private Boolean keep = null;
     
+    private boolean refresh = false;
+    
     private String log = ResolveOptions.LOG_DEFAULT;
 
     public boolean isUseOrigin() {
@@ -288,6 +290,7 @@
         resolve.setUseOrigin(useOrigin);
         resolve.setValidate(isValidate());
         resolve.setKeep(isKeep());
+        resolve.setRefresh(isRefresh());
         resolve.setLog(getLog());
         resolve.setSettingsRef(getSettingsRef());
         return resolve;
@@ -404,4 +407,12 @@
         return this.keep == null ? !isInline() : this.keep.booleanValue();
     }
 
+    public void setRefresh(boolean refresh) {
+        this.refresh = refresh;
+    }
+
+    public boolean isRefresh() {
+        return refresh;
+    }
+
 }