Author: bodewig
Date: Sat Aug 24 18:56:55 2013
New Revision: 1517183
URL: http://svn.apache.org/r1517183
Log:
add read-only support for uncompressed arj archives
Added:
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ArjFileSet.java
- copied, changed from r1517168,
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpFileSet.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ArjResource.java
- copied, changed from r1517168,
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpResource.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Unarj.java
- copied, changed from r1517168,
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Undump.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArjStreamFactory.java
- copied, changed from r1517168,
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/DumpStreamFactory.java
ant/antlibs/compress/trunk/src/tests/antunit/arjentry-test.xml
- copied, changed from r1517168,
ant/antlibs/compress/trunk/src/tests/antunit/dumpentry-test.xml
ant/antlibs/compress/trunk/src/tests/antunit/arjfileset-test.xml
- copied, changed from r1517168,
ant/antlibs/compress/trunk/src/tests/antunit/dumpfileset-test.xml
ant/antlibs/compress/trunk/src/tests/antunit/unarj-test.xml
- copied, changed from r1517168,
ant/antlibs/compress/trunk/src/tests/antunit/undump-test.xml
ant/antlibs/compress/trunk/src/tests/resources/asf-logo.gif.arj (with
props)
Modified:
ant/antlibs/compress/trunk/changes.xml
ant/antlibs/compress/trunk/docs/expand.html
ant/antlibs/compress/trunk/docs/fileset.html
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/antlib.xml
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/EntryHelper.java
Modified: ant/antlibs/compress/trunk/changes.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/changes.xml?rev=1517183&r1=1517182&r2=1517183&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/changes.xml (original)
+++ ant/antlibs/compress/trunk/changes.xml Sat Aug 24 18:56:55 2013
@@ -41,6 +41,9 @@
<action type="add">
Encoding support for dump and cpio archives and filesets.
</action>
+ <action type="add">
+ Read-only upport for uncompress arj archives has been added.
+ </action>
</release>
<release version="1.2" date="2012-04-20">
Modified: ant/antlibs/compress/trunk/docs/expand.html
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/docs/expand.html?rev=1517183&r1=1517182&r2=1517183&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/docs/expand.html (original)
+++ ant/antlibs/compress/trunk/docs/expand.html Sat Aug 24 18:56:55 2013
@@ -110,6 +110,34 @@ mapper</a>.</p>
in different ways, the GNU/SRV4 and the BSD variant; both of which
are transparently supported since Commons Compress 1.3.</p>
+<h3><a name="unarj">UnArj</a></h3>
+
+<p><em>Since Apache Compress Antlib 1.3</em>.</p>
+
+<p>An <a href="#expand">unarchiving task</a> for arj archives.</p>
+
+<p>In addition to the parameters above, the unarj tasks supports the
+ following attributes:</p>
+
+<table border="1" cellpadding="2" cellspacing="0">
+ <tr>
+ <td valign="top"><b>Attribute</b></td>
+ <td valign="top"><b>Description</b></td>
+ <td align="center" valign="top"><b>Required</b></td>
+ </tr>
+ <tr>
+ <td valign="top">encoding</td>
+ <td valign="top">
+ The character encoding that has been used for filenames
+ inside the arj file. For a list of possible values see <a
+
href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html";>http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br>
+ Defaults <code>native-encoding</code> which is the magic value for
+ the platform's default character encoding.<br/>
+ <em>since Compress Antlib 1.3</em></td>
+ <td align="center" valign="top">No</td>
+ </tr>
+</table>
+
<h3><a name="uncpio">UnCpio</a></h3>
<p>An <a href="#expand">unarchiving task</a> for CPIO archives.</p>
Modified: ant/antlibs/compress/trunk/docs/fileset.html
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/docs/fileset.html?rev=1517183&r1=1517182&r2=1517183&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/docs/fileset.html (original)
+++ ant/antlibs/compress/trunk/docs/fileset.html Sat Aug 24 18:56:55 2013
@@ -178,6 +178,51 @@ resource collection</h4>
target directory, no files get overwritten unless they are
out-of-date.</p>
+<h2><a name="arjfileset">ArjFileSet</a></h2>
+
+<p><em>Since Apache Compress Antlib 1.3</em>.</p>
+
+<p>A <code><arjfileset></code> is
+ an <a href="#archivefileset">archive fileset</a>.</p>
+
+<h3>Parameters</h3>
+<table border="1" cellpadding="2" cellspacing="0">
+ <tbody>
+ <tr>
+ <td valign="top"><b>Attribute</b></td>
+ <td valign="top"><b>Description</b></td>
+ <td valign="top" align="center"><b>Required</b></td>
+ </tr>
+ <tr>
+ <td valign="top">encoding</td>
+ <td valign="top">
+ The character encoding that has been used for filenames
+ inside the arj file. For a list of possible values see <a
+
href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html";>http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br>
+ Defaults <code>native-encoding</code> which is the magic value for
+ the platform's default character encoding.<br/>
+ <em>since Compress Antlib 1.3</em></td>
+ <td align="center" valign="top">No</td>
+ </tr>
+ </tbody>
+</table>
+
+<h4>Examples</h4>
+<blockquote>
+<pre>
+ <copy todir="some-dir">
+ <cmp:arjfileset xmlns:cmp="antlib:org.apache.ant.compress">
+ <file file="some-archive.arj"/>
+ </cmp:arjfileset>
+ </copy>
+</pre></blockquote>
+
+<p>extracts some-archive.arj
+ and copies the contents of it into some-dir. File timestamps will
+ be compared between the archive's entries and files inside the
+ target directory, no files get overwritten unless they are
+ out-of-date.</p>
+
<h2><a name="cpiofileset">CpioFileSet</a></h2>
<p>A <code><cpiofileset></code> is
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=1517183&r1=1517182&r2=1517183&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 Sat
Aug 24 18:56:55 2013
@@ -21,6 +21,10 @@
classname="org.apache.ant.compress.taskdefs.Unar"
/>
<taskdef
+ name="unarj"
+ classname="org.apache.ant.compress.taskdefs.Unarj"
+ />
+ <taskdef
name="uncpio"
classname="org.apache.ant.compress.taskdefs.Uncpio"
/>
@@ -94,6 +98,10 @@
classname="org.apache.ant.compress.resources.ArResource"
/>
<typedef
+ name="arjentry"
+ classname="org.apache.ant.compress.resources.ArjResource"
+ />
+ <typedef
name="cpioentry"
classname="org.apache.ant.compress.resources.CpioResource"
/>
@@ -115,6 +123,10 @@
classname="org.apache.ant.compress.resources.ArFileSet"
/>
<typedef
+ name="arjfileset"
+ classname="org.apache.ant.compress.resources.ArjFileSet"
+ />
+ <typedef
name="cpiofileset"
classname="org.apache.ant.compress.resources.CpioFileSet"
/>
Copied:
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ArjFileSet.java
(from r1517168,
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpFileSet.java)
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ArjFileSet.java?p2=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ArjFileSet.java&p1=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpFileSet.java&r1=1517168&r2=1517183&rev=1517183&view=diff
==============================================================================
---
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpFileSet.java
(original)
+++
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ArjFileSet.java
Sat Aug 24 18:56:55 2013
@@ -17,28 +17,28 @@
*/
package org.apache.ant.compress.resources;
-import org.apache.ant.compress.util.DumpStreamFactory;
+import org.apache.ant.compress.util.ArjStreamFactory;
import org.apache.commons.compress.archivers.ArchiveEntry;
-import org.apache.commons.compress.archivers.dump.DumpArchiveEntry;
+import org.apache.commons.compress.archivers.arj.ArjArchiveEntry;
import org.apache.tools.ant.types.ArchiveScanner;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Resource;
/**
- * A DumpFileSet is a FileSet with extra attributes useful in the context of
- * Dump tasks.
+ * A ArjFileSet is a FileSet with extra attributes useful in the context of
+ * Arj tasks.
*
- * A DumpFileSet extends FileSets with the ability to extract a subset of the
- * entries of a Dump file for inclusion in another Dump file. It also includes
- * a prefix attribute which is prepended to each entry in the output Dump file.
+ * A ArjFileSet extends FileSets with the ability to extract a subset of the
+ * entries of a Arj file for inclusion in another Arj file. It also includes
+ * a prefix attribute which is prepended to each entry in the output Arj file.
*
- * @since Apache Compress Antlib 1.1
+ * @since Apache Compress Antlib 1.3
*/
-public class DumpFileSet extends CommonsCompressFileSet {
+public class ArjFileSet extends CommonsCompressFileSet {
- /** Constructor for DumpFileSet */
- public DumpFileSet() {
+ /** Constructor for ArjFileSet */
+ public ArjFileSet() {
super();
}
@@ -46,15 +46,15 @@ public class DumpFileSet extends Commons
* Constructor using a fileset argument.
* @param fileset the fileset to use
*/
- protected DumpFileSet(FileSet fileset) {
+ protected ArjFileSet(FileSet fileset) {
super(fileset);
}
/**
- * Constructor using a dumpfileset argument.
- * @param fileset the dumpfileset to use
+ * Constructor using a arjfileset argument.
+ * @param fileset the arjfileset to use
*/
- protected DumpFileSet(DumpFileSet fileset) {
+ protected ArjFileSet(ArjFileSet fileset) {
super(fileset);
}
@@ -62,7 +62,7 @@ public class DumpFileSet extends Commons
* Constructor using a CommonsCompressFileSet argument.
* @param fileset the fileset to use
*/
- protected DumpFileSet(CommonsCompressFileSet fileset) {
+ protected ArjFileSet(CommonsCompressFileSet fileset) {
super(fileset);
}
@@ -72,11 +72,11 @@ public class DumpFileSet extends Commons
*/
protected ArchiveScanner newArchiveScanner() {
CommonsCompressArchiveScanner cs =
- new CommonsCompressArchiveScanner(new DumpStreamFactory(),
+ new CommonsCompressArchiveScanner(new ArjStreamFactory(),
new
CommonsCompressArchiveScanner.ResourceBuilder() {
public Resource buildResource(Resource archive, String
encoding,
ArchiveEntry entry) {
- return new DumpResource(archive, encoding,
(DumpArchiveEntry) entry);
+ return new ArjResource(archive, encoding,
(ArjArchiveEntry) entry);
}
}, getSkipUnreadableEntries(), getProject());
cs.setEncoding(getEncoding());
@@ -84,13 +84,13 @@ public class DumpFileSet extends Commons
}
protected CommonsCompressFileSet newFileSet(FileSet fs) {
- if (fs instanceof DumpFileSet) {
- return new DumpFileSet((DumpFileSet) fs);
+ if (fs instanceof ArjFileSet) {
+ return new ArjFileSet((ArjFileSet) fs);
}
if (fs instanceof CommonsCompressFileSet) {
- return new DumpFileSet((CommonsCompressFileSet) fs);
+ return new ArjFileSet((CommonsCompressFileSet) fs);
}
- return new DumpFileSet(fs);
+ return new ArjFileSet(fs);
}
}
Copied:
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ArjResource.java
(from r1517168,
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpResource.java)
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ArjResource.java?p2=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ArjResource.java&p1=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpResource.java&r1=1517168&r2=1517183&rev=1517183&view=diff
==============================================================================
---
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpResource.java
(original)
+++
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ArjResource.java
Sat Aug 24 18:56:55 2013
@@ -20,66 +20,64 @@ package org.apache.ant.compress.resource
import java.io.File;
import org.apache.tools.ant.types.Resource;
-import org.apache.ant.compress.util.DumpStreamFactory;
-import org.apache.commons.compress.archivers.dump.DumpArchiveEntry;
+import org.apache.ant.compress.util.ArjStreamFactory;
+import org.apache.commons.compress.archivers.arj.ArjArchiveEntry;
/**
- * A Resource representation of an entry in a dump archive.
- * @since Apache Compress Antlib 1.1
+ * A Resource representation of an entry in a arj archive.
+ * @since Apache Compress Antlib 1.3
*/
-public final class DumpResource extends CommonsCompressArchiveResource {
+public final class ArjResource extends CommonsCompressArchiveResource {
/**
* Default constructor.
*/
- public DumpResource() {
- super(new DumpStreamFactory(), "dump");
+ public ArjResource() {
+ super(new ArjStreamFactory(), "arj");
}
/**
- * Construct a DumpResource representing the specified
+ * Construct a ArjResource representing the specified
* entry in the specified archive.
* @param a the archive as File.
- * @param e the DumpEntry.
+ * @param e the ArjEntry.
*/
- public DumpResource(File a, DumpArchiveEntry e) {
+ public ArjResource(File a, ArjArchiveEntry e) {
this(a, null, e);
}
/**
- * Construct a DumpResource representing the specified
+ * Construct a ArjResource representing the specified
* entry in the specified archive.
* @param a the archive as Resource.
- * @param e the DumpEntry.
+ * @param e the ArjEntry.
*/
- public DumpResource(Resource a, DumpArchiveEntry e) {
+ public ArjResource(Resource a, ArjArchiveEntry e) {
this(a, null, e);
}
/**
- * Construct a DumpResource representing the specified
+ * Construct a ArjResource representing the specified
* entry in the specified archive.
* @param a the archive as File.
* @param enc the encoding used for filenames.
- * @param e the DumpEntry.
- * @since Compress Antlib 1.3
+ * @param e the ArjEntry.
*/
- public DumpResource(File a, String enc, DumpArchiveEntry e) {
- super(new DumpStreamFactory(), "dump", a, e);
+ public ArjResource(File a, String enc, ArjArchiveEntry e) {
+ super(new ArjStreamFactory(), "arj", a, e);
setEncoding(enc);
setEntry(e);
}
/**
- * Construct a DumpResource representing the specified
+ * Construct a ArjResource representing the specified
* entry in the specified archive.
* @param a the archive as Resource.
* @param enc the encoding used for filenames.
- * @param e the DumpEntry.
- * @since Compress Antlib 1.3
+ * @param e the ArjEntry.
*/
- public DumpResource(Resource a, String enc, DumpArchiveEntry e) {
- super(new DumpStreamFactory(), "dump", a, e);
+ public ArjResource(Resource a, String enc, ArjArchiveEntry e) {
+ super(new ArjStreamFactory(), "arj", a, e);
setEncoding(enc);
setEntry(e);
}
Copied:
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Unarj.java
(from r1517168,
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Undump.java)
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Unarj.java?p2=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Unarj.java&p1=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Undump.java&r1=1517168&r2=1517183&rev=1517183&view=diff
==============================================================================
---
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Undump.java
(original)
+++
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Unarj.java
Sat Aug 24 18:56:55 2013
@@ -18,21 +18,20 @@
package org.apache.ant.compress.taskdefs;
-import org.apache.ant.compress.util.DumpStreamFactory;
+import org.apache.ant.compress.util.ArjStreamFactory;
/**
- * Undump a file.
- * @since Apache Compress Antlib 1.1
+ * Unarj a file.
+ * @since Apache Compress Antlib 1.3
*/
-public class Undump extends ExpandBase {
- public Undump() {
- super(new DumpStreamFactory());
+public class Unarj extends ExpandBase {
+ public Unarj() {
+ super(new ArjStreamFactory());
}
/**
* Set the file-name encoding for this archive, defaults to the
* native encoding.
- * @since Apache Compress Antlib 1.3
*/
public void setEncoding(String encoding) {
internalSetEncoding(encoding);
Modified:
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java?rev=1517183&r1=1517182&r2=1517183&view=diff
==============================================================================
---
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java
(original)
+++
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java
Sat Aug 24 18:56:55 2013
@@ -33,7 +33,7 @@ public interface ArchiveStreamFactory {
/**
* @param stream the stream to read from, should be buffered
* @param encoding the encoding of the entry names, ignored by all
- * formats except cpio, dump, tar and zip
+ * formats except arj, cpio, dump, tar and zip
*/
public ArchiveInputStream getArchiveStream(InputStream stream,
String encoding)
Copied:
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArjStreamFactory.java
(from r1517168,
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/DumpStreamFactory.java)
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArjStreamFactory.java?p2=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArjStreamFactory.java&p1=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/DumpStreamFactory.java&r1=1517168&r2=1517183&rev=1517183&view=diff
==============================================================================
---
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/DumpStreamFactory.java
(original)
+++
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArjStreamFactory.java
Sat Aug 24 18:56:55 2013
@@ -25,13 +25,13 @@ import java.io.OutputStream;
import org.apache.commons.compress.archivers.ArchiveException;
import org.apache.commons.compress.archivers.ArchiveInputStream;
import org.apache.commons.compress.archivers.ArchiveOutputStream;
-import org.apache.commons.compress.archivers.dump.DumpArchiveInputStream;
+import org.apache.commons.compress.archivers.arj.ArjArchiveInputStream;
import org.apache.tools.ant.BuildException;
/**
- * @since Apache Compress Antlib 1.1
+ * @since Apache Compress Antlib 1.3
*/
-public class DumpStreamFactory implements ArchiveStreamFactory {
+public class ArjStreamFactory implements ArchiveStreamFactory {
/**
* @param stream the stream to read from, should be buffered
@@ -41,7 +41,7 @@ public class DumpStreamFactory implement
String encoding)
throws IOException {
try {
- return new DumpArchiveInputStream(stream, encoding);
+ return new ArjArchiveInputStream(stream, encoding);
} catch (ArchiveException ex) {
throw new BuildException(ex);
}
Modified:
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/EntryHelper.java
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/EntryHelper.java?rev=1517183&r1=1517182&r2=1517183&view=diff
==============================================================================
---
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/EntryHelper.java
(original)
+++
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/EntryHelper.java
Sat Aug 24 18:56:55 2013
@@ -24,6 +24,7 @@ import org.apache.tools.ant.BuildExcepti
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.ar.ArArchiveEntry;
+import org.apache.commons.compress.archivers.arj.ArjArchiveEntry;
import org.apache.commons.compress.archivers.cpio.CpioArchiveEntry;
import org.apache.commons.compress.archivers.dump.DumpArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
@@ -48,6 +49,9 @@ public class EntryHelper {
if (entry instanceof ArArchiveEntry) {
return ((ArArchiveEntry) entry).getMode();
}
+ if (entry instanceof ArjArchiveEntry) {
+ return ((ArjArchiveEntry) entry).getUnixMode();
+ }
if (entry instanceof CpioArchiveEntry) {
return (int) ((CpioArchiveEntry) entry).getMode();
}
@@ -77,6 +81,9 @@ public class EntryHelper {
if (entry instanceof ArArchiveEntry) {
return ((ArArchiveEntry) entry).getUserId();
}
+ if (entry instanceof ArjArchiveEntry) {
+ return UNKNOWN_ID;
+ }
if (entry instanceof CpioArchiveEntry) {
return (int) ((CpioArchiveEntry) entry).getUID();
}
@@ -104,6 +111,9 @@ public class EntryHelper {
if (entry instanceof ArArchiveEntry) {
return ((ArArchiveEntry) entry).getGroupId();
}
+ if (entry instanceof ArjArchiveEntry) {
+ return UNKNOWN_ID;
+ }
if (entry instanceof CpioArchiveEntry) {
return (int) ((CpioArchiveEntry) entry).getGID();
}
@@ -119,4 +129,4 @@ public class EntryHelper {
throw new BuildException("archive entry " + entry.getClass()
+ " is not supported.");
}
-}
\ No newline at end of file
+}
Copied: ant/antlibs/compress/trunk/src/tests/antunit/arjentry-test.xml (from
r1517168, ant/antlibs/compress/trunk/src/tests/antunit/dumpentry-test.xml)
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/arjentry-test.xml?p2=ant/antlibs/compress/trunk/src/tests/antunit/arjentry-test.xml&p1=ant/antlibs/compress/trunk/src/tests/antunit/dumpentry-test.xml&r1=1517168&r2=1517183&rev=1517183&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/dumpentry-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/arjentry-test.xml Sat Aug 24
18:56:55 2013
@@ -26,11 +26,11 @@
<mkdir dir="${output}"/>
</target>
- <target name="testDumpSource" depends="setUp">
+ <target name="testArjSource" depends="setUp">
<copy todir="${output}">
- <cmp:dumpentry name="asf-logo.gif">
- <file file="../resources/asf-logo.gif.dump"/>
- </cmp:dumpentry>
+ <cmp:arjentry name="asf-logo.gif">
+ <file file="../resources/asf-logo.gif.arj"/>
+ </cmp:arjentry>
</copy>
<au:assertFilesMatch
actual="${output}/asf-logo.gif"
@@ -38,34 +38,22 @@
/>
</target>
- <target name="NOtestResourceProperties">
+ <!-- reading of either seems to be wrong right now, or my archive is
+ broken-->
+ <target name="NotestResourceProperties">
<au:assertTrue>
- <cond:islastmodified datetime="2009-07-31-20:11:13 +0200"
+ <cond:islastmodified datetime="2001-11-19-15:34:20 +0100"
pattern="yyyy-MM-dd-HH:mm:ss Z">
- <cmp:dumpentry name="asf-logo.gif">
- <file file="../resources/asf-logo.gif.dump"/>
- </cmp:dumpentry>
+ <cmp:arjentry name="asf-logo.gif">
+ <file file="../resources/asf-logo.gif.arj"/>
+ </cmp:arjentry>
</cond:islastmodified>
</au:assertTrue>
<au:assertTrue>
- <cmp:hasuserid id="1000">
- <cmp:dumpentry name="asf-logo.gif">
- <file file="../resources/asf-logo.gif.dump"/>
- </cmp:dumpentry>
- </cmp:hasuserid>
- </au:assertTrue>
- <au:assertTrue>
- <cmp:hasgroupid id="1000">
- <cmp:dumpentry name="asf-logo.gif">
- <file file="../resources/asf-logo.gif.dump"/>
- </cmp:dumpentry>
- </cmp:hasgroupid>
- </au:assertTrue>
- <au:assertTrue>
<cmp:hasmode mode="644">
- <cmp:dumpentry name="asf-logo.gif">
- <file file="../resources/asf-logo.gif.dump"/>
- </cmp:dumpentry>
+ <cmp:arjentry name="asf-logo.gif">
+ <file file="../resources/asf-logo.gif.arj"/>
+ </cmp:arjentry>
</cmp:hasmode>
</au:assertTrue>
</target>
Copied: ant/antlibs/compress/trunk/src/tests/antunit/arjfileset-test.xml (from
r1517168, ant/antlibs/compress/trunk/src/tests/antunit/dumpfileset-test.xml)
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/arjfileset-test.xml?p2=ant/antlibs/compress/trunk/src/tests/antunit/arjfileset-test.xml&p1=ant/antlibs/compress/trunk/src/tests/antunit/dumpfileset-test.xml&r1=1517168&r2=1517183&rev=1517183&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/dumpfileset-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/arjfileset-test.xml Sat Aug 24
18:56:55 2013
@@ -27,9 +27,9 @@
<target name="testMissingArchive">
<mkdir dir="${output}"/>
- <au:expectfailure expectedMessage="The archive foo.dump doesn't exist">
+ <au:expectfailure expectedMessage="The archive foo.arj doesn't exist">
<copy todir="${output}">
- <cmp:dumpfileset src="foo.dump"/>
+ <cmp:arjfileset src="foo.arj"/>
</copy>
</au:expectfailure>
</target>
@@ -37,13 +37,13 @@
<target name="testMissingArchiveDoesntMatter">
<mkdir dir="${output}"/>
<copy todir="${output}">
- <cmp:dumpfileset src="foo.dump" errorOnMissingArchive="false"/>
+ <cmp:arjfileset src="foo.arj" errorOnMissingArchive="false"/>
</copy>
</target>
- <target name="testDumpSource" depends="setUp">
+ <target name="testArjSource" depends="setUp">
<copy todir="${output}">
- <cmp:dumpfileset src="../resources/asf-logo.gif.dump"
+ <cmp:arjfileset src="../resources/asf-logo.gif.arj"
includes="*.gif"/>
</copy>
<au:assertFilesMatch
@@ -53,14 +53,14 @@
</target>
<target name="testUncompressSource" depends="setUp">
- <gzip destfile="${input}/asf-logo.gif.dump.gz"
- src="../resources/asf-logo.gif.dump"/>
+ <gzip destfile="${input}/asf-logo.gif.arj.gz"
+ src="../resources/asf-logo.gif.arj"/>
<copy todir="${output}">
- <cmp:dumpfileset includes="*.gif">
+ <cmp:arjfileset includes="*.gif">
<gzipresource>
- <file file="${input}/asf-logo.gif.dump.gz"/>
+ <file file="${input}/asf-logo.gif.arj.gz"/>
</gzipresource>
- </cmp:dumpfileset>
+ </cmp:arjfileset>
</copy>
<au:assertFilesMatch
actual="${output}/asf-logo.gif"
@@ -69,11 +69,11 @@
</target>
<target name="test-refid-check-encoding">
- <cmp:dumpfileset id="test-refid2"
+ <cmp:arjfileset id="test-refid2"
encoding="utf-8"
dir="${basedir}"/>
<au:expectfailure>
- <cmp:dumpfileset id="ref4"
+ <cmp:arjfileset id="ref4"
encoding="utf-8"
refid="test-refid2"/>
</au:expectfailure>
Copied: ant/antlibs/compress/trunk/src/tests/antunit/unarj-test.xml (from
r1517168, ant/antlibs/compress/trunk/src/tests/antunit/undump-test.xml)
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/unarj-test.xml?p2=ant/antlibs/compress/trunk/src/tests/antunit/unarj-test.xml&p1=ant/antlibs/compress/trunk/src/tests/antunit/undump-test.xml&r1=1517168&r2=1517183&rev=1517183&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/undump-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/unarj-test.xml Sat Aug 24
18:56:55 2013
@@ -26,17 +26,8 @@
<mkdir dir="${input}"/>
</target>
- <target name="testAgainstNativeDump" depends="setUp">
- <cmp:undump src="../resources/asf-logo.gif.dump" dest="${output}"/>
- <au:assertFileExists file="${output}/asf-logo.gif"/>
- <au:assertFilesMatch
- actual="${output}/asf-logo.gif"
- expected="../resources/asf-logo.gif"
- />
- </target>
-
- <target name="testAgainstNativeDumpCompressed" depends="setUp">
- <cmp:undump src="../resources/asf-logo.gif.z.dump" dest="${output}"/>
+ <target name="testAgainstNativeArj" depends="setUp">
+ <cmp:unarj src="../resources/asf-logo.gif.arj" dest="${output}"/>
<au:assertFileExists file="${output}/asf-logo.gif"/>
<au:assertFilesMatch
actual="${output}/asf-logo.gif"
@@ -46,13 +37,13 @@
<target name="testResourceCollection" depends="setUp">
<zip destfile="${input}/test.zip">
- <fileset dir="../resources" includes="*.dump"/>
+ <fileset dir="../resources" includes="*.arj"/>
</zip>
- <cmp:undump dest="${output}">
+ <cmp:unarj dest="${output}">
<zipfileset src="${input}/test.zip">
- <include name="*.dump"/>
+ <include name="*.arj"/>
</zipfileset>
- </cmp:undump>
+ </cmp:unarj>
<au:assertFileExists file="${output}/asf-logo.gif"/>
<au:assertFilesMatch
actual="${output}/asf-logo.gif"
Added: ant/antlibs/compress/trunk/src/tests/resources/asf-logo.gif.arj
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/resources/asf-logo.gif.arj?rev=1517183&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ant/antlibs/compress/trunk/src/tests/resources/asf-logo.gif.arj
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
