You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2013/12/24 15:15:21 UTC
svn commit: r1553276 - in /ant/antlibs/compress/trunk: ./ docs/
src/main/org/apache/ant/compress/ 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...
Author: bodewig
Date: Tue Dec 24 14:15:21 2013
New Revision: 1553276
URL: http://svn.apache.org/r1553276
Log:
Read-Only support for traditional Unix compress (.Z) format
Added:
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZResource.java
- copied, changed from r1553273, ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/LZMAResource.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnZ.java
- copied, changed from r1553273, ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnLZMA.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ZStreamFactory.java
- copied, changed from r1553273, ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java
ant/antlibs/compress/trunk/src/tests/antunit/unz-test.xml
- copied, changed from r1553273, ant/antlibs/compress/trunk/src/tests/antunit/unlzma-test.xml
ant/antlibs/compress/trunk/src/tests/antunit/zresource-test.xml
- copied, changed from r1553273, ant/antlibs/compress/trunk/src/tests/antunit/lzmaresource-test.xml
ant/antlibs/compress/trunk/src/tests/resources/asf-logo.gif.Z (with props)
Modified:
ant/antlibs/compress/trunk/changes.xml
ant/antlibs/compress/trunk/docs/compresource.html
ant/antlibs/compress/trunk/docs/index.html
ant/antlibs/compress/trunk/docs/unpack.html
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/antlib.xml
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java
Modified: ant/antlibs/compress/trunk/changes.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/changes.xml?rev=1553276&r1=1553275&r2=1553276&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/changes.xml (original)
+++ ant/antlibs/compress/trunk/changes.xml Tue Dec 24 14:15:21 2013
@@ -38,6 +38,10 @@
</properties>
<release version="1.4" date="unreleased">
+ <action type="add">
+ Read-only support for tradional Unix Compress (.Z) has been
+ added.
+ </action>
</release>
<release version="1.3" date="2013-11-07">
Modified: ant/antlibs/compress/trunk/docs/compresource.html
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/docs/compresource.html?rev=1553276&r1=1553275&r2=1553276&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/docs/compresource.html (original)
+++ ant/antlibs/compress/trunk/docs/compresource.html Tue Dec 24 14:15:21 2013
@@ -154,3 +154,24 @@
some-archive.tar.xz where the <code>xzresource</code> provides
the decompression of the archive.</p>
+<h2><a name="zresource">zresource</a></h2>
+
+<p><em>Since Apache Compress Antlib 1.4</em>.</p>
+
+<p>This is a <a href="#compresource">compressed resource</a> using the
+ traditional Unix compress (.Z) compression.</p>
+
+<h4>Examples</h4>
+
+<pre>
+<cmp:tarentry xmlns:cmp="antlib:org.apache.ant.compress"
+ name="some-file.txt">
+ <cmp:zresource>
+ <file file="some-archive.tar.Z"/>
+ </cmp:zresource>
+</cmp:tarentry>
+</pre>
+
+<p>Represents the entry named some-file.txt in archive
+ some-archive.tar.gz where the <code>zresource</code> provides
+ the decompression of the archive.</p>
Modified: ant/antlibs/compress/trunk/docs/index.html
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/docs/index.html?rev=1553276&r1=1553275&r2=1553276&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/docs/index.html (original)
+++ ant/antlibs/compress/trunk/docs/index.html Tue Dec 24 14:15:21 2013
@@ -29,9 +29,9 @@
compression/uncompression and archival/unarchival capabilities
based on <a href="http://commons.apache.org/compress/">Apache
Commons Compress</a>. Using Apache Commons Compress 1.6 this
- Antlib supports gzip, bzip2, lzma standalone, xz and pack200
+ Antlib supports gzip, bzip2, lzma standalone, xz, .Z and pack200
compression and ar, arj, cpio, 7z, Unix dump, tar and zip
- archives. Support for lzma, arj and dump is read-only. 7z can
+ archives. Support for lzma, arj, .Z and dump is read-only. 7z can
only be used on filesystem resources.</p>
<h3>Known Limitations</h3>
@@ -64,6 +64,7 @@
<li><a href="unpack.html#unpack200">unpack200</a></li>
<li><a href="expand.html#untar">untar</a></li>
<li><a href="unpack.html#unxz">unxz</a></li>
+ <li><a href="unpack.html#unz">unz</a></li>
<li><a href="expand.html#unzip">unzip</a></li>
<li><a href="pack.html#xz">xz</a></li>
<li><a href="archive.html#zip">zip</a></li>
@@ -92,6 +93,7 @@
<li><a href="compresource.html#xzresource">xzresource</a></li>
<li><a href="entry.html#zipentry">zipentry</a></li>
<li><a href="fileset.html#zipfileset">zipfileset</a></li>
+ <li><a href="compresource.html#zresource">zresource</a></li>
</ul>
<p>This Antlib contains the following conditions that work on the
Modified: ant/antlibs/compress/trunk/docs/unpack.html
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/docs/unpack.html?rev=1553276&r1=1553275&r2=1553276&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/docs/unpack.html (original)
+++ ant/antlibs/compress/trunk/docs/unpack.html Tue Dec 24 14:15:21 2013
@@ -163,6 +163,11 @@ resource collection</h4>
the <a href="#decompressConcatenated">decompressConcatenated</a>
attribute.</p>
+<h3><a name="unz">UnZ</a></h3>
+
+<p>Is an <a href="#unpack">uncompressing task</a> that uses the .Z
+ compression algorithm.</p>
+
<h3>Examples</h3>
<blockquote><pre>
<cmp:gunzip src="test.tar.gz" xmlns:cmp="antlib:org.apache.ant.compress"/>
Modified: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/antlib.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/antlib.xml?rev=1553276&r1=1553275&r2=1553276&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/antlib.xml (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/antlib.xml Tue Dec 24 14:15:21 2013
@@ -81,6 +81,10 @@
classname="org.apache.ant.compress.taskdefs.UnXZ"
/>
<taskdef
+ name="unz"
+ classname="org.apache.ant.compress.taskdefs.UnZ"
+ />
+ <taskdef
name="bzip2"
classname="org.apache.ant.compress.taskdefs.BZip2"
/>
@@ -186,6 +190,10 @@
name="xzresource"
classname="org.apache.ant.compress.resources.XZResource"
/>
+ <typedef
+ name="zresource"
+ classname="org.apache.ant.compress.resources.ZResource"
+ />
<componentdef
name="hasusername"
Copied: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZResource.java (from r1553273, ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/LZMAResource.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZResource.java?p2=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZResource.java&p1=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/LZMAResource.java&r1=1553273&r2=1553276&rev=1553276&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/LZMAResource.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZResource.java Tue Dec 24 14:15:21 2013
@@ -17,21 +17,21 @@
*/
package org.apache.ant.compress.resources;
-import org.apache.ant.compress.util.LZMAStreamFactory;
+import org.apache.ant.compress.util.ZStreamFactory;
import org.apache.tools.ant.types.ResourceCollection;
/**
- * An LZMA compressed resource.
- * @since Apache Compress Antlib 1.3
+ * A .Z compressed resource.
+ * @since Apache Compress Antlib 1.4
*/
-public final class LZMAResource extends CommonsCompressCompressorResource {
- private static final String NAME = "LZMA";
+public final class ZResource extends CommonsCompressCompressorResource {
+ private static final String NAME = "Z";
- public LZMAResource() {
- super(NAME, new LZMAStreamFactory());
+ public ZResource() {
+ super(NAME, new ZStreamFactory());
}
- public LZMAResource(ResourceCollection other) {
- super(NAME, new LZMAStreamFactory(), other);
+ public ZResource(ResourceCollection other) {
+ super(NAME, new ZStreamFactory(), other);
}
}
Copied: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnZ.java (from r1553273, ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnLZMA.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnZ.java?p2=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnZ.java&p1=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnLZMA.java&r1=1553273&r2=1553276&rev=1553276&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnLZMA.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnZ.java Tue Dec 24 14:15:21 2013
@@ -18,16 +18,16 @@
package org.apache.ant.compress.taskdefs;
-import org.apache.ant.compress.util.LZMAStreamFactory;
+import org.apache.ant.compress.util.ZStreamFactory;
/**
- * Expands an lzma archive.
- * @since Apache Compress Antlib 1.3
+ * Expands a traditional Unix compress (.Z) archive.
+ * @since Apache Compress Antlib 1.4
*/
-public final class UnLZMA extends UnpackBase {
+public final class UnZ extends UnpackBase {
- public UnLZMA() {
- super(".lzma", new LZMAStreamFactory());
+ public UnZ() {
+ super(".Z", new ZStreamFactory());
}
}
Modified: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java?rev=1553276&r1=1553275&r2=1553276&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java Tue Dec 24 14:15:21 2013
@@ -27,7 +27,7 @@ import org.apache.commons.compress.compr
import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream;
/**
- * Creates streams for the supported compression formats.
+ * Creates streams for the standalone LZMA format.
* @since Apache Compress Antlib 1.3
*/
public class LZMAStreamFactory implements CompressorStreamFactory {
Copied: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ZStreamFactory.java (from r1553273, ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ZStreamFactory.java?p2=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ZStreamFactory.java&p1=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java&r1=1553273&r2=1553276&rev=1553276&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ZStreamFactory.java Tue Dec 24 14:15:21 2013
@@ -24,20 +24,20 @@ import java.io.OutputStream;
import org.apache.commons.compress.compressors.CompressorInputStream;
import org.apache.commons.compress.compressors.CompressorOutputStream;
-import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream;
+import org.apache.commons.compress.compressors.z.ZCompressorInputStream;
/**
- * Creates streams for the supported compression formats.
- * @since Apache Compress Antlib 1.3
+ * Creates streams for the traditional Unix compress format.
+ * @since Apache Compress Antlib 1.4
*/
-public class LZMAStreamFactory implements CompressorStreamFactory {
+public class ZStreamFactory implements CompressorStreamFactory {
/**
* @param stream the stream to read from, should be buffered
*/
public CompressorInputStream getCompressorStream(InputStream stream)
throws IOException {
- return new LZMACompressorInputStream(stream);
+ return new ZCompressorInputStream(stream);
}
/**
Copied: ant/antlibs/compress/trunk/src/tests/antunit/unz-test.xml (from r1553273, ant/antlibs/compress/trunk/src/tests/antunit/unlzma-test.xml)
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/unz-test.xml?p2=ant/antlibs/compress/trunk/src/tests/antunit/unz-test.xml&p1=ant/antlibs/compress/trunk/src/tests/antunit/unlzma-test.xml&r1=1553273&r2=1553276&rev=1553276&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/unlzma-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/unz-test.xml Tue Dec 24 14:15:21 2013
@@ -29,27 +29,27 @@
<target name="test1">
<au:expectfailure>
- <cmp:unlzma/>
+ <cmp:unz/>
</au:expectfailure>
</target>
<target name="test2">
<au:expectfailure>
- <cmp:unlzma src=""/>
+ <cmp:unz src=""/>
</au:expectfailure>
</target>
- <target name="testNativeLZMA" depends="setUp">
- <cmp:unlzma src="../resources/asf-logo.gif.lzma"
+ <target name="testNativeZ" depends="setUp">
+ <cmp:unz src="../resources/asf-logo.gif.Z"
dest="${output}/asf-logo.gif" />
<au:assertFilesMatch expected="../resources/asf-logo.gif"
actual="${output}/asf-logo.gif"/>
</target>
<target name="testWithResource" depends="setUp">
- <cmp:unlzma dest="${output}/asf-logo.gif">
- <file file="../resources/asf-logo.gif.lzma"/>
- </cmp:unlzma>
+ <cmp:unz dest="${output}/asf-logo.gif">
+ <file file="../resources/asf-logo.gif.Z"/>
+ </cmp:unz>
<au:assertFilesMatch expected="../resources/asf-logo.gif"
actual="${output}/asf-logo.gif"/>
</target>
Copied: ant/antlibs/compress/trunk/src/tests/antunit/zresource-test.xml (from r1553273, ant/antlibs/compress/trunk/src/tests/antunit/lzmaresource-test.xml)
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/zresource-test.xml?p2=ant/antlibs/compress/trunk/src/tests/antunit/zresource-test.xml&p1=ant/antlibs/compress/trunk/src/tests/antunit/lzmaresource-test.xml&r1=1553273&r2=1553276&rev=1553276&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/lzmaresource-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/zresource-test.xml Tue Dec 24 14:15:21 2013
@@ -27,12 +27,12 @@
<mkdir dir="${output}"/>
</target>
- <target name="testNativeLZMA" depends="setUp">
+ <target name="testNativeZ" depends="setUp">
<copy todir="${output}">
- <cmp:lzmaresource>
- <file file="../resources/asf-logo.gif.lzma"/>
- </cmp:lzmaresource>
- <globmapper from="*.lzma" to="*"/>
+ <cmp:zresource>
+ <file file="../resources/asf-logo.gif.Z"/>
+ </cmp:zresource>
+ <globmapper from="*.Z" to="*"/>
</copy>
<au:assertFilesMatch expected="../resources/asf-logo.gif"
actual="${output}/asf-logo.gif"/>
Added: ant/antlibs/compress/trunk/src/tests/resources/asf-logo.gif.Z
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/resources/asf-logo.gif.Z?rev=1553276&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ant/antlibs/compress/trunk/src/tests/resources/asf-logo.gif.Z
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream