ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r987071 - in /ant/antlibs/compress/tags/1_0: ./ docs/ src/main/org/apache/ant/compress/resources/ src/main/org/apache/ant/compress/taskdefs/ src/main/org/apache/ant/compress/util/ src/tests/antunit/ src/tests/resources/
Date Thu, 19 Aug 2010 08:20:48 GMT
Author: bodewig
Date: Thu Aug 19 08:20:46 2010
New Revision: 987071

URL: http://svn.apache.org/viewvc?rev=987071&view=rev
Log:
merge changes from trunk

Modified:
    ant/antlibs/compress/tags/1_0/   (props changed)
    ant/antlibs/compress/tags/1_0/docs/archives.html   (props changed)
    ant/antlibs/compress/tags/1_0/docs/compresource.html   (props changed)
    ant/antlibs/compress/tags/1_0/docs/entry.html   (props changed)
    ant/antlibs/compress/tags/1_0/docs/expand.html   (props changed)
    ant/antlibs/compress/tags/1_0/docs/fileset.html   (props changed)
    ant/antlibs/compress/tags/1_0/docs/unpack.html   (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/ArFileSet.java
  (props changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/ArResource.java
  (props changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/Archives.java
  (props changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java
  (props changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java
  (props changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/CommonsCompressCompressorResource.java
  (props changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/CpioFileSet.java
  (props changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/CpioResource.java
  (props changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/TarFileSet.java
  (props changed)
    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/ZipFileSet.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/resources/ZipScanner.java
  (props changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Ar.java   (props
changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Cpio.java   (props
changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java
  (props changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/PackBase.java
  (props changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Unar.java   (props
changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/UnpackBase.java
  (props changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Untar.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/main/org/apache/ant/compress/taskdefs/Zip.java   (props
changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java
  (props changed)
    ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/util/CompressorStreamFactory.java
  (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/antunit/antunit-base.xml   (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/archives-test.xml   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/antunit/arentry-test.xml   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/antunit/arfileset-test.xml   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/antunit/bunzip2-test.xml   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/antunit/bzip2-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/cpioentry-test.xml   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/antunit/cpiofileset-test.xml   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/antunit/gunzip-test.xml   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/antunit/gzip-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/tarentry-test.xml   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/antunit/tarfileset-test.xml   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/antunit/unar-test.xml   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/antunit/uncpio-test.xml   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/antunit/unzip-test.xml   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/antunit/zip-test.xml   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/antunit/zipentry-test.xml   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/antunit/zipfileset-test.xml   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/resources/asf-logo-huge.tar.bz2   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/resources/asf-logo.gif   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/resources/asf-logo.gif.bin.cpio   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/resources/asf-logo.gif.bz2   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/resources/asf-logo.gif.gz   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/resources/asf-logo.gif.tar   (props changed)
    ant/antlibs/compress/tags/1_0/src/tests/resources/asf-logo.gif.zip   (props changed)

Propchange: ant/antlibs/compress/tags/1_0/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Thu Aug 19 08:20:46 2010
@@ -1 +1 @@
-common -r 984383 http://svn.apache.org/repos/asf/ant/antlibs/common/trunk
+common -r 987066 http://svn.apache.org/repos/asf/ant/antlibs/common/trunk

Propchange: ant/antlibs/compress/tags/1_0/
------------------------------------------------------------------------------
    svn:mergeinfo = /ant/antlibs/compress/trunk:987018-987066

Propchange: ant/antlibs/compress/tags/1_0/docs/archives.html
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/docs/compresource.html
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/docs/entry.html
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/docs/expand.html
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/docs/fileset.html
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/docs/unpack.html
            ('svn:mergeinfo' removed)

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=987071&r1=987070&r2=987071&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:20:46 2010
@@ -18,14 +18,14 @@
 
 -->
 <ivy-module version="2.0">
-  <info organization="${ivy.organization}"
+  <info organisation="${ivy.organization}"
         module="ant"
         revision="${artifact.version}"
         publication="${publication.datetime}">
     <license name="Apache Software License 2.0"
              url="http://www.apache.org/licenses/LICENSE-2.0"/>
-    <ivy-author name="Apache Ant Development Team"
-                url="http://ant.apache.org/"/>
+    <ivyauthor name="Apache Ant Development Team"
+               url="http://ant.apache.org/"/>
     <description homepage="http://ant.apache.org/antlibs/compress/">
       Provides tasks and types that deal with AR, CPIO, TAR
       and ZIP archives as well as BZIP2 and GZIP compressed files based on
@@ -51,8 +51,8 @@
               e:classifier="ivy"/>
   </publications>
   <dependencies>
-    <dependency org="org.apache.ant" name="ant" revision="[1.8.0,)"/>
+    <dependency org="org.apache.ant" name="ant" rev="[1.8.0,)"/>
     <dependency org="org.apache.commons" name="commons-compress"
-                revision="[1.1,)"/>
+                rev="[1.1,)"/>
   </dependencies>
 </ivy-module>

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/ArFileSet.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/ArResource.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/Archives.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/CommonsCompressCompressorResource.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/CpioFileSet.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/CpioResource.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/TarFileSet.java
            ('svn:mergeinfo' removed)

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:20:46 2010
@@ -1 +1,2 @@
+/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/TarResource.java:987018-987066
 /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/ZipFileSet.java
            ('svn:mergeinfo' removed)

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:20:46 2010
@@ -1 +1,2 @@
+/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZipResource.java:987018-987066
 /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/resources/ZipScanner.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Ar.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Cpio.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/PackBase.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Unar.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/UnpackBase.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Untar.java
            ('svn:mergeinfo' removed)

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:20:46 2010
@@ -1 +1,2 @@
+/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Unzip.java:987018-987066
 /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Expand.java:815599

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Zip.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/util/CompressorStreamFactory.java
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/antunit-base.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/ar-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 19 08:20:46 2010
@@ -1 +1,2 @@
+/ant/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:987018-987066
 /ant/sandbox/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:806793

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/archives-test.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/arentry-test.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/arfileset-test.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/bunzip2-test.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/bzip2-test.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/cpio-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 19 08:20:46 2010
@@ -1 +1,2 @@
+/ant/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:987018-987066
 /ant/sandbox/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:806788

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/cpioentry-test.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/cpiofileset-test.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/gunzip-test.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/gzip-test.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/tar-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 19 08:20:46 2010
@@ -1,2 +1,3 @@
+/ant/antlibs/compress/trunk/src/tests/antunit/tar-test.xml:987018-987066
 /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/tarentry-test.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/tarfileset-test.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/unar-test.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/uncpio-test.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/unzip-test.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/zip-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 19 08:20:46 2010
@@ -1,2 +1,3 @@
+/ant/antlibs/compress/trunk/src/tests/antunit/zip-test.xml:987018-987066
 /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/zipentry-test.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/zipfileset-test.xml
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/resources/asf-logo-huge.tar.bz2
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/resources/asf-logo.gif
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/resources/asf-logo.gif.bin.cpio
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/resources/asf-logo.gif.bz2
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/resources/asf-logo.gif.gz
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/resources/asf-logo.gif.tar
            ('svn:mergeinfo' removed)

Propchange: ant/antlibs/compress/tags/1_0/src/tests/resources/asf-logo.gif.zip
            ('svn:mergeinfo' removed)



Mime
View raw message