You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/07/04 15:24:27 UTC
[09/11] ant git commit: Trailing whitespace (cherry-pick 2f64e0b)
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/fail.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/fail.xml b/src/etc/testcases/taskdefs/fail.xml
index 0a6561e..a5d88d1 100644
--- a/src/etc/testcases/taskdefs/fail.xml
+++ b/src/etc/testcases/taskdefs/fail.xml
@@ -29,23 +29,23 @@
<target name="testText">
<fail>testText</fail>
</target>
-
+
<target name="testIf">
- <fail if="foo" />
+ <fail if="foo"/>
</target>
<target name="testUnless">
- <fail unless="foo" />
+ <fail unless="foo"/>
</target>
<target name="testIfAndUnless">
<fail unless="unless" if="if"/>
</target>
-
+
<target name="testNested1" description="should fail with default message">
<fail>
<condition>
- <and />
+ <and/>
</condition>
</fail>
</target>
@@ -53,7 +53,7 @@
<target name="testNested2" description="should pass">
<fail>
<condition>
- <or />
+ <or/>
</condition>
</fail>
</target>
@@ -61,7 +61,7 @@
<target name="testNested3" description="should fail">
<fail message="testNested3">
<condition>
- <and />
+ <and/>
</condition>
</fail>
</target>
@@ -69,7 +69,7 @@
<target name="testNested4a" description="should error">
<fail if="if">
<condition>
- <and />
+ <and/>
</condition>
</fail>
</target>
@@ -77,7 +77,7 @@
<target name="testNested4b" description="should error">
<fail unless="unless">
<condition>
- <and />
+ <and/>
</condition>
</fail>
</target>
@@ -85,7 +85,7 @@
<target name="testNested4c" description="should error">
<fail if="if" unless="unless">
<condition>
- <and />
+ <and/>
</condition>
</fail>
</target>
@@ -93,10 +93,10 @@
<target name="testNested5" description="should error">
<fail>
<condition>
- <or />
+ <or/>
</condition>
<condition>
- <and />
+ <and/>
</condition>
</fail>
</target>
@@ -104,7 +104,7 @@
<target name="testNested6" description="should fail with message">
<fail>
<condition>
- <and />
+ <and/>
</condition>
testNested6
testNested6
@@ -114,15 +114,15 @@ testNested6
<target name="testNested7a" description="should error">
<fail>
- <condition />
+ <condition/>
</fail>
</target>
<target name="testNested7b" description="should error">
<fail>
<condition>
- <and />
- <and />
+ <and/>
+ <and/>
</condition>
</fail>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/filter.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/filter.xml b/src/etc/testcases/taskdefs/filter.xml
index 303efa7..d4a7525 100644
--- a/src/etc/testcases/taskdefs/filter.xml
+++ b/src/etc/testcases/taskdefs/filter.xml
@@ -35,38 +35,38 @@
</target>
<target name="test5">
- <filter token="year" value="2000" />
- <copy file="filter1.txt" tofile="filtered.tmp" filtering="yes" overwrite="yes" />
+ <filter token="year" value="2000"/>
+ <copy file="filter1.txt" tofile="filtered.tmp" filtering="yes" overwrite="yes"/>
</target>
<target name="test6">
- <filter token="year" value="2000" />
+ <filter token="year" value="2000"/>
<copy todir="./taskdefs.tmp" filtering="yes" overwrite="yes">
- <fileset dir="." includes="filter1.txt" />
+ <fileset dir="." includes="filter1.txt"/>
</copy>
</target>
<target name="test7">
- <filter token="ROOT" value="root" />
- <copy file="filter2.txt" tofile="filtered.tmp" filtering="yes" overwrite="yes" />
+ <filter token="ROOT" value="root"/>
+ <copy file="filter2.txt" tofile="filtered.tmp" filtering="yes" overwrite="yes"/>
</target>
<target name="test8">
- <filter token="ROOT" value="root" />
+ <filter token="ROOT" value="root"/>
<copy todir="./taskdefs.tmp" filtering="yes" overwrite="yes">
<fileset dir="." includes="filter2.txt"/>
</copy>
</target>
<target name="test9">
- <filter filtersfile="filterdefs.properties" />
+ <filter filtersfile="filterdefs.properties"/>
<copy todir="./taskdefs.tmp" filtering="yes" overwrite="yes">
<fileset dir="." includes="filter3.txt"/>
</copy>
</target>
<target name="cleanup">
- <delete dir="taskdefs.tmp" />
+ <delete dir="taskdefs.tmp"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/fixcrlf/build.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/fixcrlf/build.xml b/src/etc/testcases/taskdefs/fixcrlf/build.xml
index e2fecac..e36ea00 100644
--- a/src/etc/testcases/taskdefs/fixcrlf/build.xml
+++ b/src/etc/testcases/taskdefs/fixcrlf/build.xml
@@ -19,23 +19,23 @@
<import file="../../buildfiletest-base.xml"/>
<target name="setUp">
- <mkdir dir="${input}" />
+ <mkdir dir="${input}"/>
<unzip src="input.zip" dest="${input}"/>
<unzip src="expected.zip" dest="${input}"/>
- <mkdir dir="${output}" />
+ <mkdir dir="${output}"/>
</target>
<macrodef name="assertequal">
- <attribute name="junk" default="" />
- <attribute name="name" default="Junk@{junk}.java" />
- <attribute name="file1" default="${output}/@{name}" />
- <attribute name="file2" default="${input}/expected/@{name}" />
+ <attribute name="junk" default=""/>
+ <attribute name="name" default="Junk@{junk}.java"/>
+ <attribute name="file1" default="${output}/@{name}"/>
+ <attribute name="file2" default="${input}/expected/@{name}"/>
<sequential>
<fail message="@{file1} and @{file2} are different">
<condition>
<not>
- <filesmatch file1="@{file1}" file2="@{file2}" />
+ <filesmatch file1="@{file1}" file2="@{file2}"/>
</not>
</condition>
</fail>
@@ -45,82 +45,82 @@
<target name="test1" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
includes="Junk1.java"
- javafiles="true" tab="add" eol="crlf" eof="asis" />
- <assertequal junk="1" />
+ javafiles="true" tab="add" eol="crlf" eof="asis"/>
+ <assertequal junk="1"/>
</target>
<target name="test2" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
includes="Junk2.java"
- javafiles="true" tab="add" cr="add" eol="crlf" eof="asis" />
- <assertequal junk="2" />
+ javafiles="true" tab="add" cr="add" eol="crlf" eof="asis"/>
+ <assertequal junk="2"/>
</target>
<target name="test3" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
includes="Junk3.java"
- javafiles="true" tab="remove" eol="lf" eof="asis" />
- <assertequal junk="3" />
+ javafiles="true" tab="remove" eol="lf" eof="asis"/>
+ <assertequal junk="3"/>
</target>
<target name="test4" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
includes="Junk4.java"
- javafiles="true" tab="remove" eol="lf" eof="asis" />
- <assertequal junk="4" />
+ javafiles="true" tab="remove" eol="lf" eof="asis"/>
+ <assertequal junk="4"/>
</target>
<target name="test5" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
includes="Junk5.java"
- tab="remove" eol="lf" eof="asis" />
- <assertequal junk="5" />
+ tab="remove" eol="lf" eof="asis"/>
+ <assertequal junk="5"/>
</target>
<target name="test6" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
includes="Junk6.java"
- tab="add" cr="remove" eol="crlf" eof="asis" />
- <assertequal junk="6" />
+ tab="add" cr="remove" eol="crlf" eof="asis"/>
+ <assertequal junk="6"/>
</target>
<target name="test7" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
includes="Junk7.java"
- tab="add" cr="add" eof="asis" />
- <assertequal junk="7" />
+ tab="add" cr="add" eof="asis"/>
+ <assertequal junk="7"/>
</target>
<target name="test8" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
includes="Junk8.java"
- javafiles="true" tab="add" cr="add" eof="add" />
- <assertequal junk="8" />
+ javafiles="true" tab="add" cr="add" eof="add"/>
+ <assertequal junk="8"/>
</target>
<target name="test9" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
includes="Junk9.java"
- javafiles="true" tab="remove" cr="remove" eof="remove" />
- <assertequal junk="9" />
+ javafiles="true" tab="remove" cr="remove" eof="remove"/>
+ <assertequal junk="9"/>
</target>
<target name="testMacLines" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
- includes="Mac2Unix" eol="lf" />
- <assertequal name="Mac2Unix" />
+ includes="Mac2Unix" eol="lf"/>
+ <assertequal name="Mac2Unix"/>
</target>
<target name="testNoOverwrite" depends="test1">
- <touch file="${output}/Junk1.java" millis="0" />
+ <touch file="${output}/Junk1.java" millis="0"/>
<fixcrlf srcdir="${input}/input" destdir="${output}"
includes="Junk1.java" preservelastmodified="false"
- javafiles="true" tab="add" eol="crlf" eof="asis" />
+ javafiles="true" tab="add" eol="crlf" eof="asis"/>
<fail message="overwrote unchanged output file">Q
<condition>
<not>
<isfileselected file="${output}/Junk1.java">
- <date when="equal" millis="0" />
+ <date when="equal" millis="0"/>
</isfileselected>
</not>
</condition>
@@ -130,74 +130,74 @@
<target name="testEncoding" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
includes="input.crlf.utf16"
- javafiles="false" cr="remove" encoding="UnicodeBig" />
+ javafiles="false" cr="remove" encoding="UnicodeBig"/>
<assertequal file1="${output}/input.crlf.utf16"
- file2="${input}/expected/input.lf.utf16" />
+ file2="${input}/expected/input.lf.utf16"/>
</target>
<target name="testOutputEncoding" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
includes="input.crlf.utf16"
javafiles="false" eol="lf" encoding="UnicodeBig"
- outputencoding="ascii" />
+ outputencoding="ascii"/>
<assertequal file1="${output}/input.crlf.utf16"
- file2="${input}/expected/input.lf.ascii" />
+ file2="${input}/expected/input.lf.ascii"/>
</target>
<target name="testLongLines" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
includes="longlines.crlf"
- javafiles="false" cr="remove" />
+ javafiles="false" cr="remove"/>
<assertequal file1="${output}/longlines.crlf"
- file2="${input}/expected/longlines.lf" />
+ file2="${input}/expected/longlines.lf"/>
</target>
<target name="testCrCrLfSequence-unix" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
- includes="crcrlf" eol="lf" />
+ includes="crcrlf" eol="lf"/>
<assertequal file1="${output}/crcrlf"
- file2="${input}/expected/crcrlf.unix" />
+ file2="${input}/expected/crcrlf.unix"/>
</target>
<target name="testCrCrLfSequence-dos" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
- includes="crcrlf" eol="crlf" />
+ includes="crcrlf" eol="crlf"/>
<assertequal file1="${output}/crcrlf"
- file2="${input}/expected/crcrlf.dos" />
+ file2="${input}/expected/crcrlf.dos"/>
</target>
<target name="testCrCrLfSequence-mac" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
- includes="crcrlf" eol="cr" />
+ includes="crcrlf" eol="cr"/>
<assertequal file1="${output}/crcrlf"
- file2="${input}/expected/crcrlf.mac" />
+ file2="${input}/expected/crcrlf.mac"/>
</target>
<target name="testFixlastDos" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
- includes="fixlastfalse.lf" eol="crlf" />
+ includes="fixlastfalse.lf" eol="crlf"/>
<assertequal file1="${output}/fixlastfalse.lf"
- file2="${input}/expected/fixlast.dos" />
+ file2="${input}/expected/fixlast.dos"/>
</target>
<target name="testFixlastFalseMac" depends="setUp">
<fixcrlf srcdir="${input}/input" destdir="${output}"
- includes="fixlastfalse.lf" eol="cr" fixlast="false" />
+ includes="fixlastfalse.lf" eol="cr" fixlast="false"/>
<assertequal file1="${output}/fixlastfalse.lf"
- file2="${input}/expected/fixlastfalse.mac" />
+ file2="${input}/expected/fixlastfalse.mac"/>
</target>
<!-- Bugzilla Report 20840 -->
<target name="createParentDirs" depends="setUp">
- <fixcrlf srcdir="${input}" destdir="${output}" includes="input/Junk1.java" />
+ <fixcrlf srcdir="${input}" destdir="${output}" includes="input/Junk1.java"/>
</target>
<target name="testFixFile" depends="setUp">
- <fixcrlf file="${input}/input/longlines.crlf" destdir="${output}" />
+ <fixcrlf file="${input}/input/longlines.crlf" destdir="${output}"/>
<fail message="didn't create output file">
<condition>
<not>
- <available file="${output}/longlines.crlf" />
+ <available file="${output}/longlines.crlf"/>
</not>
</condition>
</fail>
@@ -209,123 +209,123 @@
<target name="testPreserveLastModified" depends="setUp">
<fixcrlf file="${input}/input/longlines.crlf" destdir="${output}"
- preservelastmodified="true" />
+ preservelastmodified="true"/>
<fail>
<condition>
<not>
<uptodate srcfile="${output}/longlines.crlf"
- targetfile="${input}/input/longlines.crlf" />
+ targetfile="${input}/input/longlines.crlf"/>
</not>
</condition>
</fail>
- <touch file="${output}/longlines.crlf" millis="0" />
+ <touch file="${output}/longlines.crlf" millis="0"/>
<fixcrlf file="${output}/longlines.crlf" destdir="${output}" eol="lf"
- preservelastmodified="true" />
+ preservelastmodified="true"/>
<fileset id="fs" file="${output}/longlines.crlf">
- <date when="equal" millis="0" />
+ <date when="equal" millis="0"/>
</fileset>
- <property name="fs" refid="fs" />
- <fail unless="fs" />
+ <property name="fs" refid="fs"/>
+ <fail unless="fs"/>
</target>
<target name="testFilter1" depends="setUp">
<copy file="${input}/input/Junk1.java" todir="${output}" overwrite="true">
<filterchain>
<fixcrlf javafiles="true" tab="add"
- eol="crlf" eof="asis" />
+ eol="crlf" eof="asis"/>
</filterchain>
</copy>
- <assertequal junk="1" />
+ <assertequal junk="1"/>
</target>
<target name="testFilter2" depends="setUp">
<copy file="${input}/input/Junk2.java" todir="${output}" overwrite="true">
<filterchain>
- <fixcrlf javafiles="true" tab="add" cr="add" eol="crlf" eof="asis" />
+ <fixcrlf javafiles="true" tab="add" cr="add" eol="crlf" eof="asis"/>
</filterchain>
</copy>
- <assertequal junk="2" />
+ <assertequal junk="2"/>
</target>
<target name="testFilter3" depends="setUp">
<copy file="${input}/input/Junk3.java" todir="${output}" overwrite="true">
<filterchain>
- <fixcrlf javafiles="true" tab="remove" eol="lf" eof="asis" />
+ <fixcrlf javafiles="true" tab="remove" eol="lf" eof="asis"/>
</filterchain>
</copy>
- <assertequal junk="3" />
+ <assertequal junk="3"/>
</target>
<target name="testFilter4" depends="setUp">
<copy file="${input}/input/Junk4.java" todir="${output}" overwrite="true">
<filterchain>
- <fixcrlf javafiles="true" tab="remove" eol="lf" eof="asis" />
+ <fixcrlf javafiles="true" tab="remove" eol="lf" eof="asis"/>
</filterchain>
</copy>
- <assertequal junk="4" />
+ <assertequal junk="4"/>
</target>
<target name="testFilter5" depends="setUp">
<copy file="${input}/input/Junk5.java" todir="${output}" overwrite="true">
<filterchain>
- <fixcrlf tab="remove" eol="lf" eof="asis" />
+ <fixcrlf tab="remove" eol="lf" eof="asis"/>
</filterchain>
</copy>
- <assertequal junk="5" />
+ <assertequal junk="5"/>
</target>
<target name="testFilter6" depends="setUp">
<copy file="${input}/input/Junk6.java" todir="${output}" overwrite="true">
<filterchain>
- <fixcrlf tab="add" cr="remove" eol="crlf" eof="asis" />
+ <fixcrlf tab="add" cr="remove" eol="crlf" eof="asis"/>
</filterchain>
</copy>
- <assertequal junk="6" />
+ <assertequal junk="6"/>
</target>
<target name="testFilter7" depends="setUp">
<copy file="${input}/input/Junk7.java" todir="${output}" overwrite="true">
<filterchain>
- <fixcrlf tab="add" cr="add" eof="asis" />
+ <fixcrlf tab="add" cr="add" eof="asis"/>
</filterchain>
</copy>
- <assertequal junk="7" />
+ <assertequal junk="7"/>
</target>
<target name="testFilter8" depends="setUp">
<copy file="${input}/input/Junk8.java" todir="${output}" overwrite="true">
<filterchain>
- <fixcrlf javafiles="true" tab="add" cr="add" eof="add" />
+ <fixcrlf javafiles="true" tab="add" cr="add" eof="add"/>
</filterchain>
</copy>
- <assertequal junk="8" />
+ <assertequal junk="8"/>
</target>
<target name="testFilter9" depends="setUp">
<copy file="${input}/input/Junk9.java" todir="${output}" overwrite="true">
<filterchain>
- <fixcrlf javafiles="true" tab="remove" cr="remove" eof="remove" />
+ <fixcrlf javafiles="true" tab="remove" cr="remove" eof="remove"/>
</filterchain>
</copy>
- <assertequal junk="9" />
+ <assertequal junk="9"/>
</target>
<target name="testCannotDoubleEof" depends="test8">
<fixcrlf file="${output}/Junk8.java"
- javafiles="true" tab="add" cr="add" eof="add" />
- <assertequal junk="8" />
+ javafiles="true" tab="add" cr="add" eof="add"/>
+ <assertequal junk="8"/>
</target>
<target name="testTabInLiteralInComment" depends="setUp">
<copy file="${input}/input/tab_in_literal_in_comment" todir="${output}"
overwrite="true">
<filterchain>
- <fixcrlf javafiles="true" tab="remove" eol="lf" fixlast="false" />
+ <fixcrlf javafiles="true" tab="remove" eol="lf" fixlast="false"/>
</filterchain>
</copy>
- <assertequal name="tab_in_literal_in_comment" />
+ <assertequal name="tab_in_literal_in_comment"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/get.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/get.xml b/src/etc/testcases/taskdefs/get.xml
index b74e92a..325bfa6 100644
--- a/src/etc/testcases/taskdefs/get.xml
+++ b/src/etc/testcases/taskdefs/get.xml
@@ -41,13 +41,13 @@
<target name="test6">
<get src="http://www.apache.org/" dest="get.tmp" userAgent="Apache Ant/test"/>
- <fileset id="t6" file="get.tmp" />
- <pathconvert property="t6" refid="t6" setonempty="false" />
+ <fileset id="t6" file="get.tmp"/>
+ <pathconvert property="t6" refid="t6" setonempty="false"/>
<fail message="get failed">
<condition>
<not>
- <isset property="t6" />
+ <isset property="t6"/>
</not>
</condition>
</fail>
@@ -57,42 +57,42 @@
<get src="" dest="" userAgent=""/>
</target>
- <target name="testUseTimestamp" depends="-90s,-timestamp" />
+ <target name="testUseTimestamp" depends="-90s,-timestamp"/>
<target name="-90s">
- <property name="off" value="-90" />
- <property name="unit" value="second" />
+ <property name="off" value="-90"/>
+ <property name="unit" value="second"/>
</target>
- <target name="testUseTomorrow" depends="+1d,-timestamp" />
+ <target name="testUseTomorrow" depends="+1d,-timestamp"/>
<target name="+1d">
- <property name="off" value="1" />
- <property name="unit" value="day" />
+ <property name="off" value="1"/>
+ <property name="unit" value="day"/>
</target>
<target name="-timestamp">
- <property name="pat" value="yyyyMMddHHmm" />
+ <property name="pat" value="yyyyMMddHHmm"/>
<tstamp>
- <format property="dt" pattern="${pat}" offset="${off}" unit="${unit}" />
+ <format property="dt" pattern="${pat}" offset="${off}" unit="${unit}"/>
</tstamp>
- <touch file="get.tmp" datetime="${dt}" pattern="${pat}" />
+ <touch file="get.tmp" datetime="${dt}" pattern="${pat}"/>
<get src="http://www.w3.org/MarkUp" dest="get.tmp"
- usetimestamp="true" verbose="true" />
+ usetimestamp="true" verbose="true"/>
<fileset id="ts" file="get.tmp">
- <date when="equal" datetime="${dt}" pattern="${pat}" />
+ <date when="equal" datetime="${dt}" pattern="${pat}"/>
</fileset>
- <pathconvert property="ts" refid="ts" setonempty="false" />
+ <pathconvert property="ts" refid="ts" setonempty="false"/>
<fail message="get w/ timestamp should have failed.">
<condition>
<not>
- <isset property="ts" />
+ <isset property="ts"/>
</not>
</condition>
</fail>
@@ -100,7 +100,7 @@
<target name="cleanup">
<delete>
- <fileset dir="${basedir}" includes="get.tmp" />
+ <fileset dir="${basedir}" includes="get.tmp"/>
</delete>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/gunzip.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/gunzip.xml b/src/etc/testcases/taskdefs/gunzip.xml
index ea75d54..91ef55c 100644
--- a/src/etc/testcases/taskdefs/gunzip.xml
+++ b/src/etc/testcases/taskdefs/gunzip.xml
@@ -27,17 +27,17 @@
</target>
<target name="cleanup">
- <delete file="asf-logo.gif" />
+ <delete file="asf-logo.gif"/>
</target>
<target name="testGzipTask">
- <ant antfile="gzip.xml" target="realTest" />
- <gunzip src="asf-logo.gif.gz" dest="asf-logo.gif" />
- <ant antfile="gzip.xml" target="cleanup" />
+ <ant antfile="gzip.xml" target="realTest"/>
+ <gunzip src="asf-logo.gif.gz" dest="asf-logo.gif"/>
+ <ant antfile="gzip.xml" target="cleanup"/>
</target>
<target name="realTest">
- <gunzip src="expected/asf-logo.gif.gz" dest="asf-logo.gif" />
+ <gunzip src="expected/asf-logo.gif.gz" dest="asf-logo.gif"/>
</target>
<target name="realTestWithResource">
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/gzip.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/gzip.xml b/src/etc/testcases/taskdefs/gzip.xml
index f1c4262..931bc39 100644
--- a/src/etc/testcases/taskdefs/gzip.xml
+++ b/src/etc/testcases/taskdefs/gzip.xml
@@ -31,26 +31,26 @@
</target>
<target name="test4">
- <gzip src="gzip.xml" zipfile="." />
+ <gzip src="gzip.xml" zipfile="."/>
</target>
<target name="realTest">
- <gzip src="../asf-logo.gif" zipfile="asf-logo.gif.gz" />
+ <gzip src="../asf-logo.gif" zipfile="asf-logo.gif.gz"/>
</target>
<target name="realTestWithResource">
<gzip zipfile="asf-logo.gif.gz">
<file file="../asf-logo.gif"/>
- </gzip>
+ </gzip>
</target>
<target name="testDateCheck">
<touch file="asf-logo.gif.gz"/>
- <gzip src="../asf-logo.gif" zipfile="asf-logo.gif.gz" />
+ <gzip src="../asf-logo.gif" zipfile="asf-logo.gif.gz"/>
</target>
<target name="cleanup">
- <delete file="asf-logo.gif.gz" />
+ <delete file="asf-logo.gif.gz"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/import/import.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/import/import.xml b/src/etc/testcases/taskdefs/import/import.xml
index f84d8e3..4741741 100644
--- a/src/etc/testcases/taskdefs/import/import.xml
+++ b/src/etc/testcases/taskdefs/import/import.xml
@@ -16,14 +16,14 @@
limitations under the License.
-->
<project name="import-test" default="main" basedir=".">
- <echo>Before import</echo>
+ <echo>Before import</echo>
<import file="imported.xml"/>
<echo message="After import"/>
-
+
<target name="import-init">
- <echo message="In import-init" />
+ <echo message="In import-init"/>
</target>
<target name="main" depends="imported">
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/import/imported.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/import/imported.xml b/src/etc/testcases/taskdefs/import/imported.xml
index 19dfdb0..09f7217 100644
--- a/src/etc/testcases/taskdefs/import/imported.xml
+++ b/src/etc/testcases/taskdefs/import/imported.xml
@@ -18,9 +18,9 @@
<project name="imported-test" default="imported" basedir=".">
<echo message="In imported top"/>
-
- <target name="imported" depends="import-init" >
- <echo message="In imported target" />
+
+ <target name="imported" depends="import-init">
+ <echo message="In imported target"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/import/subdir/serial.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/import/subdir/serial.xml b/src/etc/testcases/taskdefs/import/subdir/serial.xml
index 360f9d1..e5dd9b8 100644
--- a/src/etc/testcases/taskdefs/import/subdir/serial.xml
+++ b/src/etc/testcases/taskdefs/import/subdir/serial.xml
@@ -19,4 +19,3 @@
<import file="../unnamed1.xml"/>
<import file="../unnamed2.xml"/>
</project>
-
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/initializeclass.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/initializeclass.xml b/src/etc/testcases/taskdefs/initializeclass.xml
index 6e07991..abd07a1 100644
--- a/src/etc/testcases/taskdefs/initializeclass.xml
+++ b/src/etc/testcases/taskdefs/initializeclass.xml
@@ -25,7 +25,7 @@
<classpath>
<pathelement path="../../../../build/testcases"/>
- <pathelement location="${java.home}/lib/classes.zip" />
+ <pathelement location="${java.home}/lib/classes.zip"/>
</classpath>
</java>
</target>
@@ -34,7 +34,7 @@
<java className="org.apache.tools.ant.taskdefs.dir1.B">
<classpath>
<pathelement path="../../../../build/testcases"/>
- <pathelement location="${java.home}/lib/classes.zip" />
+ <pathelement location="${java.home}/lib/classes.zip"/>
</classpath>
</java>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/input.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/input.xml b/src/etc/testcases/taskdefs/input.xml
index d204b79..785d029 100644
--- a/src/etc/testcases/taskdefs/input.xml
+++ b/src/etc/testcases/taskdefs/input.xml
@@ -23,35 +23,32 @@
</target>
<target name="test2">
- <input message="Press Return key to continue..." />
+ <input message="Press Return key to continue..."/>
</target>
<target name="test3">
<input message="All data is going to be deleted from DB continue?"
- validargs="y,n"
- />
+ validargs="y,n"/>
</target>
<target name="test5">
<input message="All data is going to be deleted from db continue (y/n)?"
- validargs="y,n"
- />
+ validargs="y,n"/>
</target>
<target name="test6">
<input message="Please enter db-username:"
- addproperty="db.user"
- />
+ addproperty="db.user"/>
</target>
<target name="testPropertyFileInlineHandler">
<input message="Press Return key to continue..." addproperty="test">
- <handler type="propertyfile" />
+ <handler type="propertyfile"/>
</input>
<fail>
<condition>
<not>
- <equals arg1="${test}" arg2="test" />
+ <equals arg1="${test}" arg2="test"/>
</not>
</condition>
</fail>
@@ -59,12 +56,12 @@
<target name="testDefaultInlineHandler">
<input message="Press Return key to continue..." addproperty="test">
- <handler type="default" />
+ <handler type="default"/>
</input>
<fail message="$${test} = ${test}">
<condition>
<not>
- <equals arg1="${test}" arg2="foo" />
+ <equals arg1="${test}" arg2="foo"/>
</not>
</condition>
</fail>
@@ -72,13 +69,13 @@
<target name="testGreedyInlineHandler">
<input message="Press Return key to continue..." addproperty="test">
- <handler type="greedy" />
+ <handler type="greedy"/>
</input>
- <loadfile srcFile="input.stdin" property="input" />
+ <loadfile srcFile="input.stdin" property="input"/>
<fail message="$${test} = ${test}">
<condition>
<not>
- <equals arg1="${test}" arg2="${input}" />
+ <equals arg1="${test}" arg2="${input}"/>
</not>
</condition>
</fail>
@@ -86,13 +83,13 @@
<target name="testGreedyInlineHandlerClassname">
<input message="Press Return key to continue..." addproperty="test">
- <handler classname="org.apache.tools.ant.input.GreedyInputHandler" />
+ <handler classname="org.apache.tools.ant.input.GreedyInputHandler"/>
</input>
- <loadfile srcFile="input.stdin" property="input" />
+ <loadfile srcFile="input.stdin" property="input"/>
<fail message="$${test} = ${test}">
<condition>
<not>
- <equals arg1="${test}" arg2="${input}" />
+ <equals arg1="${test}" arg2="${input}"/>
</not>
</condition>
</fail>
@@ -100,17 +97,17 @@
<target name="testGreedyInlineHandlerRefid">
<typedef name="greedy"
- classname="org.apache.tools.ant.input.GreedyInputHandler" />
- <greedy id="greedy" />
+ classname="org.apache.tools.ant.input.GreedyInputHandler"/>
+ <greedy id="greedy"/>
<input message="Press Return key to continue..." addproperty="test">
- <handler refid="greedy" />
+ <handler refid="greedy"/>
</input>
- <loadfile srcFile="input.stdin" property="input" />
+ <loadfile srcFile="input.stdin" property="input"/>
<fail message="$${test} = ${test}">
<condition>
<not>
- <equals arg1="${test}" arg2="${input}" />
+ <equals arg1="${test}" arg2="${input}"/>
</not>
</condition>
</fail>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/jar.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/jar.xml b/src/etc/testcases/taskdefs/jar.xml
index 78d1abc..8704d83 100644
--- a/src/etc/testcases/taskdefs/jar.xml
+++ b/src/etc/testcases/taskdefs/jar.xml
@@ -21,7 +21,7 @@
<import file="../buildfiletest-base.xml"/>
<target name="setUp">
- <mkdir dir="${output}" />
+ <mkdir dir="${output}"/>
</target>
<property name="tmp.jar" location="${output}/tmp.jar"/>
@@ -35,34 +35,26 @@
</target>
<target name="test2">
- <jar
- jarfile="jar.tmp"
- manifest="none"
- />
+ <jar jarfile="jar.tmp"
+ manifest="none"/>
</target>
<target name="test3">
- <jar
- destfile="jar.tmp"
- whenempty="format C: /y"
- />
+ <jar destfile="jar.tmp"
+ whenempty="format C: /y"/>
</target>
<target name="test4">
- <jar
- destfile="${tmp.jar}"
- basedir="."
- includes="jar.xml"
- />
+ <jar destfile="${tmp.jar}"
+ basedir="."
+ includes="jar.xml"/>
</target>
<target name="testNoRecreateWithUpdate">
- <jar
- destfile="${tmp.jar}"
+ <jar destfile="${tmp.jar}"
basedir="."
includes="jar.xml"
- update="true"
- />
+ update="true"/>
</target>
<target name="testRecreateNewerFileSetup" depends="test4">
@@ -70,37 +62,29 @@
</target>
<target name="testRecreateWithoutUpdateAdditionalFiles">
- <jar
- destfile="${tmp.jar}"
+ <jar destfile="${tmp.jar}"
includes="*.xml"
- basedir="."
- />
+ basedir="."/>
</target>
<target name="testRecreateWithUpdateAdditionalFiles">
- <jar
- destfile="${tmp.jar}"
+ <jar destfile="${tmp.jar}"
basedir="."
includes="*.xml"
- update="true"
- />
+ update="true"/>
</target>
<target name="testRecreateWithoutUpdateNewerFile">
- <jar
- destfile="${tmp.jar}"
+ <jar destfile="${tmp.jar}"
basedir="."
- includes="jar.xml"
- />
+ includes="jar.xml"/>
</target>
<target name="testRecreateWithUpdateNewerFile">
- <jar
- destfile="${tmp.jar}"
+ <jar destfile="${tmp.jar}"
basedir="."
includes="jar.xml"
- update="true"
- />
+ update="true"/>
</target>
<target name="testManifestStaysIntact">
@@ -114,25 +98,21 @@
<jar destfile="${tmp.jar}" basedir="." includes="jar.xml"
update="true"/>
<unjar src="${tmp.jar}" dest="${tmp.dir}"/>
- </target>
+ </target>
<target name="testNoRecreateBasedirExcludesWithUpdate">
- <jar
- destfile="${tmp.jar}"
+ <jar destfile="${tmp.jar}"
basedir="."
includes="j*.xml"
excludes="java.xml"
- update="true"
- />
+ update="true"/>
</target>
<target name="testNoRecreateBasedirExcludesWithoutUpdate">
- <jar
- destfile="${tmp.jar}"
+ <jar destfile="${tmp.jar}"
basedir="."
includes="j*.xml"
- excludes="java.xml"
- />
+ excludes="java.xml"/>
</target>
<target name="makezip">
@@ -225,7 +205,7 @@
</target>
<!-- bug 32802 -->
<target name="testManifestOnlyJar">
- <mkdir dir="${tmp.dir}"/>
+ <mkdir dir="${tmp.dir}"/>
<jar destfile="${tmp.jar}" duplicate="preserve">
<manifest>
<attribute name="Foo" value="bar"/>
@@ -248,28 +228,28 @@
</indexjars>
</jar>
</target>
-
+
<target name="testNoVersionInfoNoStrict">
<mkdir dir="${tmp.dir}"/>
<jar destfile="${tmp.jar}" basedir="${tmp.dir}"/>
- </target>
+ </target>
<target name="testNoVersionInfoFail">
<mkdir dir="${tmp.dir}"/>
<jar destfile="${tmp.jar}" basedir="${tmp.dir}" strict="fail"/>
- </target>
+ </target>
<target name="testNoVersionInfoIgnore">
<mkdir dir="${tmp.dir}"/>
<jar destfile="${tmp.jar}" basedir="${tmp.dir}" strict="ignore"/>
- </target>
+ </target>
<target name="testNoVersionInfoWarn">
<mkdir dir="${tmp.dir}"/>
<jar destfile="${tmp.jar}" basedir="${tmp.dir}" strict="warn"/>
- </target>
-
- <!-- see http://java.sun.com/j2se/1.3/docs/guide/versioning/spec/VersioningSpecification.html#PackageVersioning -->
+ </target>
+
+ <!-- see http://java.sun.com/j2se/1.3/docs/guide/versioning/spec/VersioningSpecification.html#PackageVersioning -->
<target name="testHasVersionInfo">
<mkdir dir="${tmp.dir}"/>
<jar destfile="${tmp.jar}" basedir="${tmp.dir}" strict="fail">
@@ -279,7 +259,6 @@
<attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
</manifest>
</jar>
- </target>
+ </target>
-
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/java.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/java.xml b/src/etc/testcases/taskdefs/java.xml
index a3d3778..022a10f 100644
--- a/src/etc/testcases/taskdefs/java.xml
+++ b/src/etc/testcases/taskdefs/java.xml
@@ -19,11 +19,11 @@
<project name="java-test" basedir="." default="foo">
<property name="tests-classpath.value" value="${java.class.path}"/>
<fail unless="tests-classpath.value"
- message="the property tests-classpath.value is required by this test" />
+ message="the property tests-classpath.value is required by this test"/>
<import file="../buildfiletest-base.xml"/>
<target name="setUp">
- <mkdir dir="${output}" />
+ <mkdir dir="${output}"/>
</target>
<!-- this property gets overridden programmatically-->
@@ -33,19 +33,19 @@
<property name="tmp" location="${output}/ant.tmp.java-test"/>
<mkdir dir="${tmp}" description="The directory must exist"/>
<property name="app"
- value="org.apache.tools.ant.taskdefs.JavaTest$$EntryPoint" />
+ value="org.apache.tools.ant.taskdefs.JavaTest$$EntryPoint"/>
<property name="app2"
- value="org.apache.tools.ant.taskdefs.JavaTest$$ExceptingEntryPoint" />
+ value="org.apache.tools.ant.taskdefs.JavaTest$$ExceptingEntryPoint"/>
<property name="spawnapp"
- value="org.apache.tools.ant.taskdefs.JavaTest$$SpawnEntryPoint" />
+ value="org.apache.tools.ant.taskdefs.JavaTest$$SpawnEntryPoint"/>
<property name="pipeapp"
- value="org.apache.tools.ant.taskdefs.JavaTest$$PipeEntryPoint" />
+ value="org.apache.tools.ant.taskdefs.JavaTest$$PipeEntryPoint"/>
<property name="module"
- value="TestModule" />
+ value="TestModule"/>
<target name="testNoJarNoClassname">
<java/>
@@ -57,19 +57,19 @@
<target name="testJarAndClassName">
- <java jar="test.jar" classname="${app}" />
+ <java jar="test.jar" classname="${app}"/>
</target>
<target name="testClassnameAndJar">
- <java classname="${app}" jar="test.jar" />
+ <java classname="${app}" jar="test.jar"/>
</target>
<target name="testModuleAndJar">
- <java module="${module}" jar="test.jar" />
+ <java module="${module}" jar="test.jar"/>
</target>
<target name="testJarAndModule">
- <java jar="test.jar" module="${module}" />
+ <java jar="test.jar" module="${module}"/>
</target>
<target name="testClassnameAndModule">
@@ -85,40 +85,38 @@
</target>
<target name="testRun">
- <fail unless="tests-classpath.value" />
+ <fail unless="tests-classpath.value"/>
<java classname="${app}"
- classpath="${tests-classpath.value}"/>
+ classpath="${tests-classpath.value}"/>
</target>
<target name="testRunFail">
<java classname="${app}"
- classpath="${tests-classpath.value}"
- >
+ classpath="${tests-classpath.value}">
<arg value="2"/>
</java>
</target>
<target name="testRunFailFoe">
<java classname="${app}"
- classpath="${tests-classpath.value}"
- failonerror="true">
+ classpath="${tests-classpath.value}"
+ failonerror="true">
<arg value="2"/>
</java>
</target>
<target name="testRunFailFoeFork">
<java classname="${app}"
- classpath="${tests-classpath.value}"
- failonerror="true"
- fork="true">
+ classpath="${tests-classpath.value}"
+ failonerror="true"
+ fork="true">
<arg value="2"/>
</java>
</target>
<target name="testExcepting">
<java classname="${app2}"
- classpath="${tests-classpath.value}"
- >
+ classpath="${tests-classpath.value}">
</java>
</target>
@@ -131,36 +129,34 @@
<target name="testExceptingFoe">
<java classname="${app2}"
- classpath="${tests-classpath.value}"
- failonerror="true">
+ classpath="${tests-classpath.value}"
+ failonerror="true">
</java>
</target>
<target name="testExceptingFoeFork">
<java classname="${app2}"
- classpath="${tests-classpath.value}"
- failonerror="true"
- fork="true">
+ classpath="${tests-classpath.value}"
+ failonerror="true"
+ fork="true">
</java>
</target>
<target name="testResultPropertyZero">
<java classname="${app}"
- classpath="${tests-classpath.value}"
- resultproperty="exitcode"
- fork="true"
- >
+ classpath="${tests-classpath.value}"
+ resultproperty="exitcode"
+ fork="true">
</java>
<echo message="exitcode = ${exitcode}"/>
</target>
<target name="testResultPropertyNonZero">
<java classname="${app}"
- classpath="${tests-classpath.value}"
- resultproperty="exitcode"
- failonerror="false"
- fork="true"
- >
+ classpath="${tests-classpath.value}"
+ resultproperty="exitcode"
+ failonerror="false"
+ fork="true">
<arg value="2"/>
</java>
<echo message="exitcode = ${exitcode}"/>
@@ -168,15 +164,14 @@
<target name="testResultPropertyZeroNoFork">
<java classname="${app}"
- classpath="${tests-classpath.value}"
- resultproperty="exitcode"
- fork="false"
- >
+ classpath="${tests-classpath.value}"
+ resultproperty="exitcode"
+ fork="false">
<permissions/>
</java>
<echo message="exitcode = ${exitcode}"/>
</target>
-
+
<target name="testResultPropertyNonZeroNoFork">
<java classname="${app}"
classpath="${tests-classpath.value}"
@@ -191,18 +186,16 @@
<target name="testRunFailWithFailOnError">
<java classname="${app}"
- classpath="${tests-classpath.value}"
- failonerror="true"
- >
+ classpath="${tests-classpath.value}"
+ failonerror="true">
<arg value="2"/>
</java>
</target>
<target name="testRunSuccessWithFailOnError">
<java classname="${app}"
- classpath="${tests-classpath.value}"
- failonerror="true"
- >
+ classpath="${tests-classpath.value}"
+ failonerror="true">
<arg value="0"/>
</java>
</target>
@@ -210,7 +203,7 @@
<target name="testSpawn">
<java classname="${spawnapp}" fork="true" spawn="true" classpath="${tests-classpath.value}">
<arg value="${timeToWait}"/>
- <arg value="${logFile}" />
+ <arg value="${logFile}"/>
</java>
</target>
@@ -224,28 +217,28 @@
fork="true"
output="${outfile}"
errorproperty="redirect.err">
- <arg value="out" />
+ <arg value="out"/>
</java>
<!-- let dumb Windows catch up -->
<waitfor maxwait="30000">
- <available file="${outfile}" />
+ <available file="${outfile}"/>
</waitfor>
<waitfor maxwait="30000">
- <length file="${outfile}" length="1" when="greater" />
+ <length file="${outfile}" length="1" when="greater"/>
</waitfor>
- <loadfile property="redirect.out.contents" srcfile="${outfile}" />
+ <loadfile property="redirect.out.contents" srcfile="${outfile}"/>
<condition property="r1file">
- <equals arg1="${redirect.out.contents}" arg2="foo" />
+ <equals arg1="${redirect.out.contents}" arg2="foo"/>
</condition>
<fail unless="r1file">${outfile}:
"${redirect.out.contents}" expected "foo"</fail>
<condition property="r1prop">
- <equals arg1="${redirect.err}" arg2="" />
+ <equals arg1="${redirect.err}" arg2=""/>
</condition>
<fail unless="r1prop">
@@ -263,22 +256,22 @@ redirect.err="${redirect.err}" should be empty</fail>
fork="true"
output="${outfile}"
errorproperty="redirect.err">
- <arg value="both" />
+ <arg value="both"/>
</java>
<!-- let dumb Windows catch up -->
<waitfor maxwait="30000">
- <available file="${outfile}" />
+ <available file="${outfile}"/>
</waitfor>
<waitfor maxwait="30000">
- <length file="${outfile}" length="1" when="greater" />
+ <length file="${outfile}" length="1" when="greater"/>
</waitfor>
-
-
- <loadfile property="redirect.out.contents2" srcfile="${outfile}" />
+
+
+ <loadfile property="redirect.out.contents2" srcfile="${outfile}"/>
<condition property="r2file">
- <equals arg1="${redirect.out.contents2}" arg2="foobar" />
+ <equals arg1="${redirect.out.contents2}" arg2="foobar"/>
</condition>
<fail unless="r2file">${outfile}:
@@ -286,7 +279,7 @@ redirect.err="${redirect.err}" should be empty</fail>
<condition property="r2prop">
<!-- property should not change -->
- <equals arg1="${redirect.err}" arg2="" />
+ <equals arg1="${redirect.err}" arg2=""/>
</condition>
<fail unless="r2prop">
@@ -304,28 +297,28 @@ redirect.err="${redirect.err}" should be empty</fail>
fork="true"
output="${outfile}"
error="${errfile}">
- <arg value="both" />
+ <arg value="both"/>
</java>
<!-- let dumb Windows catch up -->
<waitfor>
<and>
- <available file="${outfile}" />
- <available file="${errfile}" />
+ <available file="${outfile}"/>
+ <available file="${errfile}"/>
</and>
</waitfor>
- <loadfile property="redirect.out.contents" srcfile="${outfile}" />
+ <loadfile property="redirect.out.contents" srcfile="${outfile}"/>
<condition property="r3file">
- <equals arg1="${redirect.out.contents}" arg2="foo" />
+ <equals arg1="${redirect.out.contents}" arg2="foo"/>
</condition>
<fail unless="r3file">${outfile}:
"${redirect.out.contents}" expected "foo"</fail>
<condition property="r3match">
- <filesmatch file1="${outfile}" file2="${errfile}" />
+ <filesmatch file1="${outfile}" file2="${errfile}"/>
</condition>
<fail unless="r3file">${errfile} differs from ${outfile}</fail>
@@ -341,19 +334,19 @@ redirect.err="${redirect.err}" should be empty</fail>
<redirector inputstring="foo"
output="${outfile}"
error="${errfile}"
- createemptyfiles="false" />
- <arg value="out" />
+ createemptyfiles="false"/>
+ <arg value="out"/>
</java>
<!-- let dumb Windows catch up -->
<waitfor>
- <available file="${outfile}" />
+ <available file="${outfile}"/>
</waitfor>
- <loadfile property="redirector.out.contents" srcfile="${outfile}" />
+ <loadfile property="redirector.out.contents" srcfile="${outfile}"/>
<condition property="ror1out">
- <equals arg1="${redirector.out.contents}" arg2="foo" />
+ <equals arg1="${redirector.out.contents}" arg2="foo"/>
</condition>
<fail unless="ror1out">${outfile}:
@@ -361,7 +354,7 @@ redirect.err="${redirect.err}" should be empty</fail>
<condition property="ror1noerr">
<not>
- <available file="${errfile}" />
+ <available file="${errfile}"/>
</not>
</condition>
<fail unless="ror1noerr">${errfile} exists but should not</fail>
@@ -381,35 +374,35 @@ redirect.err="${redirect.err}" should be empty</fail>
error="${errfile}"
createemptyfiles="false">
<errorfilterchain>
- <replacestring from="foo" to="bar" />
+ <replacestring from="foo" to="bar"/>
</errorfilterchain>
</redirector>
- <arg value="both" />
+ <arg value="both"/>
</java>
<!-- let dumb Windows catch up -->
<waitfor>
<and>
- <available file="${outfile}" />
- <available file="${errfile}" />
+ <available file="${outfile}"/>
+ <available file="${errfile}"/>
</and>
</waitfor>
<loadfile property="redirector.out.contents2"
- srcfile="${outfile}" />
+ srcfile="${outfile}"/>
<loadfile property="redirector.err.contents"
- srcfile="${errfile}" />
+ srcfile="${errfile}"/>
<condition property="ror2out">
- <equals arg1="${redirector.out.contents2}" arg2="foofoo" />
+ <equals arg1="${redirector.out.contents2}" arg2="foofoo"/>
</condition>
<fail unless="ror1out">${outfile}:
"${redirector.out.contents}" expected "foofoo"</fail>
<condition property="ror2err">
- <equals arg1="${redirector.err.contents}" arg2="bar" />
+ <equals arg1="${redirector.err.contents}" arg2="bar"/>
</condition>
<fail unless="ror1out">${errfile}:
@@ -419,9 +412,9 @@ redirect.err="${redirect.err}" should be empty</fail>
<target name="flushedInput">
<java classname="org.apache.tools.ant.taskdefs.JavaTest$$ReadPoint" fork="true"
- classpath="${tests-classpath.value}" failonerror="true" timeout="2000" />
+ classpath="${tests-classpath.value}" failonerror="true" timeout="2000"/>
</target>
- <target name="foo" />
+ <target name="foo"/>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/javadoc/javadoc.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/javadoc/javadoc.xml b/src/etc/testcases/taskdefs/javadoc/javadoc.xml
index 2a05ec0..2c13b71 100644
--- a/src/etc/testcases/taskdefs/javadoc/javadoc.xml
+++ b/src/etc/testcases/taskdefs/javadoc/javadoc.xml
@@ -24,44 +24,44 @@
</target>
<path id="path.dirset">
- <dirset dir="." />
+ <dirset dir="."/>
</path>
<target name="dirsetPath">
- <javadoc sourcepathref="path.dirset" packagenames="*" destdir="${output}" />
+ <javadoc sourcepathref="path.dirset" packagenames="*" destdir="${output}"/>
</target>
<target name="dirsetPathWithoutPackagenames">
- <javadoc sourcepathref="path.dirset" destdir="${output}" />
+ <javadoc sourcepathref="path.dirset" destdir="${output}"/>
</target>
<target name="nestedDirsetPath">
<javadoc packagenames="*" destdir="${output}">
- <sourcepath refid="path.dirset" />
+ <sourcepath refid="path.dirset"/>
</javadoc>
</target>
<path id="path.fileset">
<pathelement location="."/>
<fileset dir="java/" id="fileset.inpath">
- <include name="**/*.java" />
+ <include name="**/*.java"/>
</fileset>
</path>
<target name="filesetPath">
- <javadoc sourcepathref="path.fileset" packagenames="*" destdir="${output}" />
+ <javadoc sourcepathref="path.fileset" packagenames="*" destdir="${output}"/>
</target>
<target name="nestedFilesetPath">
<javadoc packagenames="*" destdir="${output}">
- <sourcepath refid="path.fileset" />
+ <sourcepath refid="path.fileset"/>
</javadoc>
</target>
<target name="nestedFilesetRefInPath">
<javadoc packagenames="*" destdir="${output}">
- <fileset refid="fileset.inpath" />
+ <fileset refid="fileset.inpath"/>
</javadoc>
</target>
@@ -90,18 +90,18 @@
<path id="path.filelist">
<pathelement location="."/>
<filelist dir="java/">
- <file name="ClassToJavadoc.java" />
+ <file name="ClassToJavadoc.java"/>
</filelist>
</path>
<target name="filelistPath">
<javadoc sourcepathref="path.filelist" packagenames="*"
- destdir="${output}" />
+ destdir="${output}"/>
</target>
<target name="nestedFilelistPath">
<javadoc packagenames="*" destdir="${output}">
- <sourcepath refid="path.filelist" />
+ <sourcepath refid="path.filelist"/>
</javadoc>
</target>
@@ -109,37 +109,37 @@
<property name="root" location="../../../../.."/>
<path id="path.pathelement.path">
- <pathelement path="${root}/src" />
+ <pathelement path="${root}/src"/>
</path>
<target name="pathelementPath">
<javadoc sourcepathref="path.pathelement.path"
- packagenames="etc.testcases.taskdefs.javadoc.*" destdir="${output}" />
+ packagenames="etc.testcases.taskdefs.javadoc.*" destdir="${output}"/>
</target>
<path id="path.pathelement.location">
<pathelement location="."/>
- <pathelement path="java/ClassToJavadoc.java" />
+ <pathelement path="java/ClassToJavadoc.java"/>
</path>
<target name="pathelementLocationPath">
<javadoc sourcepathref="path.pathelement.location"
- packagenames="*" destdir="${output}" />
+ packagenames="*" destdir="${output}"/>
</target>
<target name="nestedSource">
<javadoc destdir="${output}">
- <source file="java/ClassToJavadoc.java" />
+ <source file="java/ClassToJavadoc.java"/>
</javadoc>
</target>
<fileset dir="java/" id="fileset.simple">
- <include name="**/*.java" />
+ <include name="**/*.java"/>
</fileset>
<target name="nestedFilesetRef">
<javadoc destdir="${output}">
- <fileset refid="fileset.simple" />
+ <fileset refid="fileset.simple"/>
</javadoc>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/loadfile.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/loadfile.xml b/src/etc/testcases/taskdefs/loadfile.xml
index 66c9ce4..75b2063 100644
--- a/src/etc/testcases/taskdefs/loadfile.xml
+++ b/src/etc/testcases/taskdefs/loadfile.xml
@@ -22,18 +22,18 @@
</target>
<target name="testNoSourcefileDefined" depends="init">
- <loadfile property="foo" />
+ <loadfile property="foo"/>
</target>
<target name="testNoPropertyDefined"
depends="init">
- <loadfile srcFile="somefile" />
+ <loadfile srcFile="somefile"/>
</target>
<target name="testNoSourcefilefound"
depends="init">
- <loadfile property="missing" srcFile="somefile" />
+ <loadfile property="missing" srcFile="somefile"/>
</target>
<target name="testFailOnError"
@@ -48,9 +48,8 @@
depends="init">
<echo
message="What's it going to be then, eh?"
- file="loadfile1.tmp"
- />
- <loadfile property="testLoadAFile" srcFile="loadfile1.tmp" />
+ file="loadfile1.tmp"/>
+ <loadfile property="testLoadAFile" srcFile="loadfile1.tmp"/>
<echo>${testLoadAFile}</echo>
</target>
@@ -63,11 +62,10 @@
<target name="testEvalProps"
depends="init">
- <property name="weather" value="rain" />
+ <property name="weather" value="rain"/>
<echo
message="All these moments will be lost in time, like teardrops in the ${weather}"
- file="loadfile1.tmp"
- />
+ file="loadfile1.tmp"/>
<loadfile property="testEvalProps"
srcFile="loadfile1.tmp">
<filterchain>
@@ -84,7 +82,7 @@ REM Line 2
--Line 3
Line 4
Hello World!</echo>
- <loadfile srcFile="loadfile1.tmp"
+ <loadfile srcFile="loadfile1.tmp"
property="testFilterChain">
<filterchain>
<headfilter lines="5"/>
@@ -115,7 +113,7 @@ public class test1 {
private static final String GREETING="*/Hello/*";
private static final String GREETING1="/*Hello*/";
- public static void main( String args[] ) {
+ public static void main(String args[]) {
}
}</echo>
<echo file="nocomments.tmp">
@@ -126,16 +124,16 @@ public class test1 {
private static final String GREETING="*/Hello/*";
private static final String GREETING1="/*Hello*/";
- public static void main( String args[] ) {
+ public static void main(String args[]) {
}
}</echo>
- <loadfile srcFile="loadfile1.tmp"
+ <loadfile srcFile="loadfile1.tmp"
property="testStripJavaComments">
<filterchain>
<stripjavacomments/>
</filterchain>
</loadfile>
- <loadfile srcFile="nocomments.tmp"
+ <loadfile srcFile="nocomments.tmp"
property="expected"/>
</target>
@@ -143,8 +141,7 @@ public class test1 {
depends="init">
<echo
message="1, 2, 3, 4"
- file="loadfile1.tmp"
- />
+ file="loadfile1.tmp"/>
<loadfile property="testOneLine"
srcFile="loadfile1.tmp">
<filterchain>
@@ -160,4 +157,4 @@ public class test1 {
<delete file="nocomments.tmp"/>
</target>
- </project>
+</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/makeurl.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/makeurl.xml b/src/etc/testcases/taskdefs/makeurl.xml
index dafd00a..e33a176 100644
--- a/src/etc/testcases/taskdefs/makeurl.xml
+++ b/src/etc/testcases/taskdefs/makeurl.xml
@@ -15,8 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="to-url" >
-
+<project name="to-url">
<target name="testEmpty">
<makeurl/>
@@ -29,36 +28,36 @@
<target name="testNoFile">
<makeurl property="foo"/>
</target>
-
+
<target name="testWorks">
<makeurl property="testWorks" file="foo" validate="false"/>
- <fail unless="testWorks" />
+ <fail unless="testWorks"/>
</target>
<target name="testIllegalChars">
<makeurl property="testIllegalChars" file="fo o%" validate="false"/>
</target>
-
+
<target name="testRoundTrip">
<makeurl property="testRoundTrip" file="${ant.file}"/>
</target>
<target name="testIllegalCombinations">
<makeurl property="testIllegalCombinations" file="foo" validate="false">
- <fileset dir="." includes="*.xml" />
+ <fileset dir="." includes="*.xml"/>
</makeurl>
</target>
-
-
+
+
<target name="testFileset">
<makeurl property="testFileset">
- <fileset dir="." includes="*.xml" />
+ <fileset dir="." includes="*.xml"/>
</makeurl>
</target>
-
+
<target name="testFilesetSeparator">
<makeurl property="testFilesetSeparator" separator='","'>
- <fileset dir="." includes="*.xml" />
+ <fileset dir="." includes="*.xml"/>
</makeurl>
</target>
@@ -68,11 +67,11 @@
<target name="testPath">
<path id="test.path">
- <pathelement location="." />
+ <pathelement location="."/>
<fileset dir="." includes="*.xml"/>
</path>
<makeurl property="testPath">
- <path refid="test.path" />
+ <path refid="test.path"/>
</makeurl>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/manifest.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/manifest.xml b/src/etc/testcases/taskdefs/manifest.xml
index aecaf96..802ef61 100644
--- a/src/etc/testcases/taskdefs/manifest.xml
+++ b/src/etc/testcases/taskdefs/manifest.xml
@@ -32,7 +32,7 @@
</patternset>
</unjar>
</target>
-
+
<target name="test2" depends="setUp">
<jar file="${output}/mftest2.jar" manifest="manifests/test2.mf"/>
<unjar src="${output}/mftest2.jar" dest="${output}/manifests">
@@ -41,27 +41,27 @@
</patternset>
</unjar>
</target>
-
+
<target name="test3" depends="setUp">
<jar file="${output}/mftest3.jar" manifest="manifests/test3.mf"/>
</target>
-
+
<target name="test4" depends="setUp">
<jar file="${output}/mftest4.jar" manifest="manifests/test4.mf"/>
</target>
-
+
<target name="test5" depends="setUp">
<jar file="${output}/mftest5.jar" manifest="manifests/test5.mf"/>
</target>
-
+
<target name="test6" depends="setUp">
<jar file="${output}/mftest6.jar" manifest="manifests/test6.mf"/>
</target>
-
+
<target name="test7" depends="setUp">
<jar file="${output}/mftest7.jar" manifest="manifests/test7.mf"/>
</target>
-
+
<target name="test8" depends="setUp">
<jar file="${output}/mftest8.jar">
<manifest>
@@ -141,17 +141,17 @@
</target>
<target name="testNoFile">
- <manifest />
+ <manifest/>
</target>
<target name="testLongLine" depends="setUp">
<jar file="${output}/mftestLongLine.jar">
<manifest>
- <attribute name="Class-path"
+ <attribute name="Class-path"
value="${test.longline}"/>
- <attribute name="${test.long68name}" value="${test.value}" />
- <attribute name="${test.long70name}" value="${test.value}" />
- <attribute name="${test.notlongname}" value="${test.value}" />
+ <attribute name="${test.long68name}" value="${test.value}"/>
+ <attribute name="${test.long70name}" value="${test.value}"/>
+ <attribute name="${test.notlongname}" value="${test.value}"/>
</manifest>
</jar>
<unjar src="${output}/mftestLongLine.jar" dest="${output}/manifests">
@@ -198,41 +198,41 @@
</patternset>
</unjar>
</target>
-
+
<target name="testReplace" depends="setUp">
- <copy file="manifests/test2.mf" toFile="${output}/mftest.mf" />
- <manifest file="${output}/mftest.mf" />
+ <copy file="manifests/test2.mf" toFile="${output}/mftest.mf"/>
+ <manifest file="${output}/mftest.mf"/>
</target>
<target name="testUpdate" depends="setUp">
- <copy file="manifests/test2.mf" toFile="${output}/mftest.mf" />
+ <copy file="manifests/test2.mf" toFile="${output}/mftest.mf"/>
<manifest file="${output}/mftest.mf" mode="update">
- <attribute name="Foo" value="Bar" />
+ <attribute name="Foo" value="Bar"/>
</manifest>
- <copy file="manifests/test2.mf" toFile="${output}/mftest2.mf" />
+ <copy file="manifests/test2.mf" toFile="${output}/mftest2.mf"/>
<manifest file="${output}/mftest2.mf" mode="update">
<section name="Test">
- <attribute name="Foo" value="Bar" />
+ <attribute name="Foo" value="Bar"/>
</section>
</manifest>
<manifest file="${output}/mftest2.mf" mode="update">
<section name="Test">
- <attribute name="Foo" value="Baz" />
+ <attribute name="Foo" value="Baz"/>
</section>
</manifest>
</target>
<target name="testFrom" depends="setUp">
- <manifest file="${output}/mftestfrom.mf" >
+ <manifest file="${output}/mftestfrom.mf">
<section name="Test">
- <attribute name="before" value="before" />
+ <attribute name="before" value="before"/>
<attribute name="From" value="illegal"/>
- <attribute name="after" value="after" />
+ <attribute name="after" value="after"/>
</section>
</manifest>
</target>
-
+
<target name="testIllegalName" depends="setUp">
<manifest file="${output}/mftestillegalname.mf">
<attribute name="has blank" value="value"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/manifestclasspath.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/manifestclasspath.xml b/src/etc/testcases/taskdefs/manifestclasspath.xml
index f8a4795..4f4f060 100644
--- a/src/etc/testcases/taskdefs/manifestclasspath.xml
+++ b/src/etc/testcases/taskdefs/manifestclasspath.xml
@@ -21,7 +21,7 @@
<import file="../buildfiletest-base.xml"/>
<target name="setUp">
- <mkdir dir="${output}" />
+ <mkdir dir="${output}"/>
</target>
<!-- hebrew -->
@@ -29,63 +29,63 @@
<!-- german -->
<property name="aent" value="ãnt"/>
<target name="fullSetUp" depends="setUp">
- <mkdir dir="${output}/lib" />
- <touch file="${output}/lib/acme-core.jar" />
- <touch file="${output}/lib/acme-pres.jar" />
+ <mkdir dir="${output}/lib"/>
+ <touch file="${output}/lib/acme-core.jar"/>
+ <touch file="${output}/lib/acme-pres.jar"/>
- <mkdir dir="${output}/classes/dsp-core/com/lgc/infra/core" />
- <mkdir dir="${output}/classes/dsp-pres/com/lgc/infra/pres" />
- <mkdir dir="${output}/classes/dsp-void" />
- <mkdir dir="${output}/generated/dsp-core/com/lgc/infra/core/generated" />
- <mkdir dir="${output}/generated/dsp-pres" />
- <mkdir dir="${output}/generated/dsp-void" />
- <mkdir dir="${output}/resources/dsp-core/com/lgc/infra/core" />
- <mkdir dir="${output}/resources/dsp-pres/com/lgc/infra/pres" />
- <mkdir dir="${output}/resources/dsp-void" />
+ <mkdir dir="${output}/classes/dsp-core/com/lgc/infra/core"/>
+ <mkdir dir="${output}/classes/dsp-pres/com/lgc/infra/pres"/>
+ <mkdir dir="${output}/classes/dsp-void"/>
+ <mkdir dir="${output}/generated/dsp-core/com/lgc/infra/core/generated"/>
+ <mkdir dir="${output}/generated/dsp-pres"/>
+ <mkdir dir="${output}/generated/dsp-void"/>
+ <mkdir dir="${output}/resources/dsp-core/com/lgc/infra/core"/>
+ <mkdir dir="${output}/resources/dsp-pres/com/lgc/infra/pres"/>
+ <mkdir dir="${output}/resources/dsp-void"/>
</target>
<target name="test-bad-directory">
<manifestclasspath property="jar.classpath"
jarfile="${output}/classpath.jar">
- <classpath />
+ <classpath/>
</manifestclasspath>
</target>
<target name="test-bad-no-property" depends="setUp">
<manifestclasspath jarfile="${output}/classpath.jar">
- <classpath />
+ <classpath/>
</manifestclasspath>
</target>
<target name="test-bad-property-exists" depends="setUp">
- <property name="jar.classpath" value="exists" />
+ <property name="jar.classpath" value="exists"/>
<manifestclasspath property="jar.classpath"
jarfile="${output}/classpath.jar">
- <classpath />
+ <classpath/>
</manifestclasspath>
</target>
<target name="test-bad-no-jarfile" depends="setUp">
<manifestclasspath property="jar.classpath">
- <classpath />
+ <classpath/>
</manifestclasspath>
</target>
<target name="test-bad-no-classpath" depends="setUp">
<manifestclasspath property="jar.classpath"
- jarfile="${output}/classpath.jar" />
+ jarfile="${output}/classpath.jar"/>
</target>
<target name="test-pseudo-tahoe-refid" depends="fullSetUp">
<path id="classpath">
<!-- All the classes/ directories -->
- <dirset dir="${output}/classes" includes="dsp-*" />
+ <dirset dir="${output}/classes" includes="dsp-*"/>
<!-- All the JAXB generated/ directories -->
<dirset dir="${output}/generated" includes="dsp-*">
<!-- Add only non-empty directories to the classpath -->
<present targetdir="${output}/generated" present="both">
- <mapper type="regexp" from="(.*)" to="\1/com" />
+ <mapper type="regexp" from="(.*)" to="\1/com"/>
</present>
</dirset>
@@ -93,14 +93,14 @@
<dirset dir="${output}/resources" includes="dsp-*">
<!-- Add only non-empty directories to the classpath -->
<present targetdir="${output}/resources" present="both">
- <mapper type="regexp" from="(.*)" to="\1/com" />
+ <mapper type="regexp" from="(.*)" to="\1/com"/>
</present>
</dirset>
</path>
<manifestclasspath property="jar.classpath"
jarfile="${output}/classpath.jar">
- <classpath refid="classpath" />
+ <classpath refid="classpath"/>
</manifestclasspath>
</target>
@@ -109,13 +109,13 @@
jarfile="${output}/classpath.jar">
<classpath>
<!-- All the classes/ directories -->
- <dirset dir="${output}/classes" includes="dsp-*" />
+ <dirset dir="${output}/classes" includes="dsp-*"/>
<!-- All the JAXB generated/ directories -->
<dirset dir="${output}/generated" includes="dsp-*">
<!-- Add only non-empty directories to the classpath -->
<present targetdir="${output}/generated" present="both">
- <mapper type="regexp" from="(.*)" to="\1/com" />
+ <mapper type="regexp" from="(.*)" to="\1/com"/>
</present>
</dirset>
@@ -123,7 +123,7 @@
<dirset dir="${output}/resources" includes="dsp-*">
<!-- Add only non-empty directories to the classpath -->
<present targetdir="${output}/resources" present="both">
- <mapper type="regexp" from="(.*)" to="\1/com" />
+ <mapper type="regexp" from="(.*)" to="\1/com"/>
</present>
</dirset>
</classpath>
@@ -134,86 +134,88 @@
<manifestclasspath property="jar.classpath"
jarfile="${output}/classes/classpath.jar">
<classpath>
- <dirset dir="${output}/classes" includes="dsp-*" />
- <dirset dir="${output}/generated" includes="dsp-*" />
- <dirset dir="${output}/resources" includes="dsp-*" />
+ <dirset dir="${output}/classes" includes="dsp-*"/>
+ <dirset dir="${output}/generated" includes="dsp-*"/>
+ <dirset dir="${output}/resources" includes="dsp-*"/>
</classpath>
</manifestclasspath>
</target>
<target name="test-parent-level2" depends="fullSetUp">
- <mkdir dir="${output}/classes/level2" />
+ <mkdir dir="${output}/classes/level2"/>
<manifestclasspath property="jar.classpath"
jarfile="${output}/classes/level2/classpath.jar">
<classpath>
- <dirset dir="${output}/classes" includes="dsp-*" />
- <dirset dir="${output}/generated" includes="dsp-*" />
- <dirset dir="${output}/resources" includes="dsp-*" />
+ <dirset dir="${output}/classes" includes="dsp-*"/>
+ <dirset dir="${output}/generated" includes="dsp-*"/>
+ <dirset dir="${output}/resources" includes="dsp-*"/>
</classpath>
</manifestclasspath>
</target>
<target name="test-parent-level2-too-deep" depends="fullSetUp">
- <mkdir dir="${output}/classes/level2" />
+ <mkdir dir="${output}/classes/level2"/>
<manifestclasspath property="jar.classpath" maxParentLevels="1"
jarfile="${output}/classes/level2/classpath.jar">
<classpath>
- <dirset dir="${output}/classes" includes="dsp-*" />
- <dirset dir="${output}/generated" includes="dsp-*" />
- <dirset dir="${output}/resources" includes="dsp-*" />
+ <dirset dir="${output}/classes" includes="dsp-*"/>
+ <dirset dir="${output}/generated" includes="dsp-*"/>
+ <dirset dir="${output}/resources" includes="dsp-*"/>
</classpath>
</manifestclasspath>
</target>
<target name="test-parent-level2-with-jars" depends="fullSetUp">
- <mkdir dir="${output}/classes/level2" />
+ <mkdir dir="${output}/classes/level2"/>
<manifestclasspath property="jar.classpath"
jarfile="${output}/classes/level2/classpath.jar">
<classpath>
- <fileset dir="${output}/lib" includes="*.jar" />
- <dirset dir="${output}/classes" includes="dsp-*" />
- <dirset dir="${output}/generated" includes="dsp-*" />
- <dirset dir="${output}/resources" includes="dsp-*" />
+ <fileset dir="${output}/lib" includes="*.jar"/>
+ <dirset dir="${output}/classes" includes="dsp-*"/>
+ <dirset dir="${output}/generated" includes="dsp-*"/>
+ <dirset dir="${output}/resources" includes="dsp-*"/>
</classpath>
</manifestclasspath>
</target>
<target name="international-german" depends="setUp">
- <antcall target="run-two-jars">
- <param name="ext.dir" value="${aent}"/>
- </antcall>
+ <antcall target="run-two-jars">
+ <param name="ext.dir" value="${aent}"/>
+ </antcall>
</target>
+
<target name="international-hebrew" depends="setUp">
- <antcall target="run-two-jars">
- <param name="ext.dir" value="${jom}"/>
- </antcall>
+ <antcall target="run-two-jars">
+ <param name="ext.dir" value="${jom}"/>
+ </antcall>
</target>
+
<target name="run-two-jars">
- <mkdir dir="${output}/${ext.dir}"/>
- <javac srcdir="manifestclasspath" destdir="${output}" />
- <jar destfile="${output}/${ext.dir}/alpha.jar">
- <fileset dir="${output}">
- <include name="Alpha.class"/>
- </fileset>
- </jar>
- <manifestclasspath property="jar.classpath"
+ <mkdir dir="${output}/${ext.dir}"/>
+ <javac srcdir="manifestclasspath" destdir="${output}"/>
+ <jar destfile="${output}/${ext.dir}/alpha.jar">
+ <fileset dir="${output}">
+ <include name="Alpha.class"/>
+ </fileset>
+ </jar>
+ <manifestclasspath property="jar.classpath"
jarfile="${output}/beta.jar">
- <classpath>
- <pathelement location="${output}/beta.jar"/>
- <pathelement location="${output}/${ext.dir}/alpha.jar"/>
- </classpath>
- </manifestclasspath>
- <jar destfile="${output}/beta.jar" >
- <fileset dir="${output}">
- <include name="Beta.class"/>
- </fileset>
- <manifest>
- <attribute name="Main-Class" value="Beta"/>
- <attribute name="Class-Path" value="${jar.classpath}"/>
- </manifest>
- </jar>
- <java fork="true" jar="${output}/beta.jar"/>
- </target>
+ <classpath>
+ <pathelement location="${output}/beta.jar"/>
+ <pathelement location="${output}/${ext.dir}/alpha.jar"/>
+ </classpath>
+ </manifestclasspath>
+ <jar destfile="${output}/beta.jar">
+ <fileset dir="${output}">
+ <include name="Beta.class"/>
+ </fileset>
+ <manifest>
+ <attribute name="Main-Class" value="Beta"/>
+ <attribute name="Class-Path" value="${jar.classpath}"/>
+ </manifest>
+ </jar>
+ <java fork="true" jar="${output}/beta.jar"/>
+ </target>
<target name="testSameDrive">
<property name="temp" location="${java.io.tmpdir}"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/mkdir.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/mkdir.xml b/src/etc/testcases/taskdefs/mkdir.xml
index 1ecc274..1d1b895 100644
--- a/src/etc/testcases/taskdefs/mkdir.xml
+++ b/src/etc/testcases/taskdefs/mkdir.xml
@@ -21,7 +21,7 @@
<import file="../buildfiletest-base.xml"/>
<target name="setUp">
- <mkdir dir="${output}" />
+ <mkdir dir="${output}"/>
</target>
<target name="test1">
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/move.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/move.xml b/src/etc/testcases/taskdefs/move.xml
index 8b4a6c8..98cf596 100644
--- a/src/etc/testcases/taskdefs/move.xml
+++ b/src/etc/testcases/taskdefs/move.xml
@@ -21,7 +21,7 @@
<import file="../buildfiletest-base.xml"/>
<target name="setUp">
- <mkdir dir="${output}" />
+ <mkdir dir="${output}"/>
</target>
<target name="testFilterSet">
@@ -102,26 +102,26 @@
</target>
<target name="testMoveFileAndFileset">
- <mkdir dir="${output}/A" />
+ <mkdir dir="${output}/A"/>
<touch>
- <filelist dir="${output}/A" files="1,2,3" />
+ <filelist dir="${output}/A" files="1,2,3"/>
</touch>
<move todir="${output}/E" file="${output}/A/1">
- <fileset dir="${output}/A" includes="2,3" />
+ <fileset dir="${output}/A" includes="2,3"/>
</move>
<fail message="A unavailable">
<condition>
<not>
- <available file="${output}/A" type="dir" />
+ <available file="${output}/A" type="dir"/>
</not>
</condition>
</fail>
<fail message="${output}/A/1 not moved">
<condition>
<or>
- <available file="${output}/A/1" type="file" />
+ <available file="${output}/A/1" type="file"/>
<not>
- <available file="${output}/E/1" type="file" />
+ <available file="${output}/E/1" type="file"/>
</not>
</or>
</condition>
@@ -129,9 +129,9 @@
<fail message="${output}/A/2 not moved">
<condition>
<or>
- <available file="${output}/A/2" type="file" />
+ <available file="${output}/A/2" type="file"/>
<not>
- <available file="${output}/E/2" type="file" />
+ <available file="${output}/E/2" type="file"/>
</not>
</or>
</condition>
@@ -139,9 +139,9 @@
<fail message="${output}/A/3 not moved">
<condition>
<or>
- <available file="${output}/A/3" type="file" />
+ <available file="${output}/A/3" type="file"/>
<not>
- <available file="${output}/E/3" type="file" />
+ <available file="${output}/E/3" type="file"/>
</not>
</or>
</condition>
@@ -149,37 +149,37 @@
</target>
<macrodef name="verifymove">
- <attribute name="newfile" />
- <attribute name="olddir" />
+ <attribute name="newfile"/>
+ <attribute name="olddir"/>
<sequential>
<fail message="@{newfile} not available">
<condition>
<not>
- <available file="@{newfile}" type="file" />
+ <available file="@{newfile}" type="file"/>
</not>
</condition>
</fail>
<fail message="@{olddir} remains">
<condition>
- <available file="@{olddir}" type="dir" />
+ <available file="@{olddir}" type="dir"/>
</condition>
</fail>
</sequential>
</macrodef>
<target name="testCompleteDirectoryMoveToExistingDir">
- <mkdir dir="${output}/A" />
- <touch file="${output}/A/1" />
- <mkdir dir="${output}/E" />
- <touch file="${output}/E/2" />
+ <mkdir dir="${output}/A"/>
+ <touch file="${output}/A/1"/>
+ <mkdir dir="${output}/E"/>
+ <touch file="${output}/E/2"/>
<move todir="${output}/E">
- <fileset dir="${output}/A" />
+ <fileset dir="${output}/A"/>
</move>
- <verifymove newfile="${output}/E/1" olddir="${output}/A" />
+ <verifymove newfile="${output}/E/1" olddir="${output}/A"/>
<fail message="E/2 unavailable">
<condition>
<not>
- <available file="${output}/E/2" type="file" />
+ <available file="${output}/E/2" type="file"/>
</not>
</condition>
</fail>
@@ -188,41 +188,41 @@
<target name="testCompleteDirectoryMoveFileToFile">
<mkdir dir="${output}/A"/>
<touch file="${output}/A/1"/>
- <move file="${output}/A" tofile="${output}/E" />
- <verifymove newfile="${output}/E/1" olddir="${output}/A" />
+ <move file="${output}/A" tofile="${output}/E"/>
+ <verifymove newfile="${output}/E/1" olddir="${output}/A"/>
</target>
<target name="testCompleteDirectoryMoveFileToDir">
<mkdir dir="${output}/A"/>
<touch file="${output}/A/1"/>
- <move file="${output}/A" todir="${output}/E" />
- <verifymove newfile="${output}/E/A/1" olddir="${output}/A" />
+ <move file="${output}/A" todir="${output}/E"/>
+ <verifymove newfile="${output}/E/A/1" olddir="${output}/A"/>
</target>
<target name="testCompleteDirectoryMoveFileAndFileset">
- <mkdir dir="${output}/A/1" />
- <touch file="${output}/A/2" />
+ <mkdir dir="${output}/A/1"/>
+ <touch file="${output}/A/2"/>
<move file="${output}/A/1" todir="${output}/E">
- <fileset dir="${output}/A" includes="2" />
+ <fileset dir="${output}/A" includes="2"/>
</move>
<fail message="A unavailable">
<condition>
<not>
- <available file="${output}/A" type="dir" />
+ <available file="${output}/A" type="dir"/>
</not>
</condition>
</fail>
<fail message="E/1 unavailable">
<condition>
<not>
- <available file="${output}/E/1" type="dir" />
+ <available file="${output}/E/1" type="dir"/>
</not>
</condition>
</fail>
<fail message="E/2 unavailable">
<condition>
<not>
- <available file="${output}/E/2" type="file" />
+ <available file="${output}/E/2" type="file"/>
</not>
</condition>
</fail>
@@ -232,15 +232,15 @@
<mkdir dir="${output}/A"/>
<touch file="${output}/A/1"/>
<touch file="${output}/E"/>
- <move file="${output}/A" tofile="${output}/E" />
+ <move file="${output}/A" tofile="${output}/E"/>
</target>
<target name="testCompleteDirectoryMoveFileToExistingDir">
<mkdir dir="${output}/A"/>
<touch file="${output}/A/1"/>
<mkdir dir="${output}/E"/>
- <move file="${output}/A" tofile="${output}/E" />
- <verifymove newfile="${output}/E/1" olddir="${output}/A" />
+ <move file="${output}/A" tofile="${output}/E"/>
+ <verifymove newfile="${output}/E/1" olddir="${output}/A"/>
</target>
<target name="testCompleteDirectoryMoveFileToDirWithExistingFile">
@@ -248,7 +248,7 @@
<touch file="${output}/A/1"/>
<mkdir dir="${output}/E"/>
<touch file="${output}/E/A"/>
- <move file="${output}/A" todir="${output}/E" />
+ <move file="${output}/A" todir="${output}/E"/>
</target>
<target name="testCompleteDirectoryMoveFileToDirWithExistingDir">
@@ -256,8 +256,8 @@
<touch file="${output}/A/1"/>
<mkdir dir="${output}/E"/>
<mkdir dir="${output}/E/A"/>
- <move file="${output}/A" todir="${output}/E" />
- <verifymove newfile="${output}/E/A/1" olddir="${output}/A" />
+ <move file="${output}/A" todir="${output}/E"/>
+ <verifymove newfile="${output}/E/A/1" olddir="${output}/A"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/multimap.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/multimap.xml b/src/etc/testcases/taskdefs/multimap.xml
index ce4b121..f0ea0a6 100644
--- a/src/etc/testcases/taskdefs/multimap.xml
+++ b/src/etc/testcases/taskdefs/multimap.xml
@@ -20,8 +20,8 @@
<import file="../buildfiletest-base.xml"/>
<path id="testclasses">
- <pathelement location="../../../../build/testcases" />
- <pathelement path="${java.class.path}" />
+ <pathelement location="../../../../build/testcases"/>
+ <pathelement path="${java.class.path}"/>
</path>
<mapper id="testmapper"
@@ -75,8 +75,8 @@
</condition>
<fail unless="test2.outcome">mulitmove failed</fail>
</target>
-
- <!--
+
+ <!--
test traditional single file to single file copy explicitly telling
task to ignore multiple mappings
-->
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/nice.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/nice.xml b/src/etc/testcases/taskdefs/nice.xml
index e67ee19..5f07af0 100644
--- a/src/etc/testcases/taskdefs/nice.xml
+++ b/src/etc/testcases/taskdefs/nice.xml
@@ -25,7 +25,7 @@ that succeeds must restore the saved value.
<target name="noop">
<nice/>
</target>
-
+
<target name="current">
<nice currentPriority="nice.now"/>
<fail unless="nice.now"/>
@@ -35,22 +35,22 @@ that succeeds must restore the saved value.
<nice newPriority="8" currentPriority="nice.old"/>
<nice currentPriority="nice.now"/>
<condition property="test.succeeded">
- <equals arg1="${nice.now}" arg2="8" />
+ <equals arg1="${nice.now}" arg2="8"/>
</condition>
<nice newPriority="${nice.old}"/>
<fail unless="test.succeeded"/>
</target>
-
+
<target name="slower">
<nice newPriority="3" currentPriority="nice.old"/>
<nice currentPriority="nice.now"/>
<condition property="test.succeeded">
- <equals arg1="${nice.now}" arg2="3" />
+ <equals arg1="${nice.now}" arg2="3"/>
</condition>
<nice newPriority="${nice.old}"/>
<fail unless="test.succeeded"/>
</target>
-
+
<target name="too_slow">
<nice currentPriority="nice.old"/>
<nice newPriority="0"/>
@@ -62,5 +62,5 @@ that succeeds must restore the saved value.
<nice newPriority="20"/>
<nice newPriority="${nice.old}"/>
</target>
-
-</project>
\ No newline at end of file
+
+</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/optional/antlr/antlr.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/optional/antlr/antlr.xml b/src/etc/testcases/taskdefs/optional/antlr/antlr.xml
index c136d06..e23aafe 100644
--- a/src/etc/testcases/taskdefs/optional/antlr/antlr.xml
+++ b/src/etc/testcases/taskdefs/optional/antlr/antlr.xml
@@ -21,7 +21,7 @@
<import file="../../../buildfiletest-base.xml"/>
<target name="setUp">
- <mkdir dir="${output}" />
+ <mkdir dir="${output}"/>
</target>
<target name="test1">
@@ -40,11 +40,11 @@
ANTLR >= 2.7.6 leaves behind new (.smap) files as well. -->
<resourcecount when="ne" count="5">
<fileset dir="${output}">
- <include name="CalcParserTokenTypes.txt" />
- <include name="CalcParserTokenTypes.java" />
- <include name="CalcLexer.java" />
- <include name="CalcParser.java" />
- <include name="CalcTreeWalker.java" />
+ <include name="CalcParserTokenTypes.txt"/>
+ <include name="CalcParserTokenTypes.java"/>
+ <include name="CalcLexer.java"/>
+ <include name="CalcParser.java"/>
+ <include name="CalcTreeWalker.java"/>
</fileset>
</resourcecount>
</condition>
@@ -61,7 +61,7 @@
</target>
<target name="test6" depends="setUp">
- <antlr target="java.g" outputdirectory="${output}" />
+ <antlr target="java.g" outputdirectory="${output}"/>
<antlr dir="${output}"
target="java.tree.g"
outputdirectory="${output}"
@@ -121,7 +121,7 @@
</target>
<target name="tearDown">
- <delete dir="${output}" />
+ <delete dir="${output}"/>
<delete file="../../../../../../CalcParserTokenTypes.txt"/>
</target>