ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1158782 - in /ant/antlibs/compress/trunk: ./ docs/ src/main/org/apache/ant/compress/ src/main/org/apache/ant/compress/resources/ src/tests/antunit/
Date Wed, 17 Aug 2011 15:47:39 GMT
Author: bodewig
Date: Wed Aug 17 15:47:38 2011
New Revision: 1158782

URL: http://svn.apache.org/viewvc?rev=1158782&view=rev
Log:
Resources for Unix dump format

Added:
    ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpFileSet.java
      - copied, changed from r1158757, ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioFileSet.java
    ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpResource.java
      - copied, changed from r1158757, ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioResource.java
    ant/antlibs/compress/trunk/src/tests/antunit/dumpentry-test.xml
      - copied, changed from r1158757, ant/antlibs/compress/trunk/src/tests/antunit/cpioentry-test.xml
    ant/antlibs/compress/trunk/src/tests/antunit/dumpfileset-test.xml
      - copied, changed from r1158757, ant/antlibs/compress/trunk/src/tests/antunit/cpiofileset-test.xml
Modified:
    ant/antlibs/compress/trunk/changes.xml
    ant/antlibs/compress/trunk/docs/entry.html
    ant/antlibs/compress/trunk/docs/fileset.html
    ant/antlibs/compress/trunk/docs/index.html
    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=1158782&r1=1158781&r2=1158782&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/changes.xml (original)
+++ ant/antlibs/compress/trunk/changes.xml Wed Aug 17 15:47:38 2011
@@ -42,6 +42,11 @@
         The Apache Compress Antlib now requires Apache Commons
         Compress 1.3 which in turn requires Java5 at runtime.
       </action>
+      <action type="add">
+        Read-only support for the Unix dump format has been added in
+        the form of an &lt;undump&gt; task and corresponding
+        &lt;dumpentry&gt; and &lt;dumpfileset&gt; resources.
+      </action>
       <action type="update">
         The &lt;zip&gt; task has a new attribute zip64Mode that
         controls whether Zip64 extended information is written to the

Modified: ant/antlibs/compress/trunk/docs/entry.html
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/docs/entry.html?rev=1158782&r1=1158781&r2=1158782&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/docs/entry.html (original)
+++ ant/antlibs/compress/trunk/docs/entry.html Wed Aug 17 15:47:38 2011
@@ -94,6 +94,24 @@
 
 <p>Represents the entry named some-file.txt in archive some-archive.cpio.</p>
 
+<h2><a name="dumpentry">dumpentry</a></h2>
+
+<p><em>Since Apache Compress Antlib 1.1</em>.</p>
+
+<p>An <a href="#archiveentry">archive entry</a> representing an entry
+  in a Unix dump archive.</p>
+
+<h4>Examples</h4>
+
+<pre>
+&lt;cmp:dumpentry xmlns:cmp="antlib:org.apache.ant.compress"
+    name="/some-file.txt"&gt;
+  &lt;file file="some-archive.dump"/&gt;
+&lt;/cmp:dumpentry&gt;
+</pre>
+
+<p>Represents the entry named /some-file.txt in archive some-archive.dump.</p>
+
 <h2><a name="tarentry">tarentry</a></h2>
 
 <p>An <a href="#archiveentry">archive entry</a> representing an entry

Modified: ant/antlibs/compress/trunk/docs/fileset.html
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/docs/fileset.html?rev=1158782&r1=1158781&r2=1158782&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/docs/fileset.html (original)
+++ ant/antlibs/compress/trunk/docs/fileset.html Wed Aug 17 15:47:38 2011
@@ -225,6 +225,55 @@ resource collection</h4>
   target directory, no files get overwritten unless they are
   out-of-date.</p>
 
+<h2><a name="dumpfileset">DumpFileSet</a></h2>
+
+<p><em>Since Apache Compress Antlib 1.1</em>.</p>
+
+<p>A <code>&lt;dumpfileset&gt;</code> is
+  an <a href="#archivefileset">archive fileset</a> with attributes to
+  specify user and group ids in addition to the parameters
+  specified above.</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">uid</td>
+      <td valign="top">The user identifier (UID) for the dump entry. This is an integer
value
+        and is not the same as the username.
+      </td>
+      <td align="center" valign="top">No</td>
+    </tr>
+    <tr>
+      <td valign="top">gid</td>
+      <td valign="top">The group identifier (GID) for the dump entry.
+      </td>
+      <td align="center" valign="top">No</td>
+    </tr>
+  </tbody>
+</table>
+
+<h4>Examples</h4>
+<blockquote>
+<pre>
+  &lt;copy todir="some-dir"&gt;
+    &lt;cmp:dumpfileset xmlns:cmp="antlib:org.apache.ant.compress"&gt;
+      &lt;file file="some-archive.dump"/&gt;
+    &lt;/cmp:dumpfileset&gt;
+  &lt;/copy&gt;
+</pre></blockquote>
+
+<p>extracts some-archive.dump, uncompresses and extracts it on the fly
+  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="tarfileset">TarFileSet</a></h2>
 
 <p>A <code>&lt;tarfileset&gt;</code> is

Modified: ant/antlibs/compress/trunk/docs/index.html
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/docs/index.html?rev=1158782&r1=1158781&r2=1158782&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/docs/index.html (original)
+++ ant/antlibs/compress/trunk/docs/index.html Wed Aug 17 15:47:38 2011
@@ -67,6 +67,8 @@
       <li><a href="compresource.html#bzip2resource">bzip2resource</a></li>
       <li><a href="entry.html#cpioentry">cpioentry</a></li>
       <li><a href="fileset.html#cpiofileset">cpiofileset</a></li>
+      <li><a href="entry.html#dumpentry">dumpentry</a></li>
+      <li><a href="fileset.html#dumpfileset">dumpfileset</a></li>
       <li><a href="compresource.html#gzipresource">gzipresource</a></li>
       <li><a href="entry.html#tarentry">tarentry</a></li>
       <li><a href="fileset.html#tarfileset">tarfileset</a></li>

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=1158782&r1=1158781&r2=1158782&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 Wed Aug 17 15:47:38
2011
@@ -70,10 +70,6 @@
      />
 
   <typedef
-     name="tarentry"
-     classname="org.apache.ant.compress.resources.TarResource"
-     />
-  <typedef
      name="arentry"
      classname="org.apache.ant.compress.resources.ArResource"
      />
@@ -82,15 +78,19 @@
      classname="org.apache.ant.compress.resources.CpioResource"
      />
   <typedef
+     name="dumpentry"
+     classname="org.apache.ant.compress.resources.DumpResource"
+     />
+  <typedef
+     name="tarentry"
+     classname="org.apache.ant.compress.resources.TarResource"
+     />
+  <typedef
      name="zipentry"
      classname="org.apache.ant.compress.resources.ZipResource"
      />
 
   <typedef
-     name="tarfileset"
-     classname="org.apache.ant.compress.resources.TarFileSet"
-     />
-  <typedef
      name="arfileset"
      classname="org.apache.ant.compress.resources.ArFileSet"
      />
@@ -99,6 +99,14 @@
      classname="org.apache.ant.compress.resources.CpioFileSet"
      />
   <typedef
+     name="dumpfileset"
+     classname="org.apache.ant.compress.resources.DumpFileSet"
+     />
+  <typedef
+     name="tarfileset"
+     classname="org.apache.ant.compress.resources.TarFileSet"
+     />
+  <typedef
      name="zipfileset"
      classname="org.apache.ant.compress.resources.ZipFileSet"
      />

Copied: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpFileSet.java
(from r1158757, ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioFileSet.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpFileSet.java?p2=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpFileSet.java&p1=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioFileSet.java&r1=1158757&r2=1158782&rev=1158782&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioFileSet.java
(original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpFileSet.java
Wed Aug 17 15:47:38 2011
@@ -17,10 +17,10 @@
  */
 package org.apache.ant.compress.resources;
 
-import org.apache.ant.compress.util.CpioStreamFactory;
+import org.apache.ant.compress.util.DumpStreamFactory;
 
 import org.apache.commons.compress.archivers.ArchiveEntry;
-import org.apache.commons.compress.archivers.cpio.CpioArchiveEntry;
+import org.apache.commons.compress.archivers.dump.DumpArchiveEntry;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.AbstractFileSet;
@@ -31,15 +31,16 @@ import org.apache.tools.ant.types.Refere
 import org.apache.tools.ant.types.Resource;
 
 /**
- * A CpioFileSet is a FileSet with extra attributes useful in the context of
- * Cpio/Jar tasks.
+ * A DumpFileSet is a FileSet with extra attributes useful in the context of
+ * Dump tasks.
  *
- * A CpioFileSet extends FileSets with the ability to extract a subset of the
- * entries of a Cpio file for inclusion in another Cpio file.  It also includes
- * a prefix attribute which is prepended to each entry in the output Cpio file.
+ * 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.
  *
+ * @since Apache Commons Compress 1.1
  */
-public class CpioFileSet extends ArchiveFileSet {
+public class DumpFileSet extends ArchiveFileSet {
 
     private boolean userIdSet;
     private boolean groupIdSet;
@@ -49,8 +50,8 @@ public class CpioFileSet extends Archive
 
     private boolean skipUnreadable = false;
 
-    /** Constructor for CpioFileSet */
-    public CpioFileSet() {
+    /** Constructor for DumpFileSet */
+    public DumpFileSet() {
         super();
     }
 
@@ -58,35 +59,35 @@ public class CpioFileSet extends Archive
      * Constructor using a fileset arguement.
      * @param fileset the fileset to use
      */
-    protected CpioFileSet(FileSet fileset) {
+    protected DumpFileSet(FileSet fileset) {
         super(fileset);
     }
 
     /**
-     * Constructor using a cpiofileset arguement.
-     * @param fileset the cpiofileset to use
+     * Constructor using a dumpfileset arguement.
+     * @param fileset the dumpfileset to use
      */
-    protected CpioFileSet(CpioFileSet fileset) {
+    protected DumpFileSet(DumpFileSet fileset) {
         super(fileset);
     }
 
     /**
-     * The uid for the cpio entry
+     * The uid for the dump entry
      * This is not the same as the User name.
-     * @param uid the id of the user for the cpio entry.
+     * @param uid the id of the user for the dump entry.
      */
     public void setUid(int uid) {
-        checkCpioFileSetAttributesAllowed();
+        checkDumpFileSetAttributesAllowed();
         userIdSet = true;
         this.uid = uid;
     }
 
     /**
-     * @return the uid for the cpio entry
+     * @return the uid for the dump entry
      */
     public int getUid() {
         if (isReference()) {
-            return ((CpioFileSet) getCheckedRef()).getUid();
+            return ((DumpFileSet) getCheckedRef()).getUid();
         }
         return uid;
     }
@@ -99,12 +100,12 @@ public class CpioFileSet extends Archive
     }
 
     /**
-     * The GID for the cpio entry; optional, default="0"
+     * The GID for the dump entry; optional, default="0"
      * This is not the same as the group name.
      * @param gid the group id.
      */
     public void setGid(int gid) {
-        checkCpioFileSetAttributesAllowed();
+        checkDumpFileSetAttributesAllowed();
         groupIdSet = true;
         this.gid = gid;
     }
@@ -114,7 +115,7 @@ public class CpioFileSet extends Archive
      */
     public int getGid() {
         if (isReference()) {
-            return ((CpioFileSet) getCheckedRef()).getGid();
+            return ((DumpFileSet) getCheckedRef()).getGid();
         }
         return gid;
     }
@@ -128,8 +129,6 @@ public class CpioFileSet extends Archive
 
     /**
      * Whether to skip entries that Commons Compress signals it cannot read.
-     *
-     * @since Compress Antlib 1.1
      */
     public void setSkipUnreadableEntries(boolean b) {
         skipUnreadable = b;
@@ -140,11 +139,11 @@ public class CpioFileSet extends Archive
      * @return the created scanner.
      */
     protected ArchiveScanner newArchiveScanner() {
-        return new CommonsCompressArchiveScanner(new CpioStreamFactory(),
+        return new CommonsCompressArchiveScanner(new DumpStreamFactory(),
                                                  new CommonsCompressArchiveScanner.ResourceBuilder()
{
                 public Resource buildResource(Resource archive, String encoding,
                                               ArchiveEntry entry) {
-                    return new CpioResource(archive, (CpioArchiveEntry) entry);
+                    return new DumpResource(archive, (DumpArchiveEntry) entry);
                 }
             }, skipUnreadable, getProject());
     }
@@ -165,7 +164,7 @@ public class CpioFileSet extends Archive
     }
 
     /**
-     * A CpioFileset accepts another CpioFileSet or a FileSet as reference
+     * A DumpFileset accepts another DumpFileSet or a FileSet as reference
      * FileSets are often used by the war task for the lib attribute
      * @param p the project to use
      * @return the abstract fileset instance
@@ -173,58 +172,58 @@ public class CpioFileSet extends Archive
     protected AbstractFileSet getRef(Project p) {
         dieOnCircularReference(p);
         Object o = getRefid().getReferencedObject(p);
-        if (o instanceof CpioFileSet) {
+        if (o instanceof DumpFileSet) {
             return (AbstractFileSet) o;
         } else if (o instanceof FileSet) {
-            CpioFileSet zfs = new CpioFileSet((FileSet) o);
+            DumpFileSet zfs = new DumpFileSet((FileSet) o);
             configureFileSet(zfs);
             return zfs;
         } else {
-            String msg = getRefid().getRefId() + " doesn\'t denote a cpiofileset or a fileset";
+            String msg = getRefid().getRefId() + " doesn\'t denote a dumpfileset or a fileset";
             throw new BuildException(msg);
         }
     }
 
     /**
      * Configure a fileset based on this fileset.
-     * If the fileset is a CpioFileSet copy in the cpiofileset
+     * If the fileset is a DumpFileSet copy in the dumpfileset
      * specific attributes.
      * @param zfs the archive fileset to configure.
      */
     protected void configureFileSet(ArchiveFileSet zfs) {
         super.configureFileSet(zfs);
-        if (zfs instanceof CpioFileSet) {
-            CpioFileSet tfs = (CpioFileSet) zfs;
+        if (zfs instanceof DumpFileSet) {
+            DumpFileSet tfs = (DumpFileSet) zfs;
             tfs.setUid(uid);
             tfs.setGid(gid);
         }
     }
 
     /**
-     * Return a CpioFileSet that has the same properties
+     * Return a DumpFileSet that has the same properties
      * as this one.
-     * @return the cloned cpioFileSet
+     * @return the cloned dumpFileSet
      */
     public Object clone() {
         if (isReference()) {
-            return ((CpioFileSet) getRef(getProject())).clone();
+            return ((DumpFileSet) getRef(getProject())).clone();
         } else {
             return super.clone();
         }
     }
 
     /**
-     * A check attributes for CpioFileSet.
+     * A check attributes for DumpFileSet.
      * If there is a reference, and
-     * it is a CpioFileSet, the cpio fileset attributes
+     * it is a DumpFileSet, the dump fileset attributes
      * cannot be used.
      */
-    private void checkCpioFileSetAttributesAllowed() {
+    private void checkDumpFileSetAttributesAllowed() {
         if (getProject() == null
             || (isReference()
                 && (getRefid().getReferencedObject(
                         getProject())
-                    instanceof CpioFileSet))) {
+                    instanceof DumpFileSet))) {
             checkAttributesAllowed();
         }
     }

Copied: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpResource.java
(from r1158757, ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioResource.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpResource.java?p2=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpResource.java&p1=ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioResource.java&r1=1158757&r2=1158782&rev=1158782&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioResource.java
(original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpResource.java
Wed Aug 17 15:47:38 2011
@@ -20,40 +20,41 @@ package org.apache.ant.compress.resource
 import java.io.File;
 
 import org.apache.tools.ant.types.Resource;
-import org.apache.ant.compress.util.CpioStreamFactory;
-import org.apache.commons.compress.archivers.cpio.CpioArchiveEntry;
+import org.apache.ant.compress.util.DumpStreamFactory;
+import org.apache.commons.compress.archivers.dump.DumpArchiveEntry;
 
 /**
- * A Resource representation of an entry in a cpio archive.
+ * A Resource representation of an entry in a dump archive.
+ * @since Apache Commons Compress 1.1
  */
-public final class CpioResource extends CommonsCompressArchiveResource {
+public final class DumpResource extends CommonsCompressArchiveResource {
 
     /**
      * Default constructor.
      */
-    public CpioResource() {
-        super(new CpioStreamFactory(), "cpio");
+    public DumpResource() {
+        super(new DumpStreamFactory(), "dump");
     }
 
     /**
-     * Construct a CpioResource representing the specified
+     * Construct a DumpResource representing the specified
      * entry in the specified archive.
      * @param a the archive as File.
-     * @param e the CpioEntry.
+     * @param e the DumpEntry.
      */
-    public CpioResource(File a, CpioArchiveEntry e) {
-        super(new CpioStreamFactory(), "cpio", a, e);
+    public DumpResource(File a, DumpArchiveEntry e) {
+        super(new DumpStreamFactory(), "dump", a, e);
         setEntry(e);
     }
 
     /**
-     * Construct a CpioResource representing the specified
+     * Construct a DumpResource representing the specified
      * entry in the specified archive.
      * @param a the archive as Resource.
-     * @param e the CpioEntry.
+     * @param e the DumpEntry.
      */
-    public CpioResource(Resource a, CpioArchiveEntry e) {
-        super(new CpioStreamFactory(), "cpio", a, e);
+    public DumpResource(Resource a, DumpArchiveEntry e) {
+        super(new DumpStreamFactory(), "dump", a, e);
         setEntry(e);
     }
 

Copied: ant/antlibs/compress/trunk/src/tests/antunit/dumpentry-test.xml (from r1158757, ant/antlibs/compress/trunk/src/tests/antunit/cpioentry-test.xml)
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/dumpentry-test.xml?p2=ant/antlibs/compress/trunk/src/tests/antunit/dumpentry-test.xml&p1=ant/antlibs/compress/trunk/src/tests/antunit/cpioentry-test.xml&r1=1158757&r2=1158782&rev=1158782&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/cpioentry-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/dumpentry-test.xml Wed Aug 17 15:47:38 2011
@@ -26,11 +26,11 @@
     <mkdir dir="${output}"/>
   </target>
 
-  <target name="testCpioSource" depends="setUp">
+  <target name="testDumpSource" depends="setUp">
     <copy todir="${output}">
-      <cmp:cpioentry name="asf-logo.gif">
-        <file file="../resources/asf-logo.gif.bin.cpio"/>
-      </cmp:cpioentry>
+      <cmp:dumpentry name="/asf-logo.gif">
+        <file file="../resources/asf-logo.gif.dump"/>
+      </cmp:dumpentry>
     </copy>
     <au:assertFilesMatch
        actual="${output}/asf-logo.gif"
@@ -38,34 +38,34 @@
        />
   </target>
 
-  <target name="testResourceProperties">
+  <target name="NOtestResourceProperties">
     <au:assertTrue>
       <cond:islastmodified datetime="2009-07-31-20:11:13 +0200"
                            pattern="yyyy-MM-dd-HH:mm:ss Z">
-        <cmp:cpioentry name="asf-logo.gif">
-          <file file="../resources/asf-logo.gif.bin.cpio"/>
-        </cmp:cpioentry>
+        <cmp:dumpentry name="/asf-logo.gif">
+          <file file="../resources/asf-logo.gif.dump"/>
+        </cmp:dumpentry>
       </cond:islastmodified>
     </au:assertTrue>
     <au:assertTrue>
       <cmp:hasuserid id="1000">
-        <cmp:cpioentry name="asf-logo.gif">
-          <file file="../resources/asf-logo.gif.bin.cpio"/>
-        </cmp:cpioentry>
+        <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:cpioentry name="asf-logo.gif">
-          <file file="../resources/asf-logo.gif.bin.cpio"/>
-        </cmp:cpioentry>
+        <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:cpioentry name="asf-logo.gif">
-          <file file="../resources/asf-logo.gif.bin.cpio"/>
-        </cmp:cpioentry>
+        <cmp:dumpentry name="/asf-logo.gif">
+          <file file="../resources/asf-logo.gif.dump"/>
+        </cmp:dumpentry>
       </cmp:hasmode>
     </au:assertTrue>
   </target>

Copied: ant/antlibs/compress/trunk/src/tests/antunit/dumpfileset-test.xml (from r1158757,
ant/antlibs/compress/trunk/src/tests/antunit/cpiofileset-test.xml)
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/dumpfileset-test.xml?p2=ant/antlibs/compress/trunk/src/tests/antunit/dumpfileset-test.xml&p1=ant/antlibs/compress/trunk/src/tests/antunit/cpiofileset-test.xml&r1=1158757&r2=1158782&rev=1158782&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/cpiofileset-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/dumpfileset-test.xml Wed Aug 17 15:47:38
2011
@@ -27,9 +27,9 @@
 
   <target name="testMissingArchive">
     <mkdir dir="${output}"/>
-    <au:expectfailure expectedMessage="The archive foo.cpio doesn't exist">
+    <au:expectfailure expectedMessage="The archive foo.dump doesn't exist">
       <copy todir="${output}">
-        <cmp:cpiofileset src="foo.cpio"/>
+        <cmp:dumpfileset src="foo.dump"/>
       </copy>
     </au:expectfailure>
   </target>
@@ -37,13 +37,13 @@
   <target name="testMissingArchiveDoesntMatter">
     <mkdir dir="${output}"/>
     <copy todir="${output}">
-      <cmp:cpiofileset src="foo.cpio" errorOnMissingArchive="false"/>
+      <cmp:dumpfileset src="foo.dump" errorOnMissingArchive="false"/>
     </copy>
   </target>
 
-  <target name="testCpioSource" depends="setUp">
+  <target name="testDumpSource" depends="setUp">
     <copy todir="${output}">
-      <cmp:cpiofileset src="../resources/asf-logo.gif.bin.cpio"
+      <cmp:dumpfileset src="../resources/asf-logo.gif.dump"
                       includes="*.gif"/>
     </copy>
     <au:assertFilesMatch
@@ -53,14 +53,14 @@
   </target>
 
   <target name="testUncompressSource" depends="setUp">
-    <gzip destfile="${input}/asf-logo.gif.bin.cpio.gz"
-          src="../resources/asf-logo.gif.bin.cpio"/>
+    <gzip destfile="${input}/asf-logo.gif.dump.gz"
+          src="../resources/asf-logo.gif.dump"/>
     <copy todir="${output}">
-      <cmp:cpiofileset includes="*.gif">
+      <cmp:dumpfileset includes="*.gif">
         <gzipresource>
-          <file file="${input}/asf-logo.gif.bin.cpio.gz"/>
+          <file file="${input}/asf-logo.gif.dump.gz"/>
         </gzipresource>
-      </cmp:cpiofileset>
+      </cmp:dumpfileset>
     </copy>
     <au:assertFilesMatch
        actual="${output}/asf-logo.gif"



Mime
View raw message