Author: bodewig
Date: Fri Sep 27 04:26:59 2013
New Revision: 1526787
URL: http://svn.apache.org/r1526787
Log:
read-only support for stand-alone LZMA compression
Added:
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/LZMAResource.java
- copied, changed from r1526784,
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/XZResource.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnLZMA.java
- copied, changed from r1526784,
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnXZ.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java
- copied, changed from r1526784,
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/XZStreamFactory.java
ant/antlibs/compress/trunk/src/tests/antunit/lzmaresource-test.xml
- copied, changed from r1526784,
ant/antlibs/compress/trunk/src/tests/antunit/xzresource-test.xml
ant/antlibs/compress/trunk/src/tests/antunit/unlzma-test.xml
- copied, changed from r1526784,
ant/antlibs/compress/trunk/src/tests/antunit/unxz-test.xml
ant/antlibs/compress/trunk/src/tests/resources/asf-logo.gif.lzma (with
props)
Modified:
ant/antlibs/compress/trunk/changes.xml
ant/antlibs/compress/trunk/docs/compresource.html
ant/antlibs/compress/trunk/docs/unpack.html
ant/antlibs/compress/trunk/project-template.ivy.xml
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/antlib.xml
Modified: ant/antlibs/compress/trunk/changes.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/changes.xml?rev=1526787&r1=1526786&r2=1526787&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/changes.xml (original)
+++ ant/antlibs/compress/trunk/changes.xml Fri Sep 27 04:26:59 2013
@@ -52,6 +52,10 @@
<action type="add">
Read-only support for uncompressed arj archives has been added.
</action>
+ <action type="add">
+ Read-only support for LZMA standalone compression has been
+ added.
+ </action>
</release>
<release version="1.2" date="2012-04-20">
Modified: ant/antlibs/compress/trunk/docs/compresource.html
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/docs/compresource.html?rev=1526787&r1=1526786&r2=1526787&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/docs/compresource.html (original)
+++ ant/antlibs/compress/trunk/docs/compresource.html Fri Sep 27 04:26:59 2013
@@ -87,6 +87,26 @@
some-archive.tar.gz where the <code>gzipresource</code> provides
the decompression of the archive.</p>
+<h2><a name="lzmaresource">lzmaresource</a></h2>
+
+<p>This is a <a href="#compresource">compressed resource</a> using the
+ LZMA compression.</p>
+
+<h4>Examples</h4>
+
+<pre>
+<cmp:tarentry xmlns:cmp="antlib:org.apache.ant.compress"
+ name="some-file.txt">
+ <cmp:lzmaresource>
+ <file file="some-archive.tar.lzma"/>
+ </cmp:lzmaresource>
+</cmp:tarentry>
+</pre>
+
+<p>Represents the entry named some-file.txt in archive
+ some-archive.tar.gz where the <code>lzmaresource</code> provides
+ the decompression of the archive.</p>
+
<h2><a name="pack200resource">pack200resource</a></h2>
<p>This is a <a href="#compresource">compressed resource</a> using the
Modified: ant/antlibs/compress/trunk/docs/unpack.html
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/docs/unpack.html?rev=1526787&r1=1526786&r2=1526787&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/docs/unpack.html (original)
+++ ant/antlibs/compress/trunk/docs/unpack.html Fri Sep 27 04:26:59 2013
@@ -93,6 +93,11 @@ resource collection</h4>
the <a href="#decompressConcatenated">decompressConcatenated</a>
attribute.</p>
+<h3><a name="unlzma">UnLZMA</a></h3>
+
+<p>Is an <a href="#unpack">uncompressing task</a> that uses the LZMA
+ compression algorithm.</p>
+
<h3><a name="unpack200">Unpack200</a></h3>
<p>Is an <a href="#unpack">uncompressing task</a> that uses
Modified: ant/antlibs/compress/trunk/project-template.ivy.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/project-template.ivy.xml?rev=1526787&r1=1526786&r2=1526787&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/project-template.ivy.xml (original)
+++ ant/antlibs/compress/trunk/project-template.ivy.xml Fri Sep 27 04:26:59 2013
@@ -27,9 +27,9 @@
<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, DUMP and
- ZIP archives as well as BZIP2, PACK200, GZIP and XZ compressed files
- based on Apache Commons Compress.
+ Provides tasks and types that deal with AR, ARJ, CPIO, TAR, DUMP
+ and ZIP archives as well as BZIP2, PACK200, GZIP, LZMA and XZ
+ compressed files based on Apache Commons Compress.
</description>
</info>
<publications xmlns:e="urn:ant.apache.org:ivy-extras">
@@ -52,7 +52,7 @@
</publications>
<dependencies>
<dependency org="org.apache.commons" name="commons-compress"
- rev="1.4"/>
- <dependency org="org.tukaani" name="xz" rev="1.0"/>
+ rev="1.6"/>
+ <dependency org="org.tukaani" name="xz" rev="1.4"/>
</dependencies>
</ivy-module>
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=1526787&r1=1526786&r2=1526787&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 Fri
Sep 27 04:26:59 2013
@@ -65,6 +65,10 @@
classname="org.apache.ant.compress.taskdefs.GUnzip"
/>
<taskdef
+ name="unlzma"
+ classname="org.apache.ant.compress.taskdefs.UnLZMA"
+ />
+ <taskdef
name="unpack200"
classname="org.apache.ant.compress.taskdefs.UnPack200"
/>
@@ -155,6 +159,10 @@
classname="org.apache.ant.compress.resources.GZipResource"
/>
<typedef
+ name="lzmaresource"
+ classname="org.apache.ant.compress.resources.LZMAResource"
+ />
+ <typedef
name="pack200resource"
classname="org.apache.ant.compress.resources.Pack200Resource"
/>
Copied:
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/LZMAResource.java
(from r1526784,
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/XZResource.java)
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/LZMAResource.java?p2=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/LZMAResource.java&p1=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/XZResource.java&r1=1526784&r2=1526787&rev=1526787&view=diff
==============================================================================
---
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/XZResource.java
(original)
+++
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/LZMAResource.java
Fri Sep 27 04:26:59 2013
@@ -17,21 +17,21 @@
*/
package org.apache.ant.compress.resources;
-import org.apache.ant.compress.util.XZStreamFactory;
+import org.apache.ant.compress.util.LZMAStreamFactory;
import org.apache.tools.ant.types.ResourceCollection;
/**
- * An XZ compressed resource.
- * @since Apache Compress Antlib 1.2
+ * An LZMA compressed resource.
+ * @since Apache Compress Antlib 1.3
*/
-public final class XZResource extends CommonsCompressCompressorResource {
- private static final String NAME = "XZ";
+public final class LZMAResource extends CommonsCompressCompressorResource {
+ private static final String NAME = "LZMA";
- public XZResource() {
- super(NAME, new XZStreamFactory());
+ public LZMAResource() {
+ super(NAME, new LZMAStreamFactory());
}
- public XZResource(ResourceCollection other) {
- super(NAME, new XZStreamFactory(), other);
+ public LZMAResource(ResourceCollection other) {
+ super(NAME, new LZMAStreamFactory(), other);
}
}
Copied:
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnLZMA.java
(from r1526784,
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnXZ.java)
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnLZMA.java?p2=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnLZMA.java&p1=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnXZ.java&r1=1526784&r2=1526787&rev=1526787&view=diff
==============================================================================
---
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnXZ.java
(original)
+++
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/UnLZMA.java
Fri Sep 27 04:26:59 2013
@@ -18,16 +18,16 @@
package org.apache.ant.compress.taskdefs;
-import org.apache.ant.compress.util.XZStreamFactory;
+import org.apache.ant.compress.util.LZMAStreamFactory;
/**
- * Expands an xz archive.
- * @since Apache Compress Antlib 1.2
+ * Expands an lzma archive.
+ * @since Apache Compress Antlib 1.3
*/
-public final class UnXZ extends UnpackBase {
+public final class UnLZMA extends UnpackBase {
- public UnXZ() {
- super(".xz", new XZStreamFactory());
+ public UnLZMA() {
+ super(".lzma", new LZMAStreamFactory());
}
-}
\ No newline at end of file
+}
Copied:
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java
(from r1526784,
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/XZStreamFactory.java)
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java?p2=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java&p1=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/XZStreamFactory.java&r1=1526784&r2=1526787&rev=1526787&view=diff
==============================================================================
---
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/XZStreamFactory.java
(original)
+++
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java
Fri Sep 27 04:26:59 2013
@@ -24,41 +24,27 @@ import java.io.OutputStream;
import org.apache.commons.compress.compressors.CompressorInputStream;
import org.apache.commons.compress.compressors.CompressorOutputStream;
-import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
-import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
+import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream;
/**
* Creates streams for the supported compression formats.
- * @since Apache Compress Antlib 1.2
+ * @since Apache Compress Antlib 1.3
*/
-public class XZStreamFactory implements
CompressorWithConcatenatedStreamsFactory {
+public class LZMAStreamFactory implements CompressorStreamFactory {
/**
* @param stream the stream to read from, should be buffered
*/
public CompressorInputStream getCompressorStream(InputStream stream)
throws IOException {
- return getCompressorStream(stream, false);
+ return new LZMACompressorInputStream(stream);
}
/**
- * @param stream the stream to read from, should be buffered
- * @param decompressConcatenated
- * if true, decompress until the end of the
- * input; if false, stop after the first
- * stream
- */
- public CompressorInputStream getCompressorStream(InputStream stream,
- boolean
decompressConcatenated)
- throws IOException {
- return new XZCompressorInputStream(stream, decompressConcatenated);
- }
-
- /**
- * @param stream the stream to write to, should be buffered
+ * Not implemented.
*/
public CompressorOutputStream getCompressorStream(OutputStream stream)
throws IOException {
- return new XZCompressorOutputStream(stream);
+ throw new UnsupportedOperationException();
}
-}
\ No newline at end of file
+}
Copied: ant/antlibs/compress/trunk/src/tests/antunit/lzmaresource-test.xml
(from r1526784,
ant/antlibs/compress/trunk/src/tests/antunit/xzresource-test.xml)
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/lzmaresource-test.xml?p2=ant/antlibs/compress/trunk/src/tests/antunit/lzmaresource-test.xml&p1=ant/antlibs/compress/trunk/src/tests/antunit/xzresource-test.xml&r1=1526784&r2=1526787&rev=1526787&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/xzresource-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/lzmaresource-test.xml Fri Sep
27 04:26:59 2013
@@ -27,53 +27,15 @@
<mkdir dir="${output}"/>
</target>
- <target name="testNativeXZ" depends="setUp">
+ <target name="testNativeLZMA" depends="setUp">
<copy todir="${output}">
- <cmp:xzresource>
- <file file="../resources/asf-logo.gif.xz"/>
- </cmp:xzresource>
- <globmapper from="*.xz" to="*"/>
+ <cmp:lzmaresource>
+ <file file="../resources/asf-logo.gif.lzma"/>
+ </cmp:lzmaresource>
+ <globmapper from="*.lzma" to="*"/>
</copy>
<au:assertFilesMatch expected="../resources/asf-logo.gif"
actual="${output}/asf-logo.gif"/>
</target>
- <target name="testConcatenatedStreamsDefault"
- depends="setUp">
- <echo file="${output}/expected">a</echo>
- <copy todir="${output}">
- <cmp:xzresource>
- <file file="../resources/multiple.xz"/>
- </cmp:xzresource>
- <mergemapper to="actual"/>
- </copy>
- <au:assertFilesMatch expected="${output}/expected"
- actual="${output}/actual"/>
- </target>
-
- <target name="testConcatenatedStreamsOnlyFirstStream"
- depends="setUp">
- <echo file="${output}/expected">a</echo>
- <copy todir="${output}">
- <cmp:xzresource decompressconcatenated="false">
- <file file="../resources/multiple.xz"/>
- </cmp:xzresource>
- <mergemapper to="actual"/>
- </copy>
- <au:assertFilesMatch expected="${output}/expected"
- actual="${output}/actual"/>
- </target>
-
- <target name="testConcatenatedStreamsAllStreams"
- depends="setUp">
- <echo file="${output}/expected">ab</echo>
- <copy todir="${output}">
- <cmp:xzresource decompressconcatenated="true">
- <file file="../resources/multiple.xz"/>
- </cmp:xzresource>
- <mergemapper to="actual"/>
- </copy>
- <au:assertFilesMatch expected="${output}/expected"
- actual="${output}/actual"/>
- </target>
</project>
Copied: ant/antlibs/compress/trunk/src/tests/antunit/unlzma-test.xml (from
r1526784, ant/antlibs/compress/trunk/src/tests/antunit/unxz-test.xml)
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/unlzma-test.xml?p2=ant/antlibs/compress/trunk/src/tests/antunit/unlzma-test.xml&p1=ant/antlibs/compress/trunk/src/tests/antunit/unxz-test.xml&r1=1526784&r2=1526787&rev=1526787&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/unxz-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/unlzma-test.xml Fri Sep 27
04:26:59 2013
@@ -29,68 +29,30 @@
<target name="test1">
<au:expectfailure>
- <cmp:unxz/>
+ <cmp:unlzma/>
</au:expectfailure>
</target>
<target name="test2">
<au:expectfailure>
- <cmp:unxz src=""/>
+ <cmp:unlzma src=""/>
</au:expectfailure>
</target>
- <target name="testXZTask" depends="setUp">
- <cmp:xz src="../resources/asf-logo.gif"
- destfile="${output}/asf-logo.gif.xz"/>
- <cmp:unxz src="${output}/asf-logo.gif.xz" dest="${output}/asf-logo.gif" />
- <au:assertFilesMatch expected="../resources/asf-logo.gif"
- actual="${output}/asf-logo.gif"/>
- </target>
-
- <target name="testNativeXZ" depends="setUp">
- <cmp:unxz src="../resources/asf-logo.gif.xz"
+ <target name="testNativeLZMA" depends="setUp">
+ <cmp:unlzma src="../resources/asf-logo.gif.lzma"
dest="${output}/asf-logo.gif" />
<au:assertFilesMatch expected="../resources/asf-logo.gif"
actual="${output}/asf-logo.gif"/>
</target>
<target name="testWithResource" depends="setUp">
- <cmp:unxz dest="${output}/asf-logo.gif">
- <file file="../resources/asf-logo.gif.xz"/>
- </cmp:unxz>
+ <cmp:unlzma dest="${output}/asf-logo.gif">
+ <file file="../resources/asf-logo.gif.lzma"/>
+ </cmp:unlzma>
<au:assertFilesMatch expected="../resources/asf-logo.gif"
actual="${output}/asf-logo.gif"/>
</target>
- <target name="testConcatenatedStreamsDefault"
- depends="setUp">
- <echo file="${output}/expected">a</echo>
- <cmp:unxz dest="${output}/actual">
- <file file="../resources/multiple.xz"/>
- </cmp:unxz>
- <au:assertFilesMatch expected="${output}/expected"
- actual="${output}/actual"/>
- </target>
-
- <target name="testConcatenatedStreamsOnlyFirstStream"
- depends="setUp">
- <echo file="${output}/expected">a</echo>
- <cmp:unxz dest="${output}/actual" decompressconcatenated="false">
- <file file="../resources/multiple.xz"/>
- </cmp:unxz>
- <au:assertFilesMatch expected="${output}/expected"
- actual="${output}/actual"/>
- </target>
-
- <target name="testConcatenatedStreamsAllStreams"
- depends="setUp">
- <echo file="${output}/expected">ab</echo>
- <cmp:unxz dest="${output}/actual" decompressconcatenated="true">
- <file file="../resources/multiple.xz"/>
- </cmp:unxz>
- <au:assertFilesMatch expected="${output}/expected"
- actual="${output}/actual"/>
- </target>
-
</project>
Added: ant/antlibs/compress/trunk/src/tests/resources/asf-logo.gif.lzma
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/resources/asf-logo.gif.lzma?rev=1526787&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ant/antlibs/compress/trunk/src/tests/resources/asf-logo.gif.lzma
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
