ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maart...@apache.org
Subject svn commit: r1071440 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/plugins/resolver/packager/PackagerCacheEntry.java src/java/org/apache/ivy/plugins/resolver/packager/build.xml src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl
Date Wed, 16 Feb 2011 23:20:53 GMT
Author: maartenc
Date: Wed Feb 16 23:20:53 2011
New Revision: 1071440

URL: http://svn.apache.org/viewvc?rev=1071440&view=rev
Log:
FIX: quiet="true" does not surpress download 'dots' on packager resolver (IVY-1269)

Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/packager/PackagerCacheEntry.java
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/packager/build.xml
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=1071440&r1=1071439&r2=1071440&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Wed Feb 16 23:20:53 2011
@@ -123,6 +123,7 @@ for detailed view of each issue, please 
 - IMPROVEMENT: Improve diagnostics in ssh resolver (IVY-1267) (thanks to Stepan Koltsov)
 - IMPROVEMENT: ivy:retrieve can now convert 'dotted'-organisation names into a directory
tree.
 
+- FIX: quiet="true" does not surpress download 'dots' on packager resolver (IVY-1269)
 - FIX: Dynamic version resolution result can be incorrect when ivy metadata contains extra
attributes (IVY-1236)
 - FIX: NullPointerException in FileUtil#forceDelete.
 - FIX: XmlModuleDescriptorUpdater is a mess that produces broken xmls in many cases (IVY-1010)

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/packager/PackagerCacheEntry.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/packager/PackagerCacheEntry.java?rev=1071440&r1=1071439&r2=1071440&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/packager/PackagerCacheEntry.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/packager/PackagerCacheEntry.java
Wed Feb 16 23:20:53 2011
@@ -146,6 +146,7 @@ public class PackagerCacheEntry {
             project.setUserProperty("ivy.packager.validate", "true");
         }
         project.setUserProperty("ivy.packager.restricted", "" + this.restricted);
+        project.setUserProperty("ivy.packager.quiet", String.valueOf(quiet));
         if (properties != null) {
             for (Iterator it = properties.entrySet().iterator(); it.hasNext();) {
                 Entry entry = (Entry) it.next();

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/packager/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/packager/build.xml?rev=1071440&r1=1071439&r2=1071440&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/packager/build.xml (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/packager/build.xml Wed Feb
16 23:20:53 2011
@@ -46,6 +46,7 @@
         <xslt style="packager.xsl" in="packager.xml" out="packager-output.xml">
             <param name="resourceURL" expression="${resourceURL}"/>
             <param name="restricted" expression="${ivy.packager.restricted}"/>
+        	<param name="quiet" expression="${ivy.packager.quiet}"/>
         </xslt>
     </target>
 

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl?rev=1071440&r1=1071439&r2=1071440&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl Wed
Feb 16 23:20:53 2011
@@ -22,6 +22,7 @@
 
     <xsl:param name="resourceURL"/>
     <xsl:param name="restricted"/>
+    <xsl:param name="quiet"/>
 
     <xsl:variable name="maven2repo" select="'http://repo1.maven.org/maven2/'"/>
 
@@ -362,7 +363,7 @@
         <!-- Attempt download using this URL; allow download to fail if this is not the
last URL -->
         <target name="download.{$index}.{generate-id()}" depends="checkdownload.{$index
- 1}.{generate-id()}"
           unless="alreadydownloaded.{generate-id()}">
-            <get src="{$url}" dest="{$destfile}" verbose="true" ignoreerrors="{string(not($isLastURL))}"/>
+            <get src="{$url}" dest="{$destfile}" verbose="{string($quiet = 'false')}"
ignoreerrors="{string(not($isLastURL))}"/>
         </target>
 
         <!-- Check whether download attempt was successful -->



Mime
View raw message