Return-Path: 
 <notifications-return-9596-apmail-ant-notifications-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org
Received: (qmail 98812 invoked from network); 25 Aug 2009 04:31:54 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 25 Aug 2009 04:31:54 -0000
Received: (qmail 44445 invoked by uid 500); 25 Aug 2009 04:32:19 -0000
Delivered-To: apmail-ant-notifications-archive@ant.apache.org
Received: (qmail 44361 invoked by uid 500); 25 Aug 2009 04:32:19 -0000
Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:notifications-help@ant.apache.org>
List-Unsubscribe: <mailto:notifications-unsubscribe@ant.apache.org>
List-Post: <mailto:notifications@ant.apache.org>
List-Id: <notifications.ant.apache.org>
Reply-To: dev@ant.apache.org
Delivered-To: mailing list notifications@ant.apache.org
Received: (qmail 44349 invoked by uid 99); 25 Aug 2009 04:32:18 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Aug 2009 04:32:18 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Aug 2009 04:32:17 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E240423888E4; Tue, 25 Aug 2009 04:31:56 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r807474 - in /ant/sandbox/antlibs/compress/trunk/src:
 main/org/apache/ant/compress/taskdefs/Zip.java tests/antunit/zip-test.xml
Date: Tue, 25 Aug 2009 04:31:56 -0000
To: notifications@ant.apache.org
From: bodewig@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090825043156.E240423888E4@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: bodewig
Date: Tue Aug 25 04:31:56 2009
New Revision: 807474

URL: http://svn.apache.org/viewvc?rev=807474&view=rev
Log:
port comment from core <zip>

Modified:
    ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Zip.java
    ant/sandbox/antlibs/compress/trunk/src/tests/antunit/zip-test.xml

Modified: ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Zip.java
URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Zip.java?rev=807474&r1=807473&r2=807474&view=diff
==============================================================================
--- ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Zip.java (original)
+++ ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Zip.java Tue Aug 25 04:31:56 2009
@@ -34,6 +34,7 @@
  */
 public class Zip extends ArchiveBase {
     private int level = Deflater.DEFAULT_COMPRESSION;
+    private String comment = "";
 
     public Zip() {
         setFactory(new ZipStreamFactory() {
@@ -44,6 +45,7 @@
                         (ZipArchiveOutputStream) super.getArchiveStream(stream,
                                                                         encoding);
                     o.setLevel(level);
+                    o.setComment(comment);
                     return o;
                 }
             });
@@ -86,4 +88,13 @@
     public void setLevel(int level) {
         this.level = level;
     }
+
+    /**
+     * Comment to use for archive.
+     *
+     * @param comment The content of the comment.
+     */
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
 }
\ No newline at end of file

Modified: ant/sandbox/antlibs/compress/trunk/src/tests/antunit/zip-test.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/tests/antunit/zip-test.xml?rev=807474&r1=807473&r2=807474&view=diff
==============================================================================
--- ant/sandbox/antlibs/compress/trunk/src/tests/antunit/zip-test.xml (original)
+++ ant/sandbox/antlibs/compress/trunk/src/tests/antunit/zip-test.xml Tue Aug 25 04:31:56 2009
@@ -376,4 +376,12 @@
     </au:assertTrue>
   </target>
 
+  <target name="testComment" depends="setUp">
+    <cmp:zip destfile="${output}/test.zip" comment="This is a comment">
+      <file file="${ant.file}"/>
+    </cmp:zip>
+    <!-- not sure how to test this without a new condition, checked
+         with command line zip -->
+  </target>
+
 </project>