stevel 02/01/06 22:21:49
Modified: src/etc/testcases/taskdefs jar.xml zip.xml
Log:
Addition of destFile(File) attr to the zip/war/ear/jar tasks, fixup of docs,
replacement of deprecation methods and appropriate changes to the tests.
Revision Changes Path
1.3 +4 -4 jakarta-ant/src/etc/testcases/taskdefs/jar.xml
Index: jar.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/jar.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jar.xml 18 Dec 2000 15:43:56 -0000 1.2
+++ jar.xml 7 Jan 2002 06:21:49 -0000 1.3
@@ -15,7 +15,7 @@
<target name="test3">
<jar
- jarfile="jar.tmp"
+ destfile="jar.tmp"
whenempty="format C: /y"
/>
</target>
@@ -24,7 +24,7 @@
<!-- delete the tmp.jar or the next test will fail -->
<delete file="tmp.jar"/>
<jar
- jarfile="tmp.jar"
+ destfile="tmp.jar"
basedir="."
includes="jar.xml"
/>
@@ -33,10 +33,10 @@
<!-- This test is to make sure upToDate is working -->
<target name="test5">
<jar
- jarfile="tmp.jar"
+ destfile="tmp.jar"
basedir="."
includes="jar.xml"
/>
</target>
-</project>
\ No newline at end of file
+</project>
1.6 +14 -7 jakarta-ant/src/etc/testcases/taskdefs/zip.xml
Index: zip.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/zip.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- zip.xml 21 Nov 2001 15:45:26 -0000 1.5
+++ zip.xml 7 Jan 2002 06:21:49 -0000 1.6
@@ -7,21 +7,21 @@
</target>
<target name="test2">
- <zip zipfile="zip.tmp"/>
+ <zip destFile="zip.tmp"/>
</target>
<!-- Test when the zip file includes itself
when target file exists before the zip task is run -->
<target name="test3">
<touch file="test3.zip"/>
- <zip zipfile="test3.zip"
+ <zip destFile="test3.zip"
basedir="."/>
</target>
<!-- Test when the zip file includes itself
when target file does not exist before the zip task is run -->
<target name="test4">
- <zip zipfile="test4.zip"
+ <zip destFile="test4.zip"
basedir="."/>
</target>
@@ -32,28 +32,35 @@
</target>
<target name="test6">
- <zip zipfile="test6.zip" basedir=".">
+ <zip destFile="test6.zip" basedir=".">
<include name="*.xml" />
<exclude name="zip.*" />
</zip>
</target>
<target name="test7">
- <zip zipfile="inner7.zip" basedir="." >
+ <zip destFile="inner7.zip" basedir="." >
<exclude name="inner7.zip" />
</zip>
- <zip zipfile="test7.zip" basedir=".">
+ <zip destFile="test7.zip" basedir=".">
<exclude name="**/*.*" />
<zipfileset src="inner7.zip" />
</zip>
</target>
<target name="feather">
- <zip zipfile="asf-logo.gif.zip"
+ <zip destFile="asf-logo.gif.zip"
basedir=".."
includes="asf-logo.gif" />
</target>
+ <!-- legacy attribute support -->
+ <target name="test8">
+ <zip zipfile="test8.zip" basedir="." >
+ <exclude name="test8.zip" />
+ </zip>
+ </target>
+
<target name="cleanup">
<delete file="test3.zip"/>
<delete file="test4.zip"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
