Return-Path: Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: (qmail 34136 invoked from network); 19 Aug 2010 08:48:28 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 19 Aug 2010 08:48:28 -0000 Received: (qmail 11257 invoked by uid 500); 19 Aug 2010 08:48:28 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 11182 invoked by uid 500); 19 Aug 2010 08:48:26 -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 11171 invoked by uid 99); 19 Aug 2010 08:48:26 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Aug 2010 08:48:26 +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; Thu, 19 Aug 2010 08:48:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2C07523889B9; Thu, 19 Aug 2010 08:46:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r987079 - in /ant/antlibs/compress/tags/1_0: ./ src/main/org/apache/ant/compress/resources/ src/main/org/apache/ant/compress/taskdefs/ src/tests/antunit/ Date: Thu, 19 Aug 2010 08:46:50 -0000 To: notifications@ant.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100819084650.2C07523889B9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bodewig Date: Thu Aug 19 08:46:49 2010 New Revision: 987079 URL: http://svn.apache.org/viewvc?rev=987079&view=rev Log: complete merge Modified: ant/antlibs/compress/tags/1_0/ (props changed) ant/antlibs/compress/tags/1_0/project-template.ivy.xml ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/TarResource.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/ZipResource.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Unzip.java (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/ar-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/cpio-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/tar-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/zip-test.xml (props changed) Propchange: ant/antlibs/compress/tags/1_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1 +1 @@ -/ant/antlibs/compress/trunk:987018-987066 +/ant/antlibs/compress/trunk:987018-987066,987068 Modified: ant/antlibs/compress/tags/1_0/project-template.ivy.xml URL: http://svn.apache.org/viewvc/ant/antlibs/compress/tags/1_0/project-template.ivy.xml?rev=987079&r1=987078&r2=987079&view=diff ============================================================================== --- ant/antlibs/compress/tags/1_0/project-template.ivy.xml (original) +++ ant/antlibs/compress/tags/1_0/project-template.ivy.xml Thu Aug 19 08:46:49 2010 @@ -51,8 +51,7 @@ e:classifier="ivy"/> - + rev="1.1"/> Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/TarResource.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,2 +1,2 @@ -/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/TarResource.java:987018-987066 +/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/TarResource.java:987018-987066,987068 /ant/core/trunk/src/main/org/apache/tools/ant/types/resources/TarResource.java:806035 Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/ZipResource.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,2 +1,2 @@ -/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZipResource.java:987018-987066 +/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZipResource.java:987018-987066,987068 /ant/core/trunk/src/main/org/apache/tools/ant/types/resources/ZipResource.java:806035 Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Unzip.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,2 +1,2 @@ -/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Unzip.java:987018-987066 +/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Unzip.java:987018-987066,987068 /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Expand.java:815599 Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/ar-test.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,2 +1,2 @@ -/ant/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:987018-987066 +/ant/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:987018-987066,987068 /ant/sandbox/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:806793 Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/cpio-test.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,2 +1,2 @@ -/ant/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:987018-987066 +/ant/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:987018-987066,987068 /ant/sandbox/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:806788 Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/tar-test.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,3 +1,3 @@ -/ant/antlibs/compress/trunk/src/tests/antunit/tar-test.xml:987018-987066 +/ant/antlibs/compress/trunk/src/tests/antunit/tar-test.xml:987018-987066,987068 /ant/sandbox/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:806788 /ant/sandbox/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:806793 Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/zip-test.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,3 +1,3 @@ -/ant/antlibs/compress/trunk/src/tests/antunit/zip-test.xml:987018-987066 +/ant/antlibs/compress/trunk/src/tests/antunit/zip-test.xml:987018-987066,987068 /ant/sandbox/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:806788 /ant/sandbox/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:806793