Author: bodewig
Date: Thu Aug 18 04:39:06 2011
New Revision: 1159031
URL: http://svn.apache.org/viewvc?rev=1159031&view=rev
Log:
Compress' dump code no longer produces leading slashes for entries that don't
have one in the first place
Modified:
ant/antlibs/compress/trunk/docs/expand.html
ant/antlibs/compress/trunk/src/tests/antunit/dumpentry-test.xml
ant/antlibs/compress/trunk/src/tests/antunit/undump-test.xml
Modified: ant/antlibs/compress/trunk/docs/expand.html
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/docs/expand.html?rev=1159031&r1=1159030&r2=1159031&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/docs/expand.html (original)
+++ ant/antlibs/compress/trunk/docs/expand.html Thu Aug 18 04:39:06 2011
@@ -120,9 +120,6 @@ mapper</a>.</p>
<p>An <a href="#expand">unarchiving task</a> for Unix dump archives.</p>
-<p>Note that entries likely have a leading "/" so you may want to
- set <code>stripabsolutepathspec</code> to <code>true</code>.</p>
-
<h3><a name="untar">UnTar</a></h3>
<p>An <a href="#expand">unarchiving task</a> for TAR archives.</p>
Modified: ant/antlibs/compress/trunk/src/tests/antunit/dumpentry-test.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/dumpentry-test.xml?rev=1159031&r1=1159030&r2=1159031&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/dumpentry-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/dumpentry-test.xml Thu Aug 18
04:39:06 2011
@@ -28,7 +28,7 @@
<target name="testDumpSource" depends="setUp">
<copy todir="${output}">
- <cmp:dumpentry name="/asf-logo.gif">
+ <cmp:dumpentry name="asf-logo.gif">
<file file="../resources/asf-logo.gif.dump"/>
</cmp:dumpentry>
</copy>
@@ -42,28 +42,28 @@
<au:assertTrue>
<cond:islastmodified datetime="2009-07-31-20:11:13 +0200"
pattern="yyyy-MM-dd-HH:mm:ss Z">
- <cmp:dumpentry name="/asf-logo.gif">
+ <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:dumpentry name="/asf-logo.gif">
+ <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">
+ <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">
+ <cmp:dumpentry name="asf-logo.gif">
<file file="../resources/asf-logo.gif.dump"/>
</cmp:dumpentry>
</cmp:hasmode>
Modified: ant/antlibs/compress/trunk/src/tests/antunit/undump-test.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/undump-test.xml?rev=1159031&r1=1159030&r2=1159031&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/undump-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/undump-test.xml Thu Aug 18
04:39:06 2011
@@ -27,8 +27,7 @@
</target>
<target name="testAgainstNativeDump" depends="setUp">
- <cmp:undump src="../resources/asf-logo.gif.dump" dest="${output}"
- stripabsolutepathspec="true"/>
+ <cmp:undump src="../resources/asf-logo.gif.dump" dest="${output}"/>
<au:assertFileExists file="${output}/asf-logo.gif"/>
<au:assertFilesMatch
actual="${output}/asf-logo.gif"
@@ -37,8 +36,7 @@
</target>
<target name="testAgainstNativeDumpCompressed" depends="setUp">
- <cmp:undump src="../resources/asf-logo.gif.z.dump" dest="${output}"
- stripabsolutepathspec="true"/>
+ <cmp:undump src="../resources/asf-logo.gif.z.dump" dest="${output}"/>
<au:assertFileExists file="${output}/asf-logo.gif"/>
<au:assertFilesMatch
actual="${output}/asf-logo.gif"
@@ -50,7 +48,7 @@
<zip destfile="${input}/test.zip">
<fileset dir="../resources" includes="*.dump"/>
</zip>
- <cmp:undump dest="${output}" stripabsolutepathspec="true">
+ <cmp:undump dest="${output}">
<zipfileset src="${input}/test.zip">
<include name="*.dump"/>
</zipfileset>
