Return-Path: Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: (qmail 24926 invoked from network); 21 Aug 2009 04:00:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Aug 2009 04:00:37 -0000 Received: (qmail 19290 invoked by uid 500); 21 Aug 2009 04:00:56 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 19217 invoked by uid 500); 21 Aug 2009 04:00:56 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 19194 invoked by uid 99); 21 Aug 2009 04:00:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Aug 2009 04:00:56 +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; Fri, 21 Aug 2009 04:00:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0503423888E6; Fri, 21 Aug 2009 04:00:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r806414 - in /ant/sandbox/antlibs/compress/trunk/src: main/org/apache/ant/compress/taskdefs/Zip.java tests/antunit/zip-test.xml Date: Fri, 21 Aug 2009 04:00:33 -0000 To: notifications@ant.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090821040034.0503423888E6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bodewig Date: Fri Aug 21 04:00:33 2009 New Revision: 806414 URL: http://svn.apache.org/viewvc?rev=806414&view=rev Log: set default permission in zip task like the other tasks do 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=806414&r1=806413&r2=806414&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 Fri Aug 21 04:00:33 2009 @@ -20,6 +20,7 @@ import org.apache.ant.compress.util.ZipStreamFactory; import org.apache.commons.compress.archivers.ArchiveEntry; +import org.apache.commons.compress.archivers.zip.UnixStat; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; /** @@ -43,6 +44,12 @@ } else if (isDir && r.getCollectionFlags().hasDirModeBeenSet()) { ent.setUnixMode(r.getCollectionFlags().getDirMode()); + } else if (isDir) { + ent.setUnixMode(UnixStat.DIR_FLAG + | UnixStat.DEFAULT_DIR_PERM); + } else { + ent.setUnixMode(UnixStat.FILE_FLAG + | UnixStat.DEFAULT_FILE_PERM); } if (r.getResourceFlags().getZipExtraFields() != null) { 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=806414&r1=806413&r2=806414&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 Fri Aug 21 04:00:33 2009 @@ -28,7 +28,7 @@ - +