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:50:19 UTC
[07/12] ant git commit: Trailing whitespace (cherry-pick 2f64e0b)
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/rename.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/rename.xml b/src/etc/testcases/taskdefs/rename.xml
index a23a81e..49b776c 100644
--- a/src/etc/testcases/taskdefs/rename.xml
+++ b/src/etc/testcases/taskdefs/rename.xml
@@ -31,19 +31,19 @@
</target>
<target name="test4">
- <rename src="testdir"
+ <rename src="testdir"
dest="testdir"/>
</target>
<target name="test5">
- <rename src="template.xml"
+ <rename src="template.xml"
dest="."/>
</target>
<target name="test6">
- <rename src="template.xml"
+ <rename src="template.xml"
dest="template.tmp"/>
- <rename src="template.tmp"
+ <rename src="template.tmp"
dest="template.xml"/>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/replace.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/replace.xml b/src/etc/testcases/taskdefs/replace.xml
index a4039e5..b4ba9ae 100644
--- a/src/etc/testcases/taskdefs/replace.xml
+++ b/src/etc/testcases/taskdefs/replace.xml
@@ -42,25 +42,25 @@
</target>
<target name="test5">
- <replace file="template.xml"
+ <replace file="template.xml"
token="dont_want_to_really_replace_something"/>
</target>
<target name="test6">
<replace file="template.xml">
- <replacefilter />
+ <replacefilter/>
</replace>
</target>
<target name="test7">
<replace file="template.xml">
- <replacefilter token="" />
+ <replacefilter token=""/>
</replace>
</target>
<target name="test8">
<replace file="template.xml">
- <replacefilter token="dont_want_to_really_replace_something" />
+ <replacefilter token="dont_want_to_really_replace_something"/>
</replace>
</target>
@@ -70,8 +70,8 @@
<!-- in certain cases (checkout done with cvs of cygwin, the line endings of the various files do not match-->
<!-- the system property line.separator -->
<copy file="replace/source.txt" tofile="${output}/output.txt"/>
- <copy file="replace/value.txt" tofile="${output}/value.txt" />
- <copy file="replace/result.txt" tofile="${output}/result.txt" />
+ <copy file="replace/value.txt" tofile="${output}/value.txt"/>
+ <copy file="replace/result.txt" tofile="${output}/result.txt"/>
<fixcrlf srcdir="${output}" includes="*.txt"/>
</target>
<target name="test9" depends="test9-setup">
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/rmic/rmic.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/rmic/rmic.xml b/src/etc/testcases/taskdefs/rmic/rmic.xml
index 4670f43..a4f3b8e 100644
--- a/src/etc/testcases/taskdefs/rmic/rmic.xml
+++ b/src/etc/testcases/taskdefs/rmic/rmic.xml
@@ -17,13 +17,13 @@
-->
<project name="rmic" default="tearDown" basedir=".">
- <property name="rmic.dir" location="." />
+ <property name="rmic.dir" location="."/>
<property name="src.dir" location="${rmic.dir}/src"/>
<import file="../../buildfiletest-base.xml"/>
<target name="setUp">
- <mkdir dir="${output}" />
+ <mkdir dir="${output}"/>
<property name="build.dir" location="${output}/build"/>
<property name="dest.dir" location="${output}/dest"/>
</target>
@@ -52,8 +52,7 @@
<rmic
base="${build.dir}"
verify="false"
- classname="unimplemented.class"
- />
+ classname="unimplemented.class"/>
</presetdef>
<presetdef name="dest-rmic">
@@ -65,7 +64,7 @@
</presetdef>
<macrodef name="assertFileCreated">
- <attribute name="file" />
+ <attribute name="file"/>
<sequential>
<fail>Not found : ${build.dir}/@{file}
<condition>
@@ -76,7 +75,7 @@
</macrodef>
<macrodef name="assertFileCreatedInDest">
- <attribute name="file" />
+ <attribute name="file"/>
<sequential>
<fail>Not found : ${dest.dir}/@{file}
<condition>
@@ -87,7 +86,7 @@
</macrodef>
<macrodef name="assertFileAbsent">
- <attribute name="file" />
+ <attribute name="file"/>
<sequential>
<fail>Expected to be missing : ${build.dir}/@{file}
<condition>
@@ -98,7 +97,7 @@
</macrodef>
<macrodef name="assertFileAbsentInDest">
- <attribute name="file" />
+ <attribute name="file"/>
<sequential>
<fail>Expected to be missing : ${dest.dir}/@{file}
<condition>
@@ -107,69 +106,69 @@
</fail>
</sequential>
</macrodef>
-
+
<macrodef name="assertStubCompiled">
<sequential>
- <assertFileCreated file="RemoteTimestampImpl_Stub.class" />
+ <assertFileCreated file="RemoteTimestampImpl_Stub.class"/>
</sequential>
</macrodef>
<macrodef name="assertStubCompiledInDest">
<sequential>
- <assertFileCreatedInDest file="RemoteTimestampImpl_Stub.class" />
+ <assertFileCreatedInDest file="RemoteTimestampImpl_Stub.class"/>
</sequential>
</macrodef>
<macrodef name="assertSkelCompiled">
<sequential>
- <assertFileCreated file="RemoteTimestampImpl_Skel.class" />
+ <assertFileCreated file="RemoteTimestampImpl_Skel.class"/>
</sequential>
</macrodef>
<macrodef name="assertSkelCompiledInDest">
<sequential>
- <assertFileCreatedInDest file="RemoteTimestampImpl_Skel.class" />
+ <assertFileCreatedInDest file="RemoteTimestampImpl_Skel.class"/>
</sequential>
</macrodef>
<macrodef name="assertSkelAbsent">
<sequential>
- <assertFileAbsent file="RemoteTimestampImpl_Skel.class" />
+ <assertFileAbsent file="RemoteTimestampImpl_Skel.class"/>
</sequential>
</macrodef>
-
+
<macrodef name="assertSkelAbsentInDest">
<sequential>
- <assertFileAbsentInDest file="RemoteTimestampImpl_Skel.class" />
+ <assertFileAbsentInDest file="RemoteTimestampImpl_Skel.class"/>
</sequential>
</macrodef>
<macrodef name="assertBaseCompiled">
<sequential>
- <assertStubCompiled />
- <assertSkelCompiled />
+ <assertStubCompiled/>
+ <assertSkelCompiled/>
</sequential>
</macrodef>
<macrodef name="assertBaseCompiledInDest">
<sequential>
- <assertStubCompiledInDest />
- <assertSkelCompiledInDest />
+ <assertStubCompiledInDest/>
+ <assertSkelCompiledInDest/>
</sequential>
</macrodef>
-
+
<macrodef name="assertAntStubCompiled">
<sequential>
<assertFileCreated file="AntTimestamp_Stub.class"/>
</sequential>
</macrodef>
-
+
<macrodef name="assertAntStubCompiledInDest">
<sequential>
<assertFileCreatedInDest file="AntTimestamp_Stub.class"/>
</sequential>
</macrodef>
-
+
<macrodef name="assertAntSkelCompiled">
<sequential>
<assertFileCreated file="AntTimestamp_Skel.class"/>
@@ -184,20 +183,20 @@
<macrodef name="assertAntCompiled">
<sequential>
- <assertAntStubCompiled />
- <assertAntSkelCompiled />
+ <assertAntStubCompiled/>
+ <assertAntSkelCompiled/>
</sequential>
</macrodef>
<macrodef name="assertAntCompiledInDest">
<sequential>
- <assertAntStubCompiledInDest />
- <assertAntSkelCompiledInDest />
+ <assertAntStubCompiledInDest/>
+ <assertAntSkelCompiledInDest/>
</sequential>
</macrodef>
</target>
-
+
<target name="probe-rmic">
<available property="kaffe.present" classname="jkaffe.rmi.rmic.RMIC"/>
<condition property="rmic.present">
@@ -241,37 +240,37 @@
</target>
<target name="testVersion11" depends="init">
- <base-rmic compiler="default" stubversion="1.1" />
+ <base-rmic compiler="default" stubversion="1.1"/>
<assertBaseCompiled/>
</target>
<target name="testVersion11Dest" depends="init">
- <dest-rmic compiler="default" stubversion="1.1" />
+ <dest-rmic compiler="default" stubversion="1.1"/>
<assertBaseCompiledInDest/>
</target>
<target name="testVersion12" depends="init">
- <base-rmic compiler="default" stubversion="1.2" />
+ <base-rmic compiler="default" stubversion="1.2"/>
<assertStubCompiled/>
<assertSkelAbsent/>
</target>
-
+
<target name="testVersion12Dest" depends="init">
- <dest-rmic compiler="default" stubversion="1.2" />
+ <dest-rmic compiler="default" stubversion="1.2"/>
<assertStubCompiledInDest/>
<assertSkelAbsentInDest/>
</target>
-
+
<target name="testVersionCompat" depends="init">
- <base-rmic compiler="default" stubversion="compat" />
+ <base-rmic compiler="default" stubversion="compat"/>
<assertBaseCompiled/>
</target>
-
+
<target name="testVersionCompatDest" depends="init">
- <dest-rmic compiler="default" stubversion="compat" />
+ <dest-rmic compiler="default" stubversion="compat"/>
<assertBaseCompiledInDest/>
</target>
-
+
<target name="testRmic" if="rmic.present" depends="init">
<base-rmic compiler="${rmic.compiler}"/>
<assertBaseCompiled/>
@@ -284,71 +283,63 @@
<target name="testRmicJArg" if="rmic.present" depends="init">
<base-rmic compiler="${rmic.compiler}">
- <compilerarg value="-J-mx256m" />
+ <compilerarg value="-J-mx256m"/>
</base-rmic>
<assertBaseCompiled/>
</target>
<target name="testRmicJArgDest" if="rmic.present" depends="init">
<dest-rmic compiler="${rmic.compiler}">
- <compilerarg value="-J-mx256m" />
+ <compilerarg value="-J-mx256m"/>
</dest-rmic>
<assertBaseCompiledInDest/>
</target>
<target name="testKaffe" if="kaffe.present" depends="init">
<base-rmic
- compiler="kaffe"
- />
+ compiler="kaffe"/>
<assertBaseCompiled/>
</target>
<target name="testKaffeDest" if="kaffe.present" depends="init">
<dest-rmic
- compiler="kaffe"
- />
+ compiler="kaffe"/>
<assertBaseCompiledInDest/>
</target>
-
+
<!-- weblogic.rmic doesn't work without a global CLASSPATH
<target name="testWlrmic" if="wlrmic.present" depends="init">
<base-rmic
- compiler="weblogic"
- />
+ compiler="weblogic"/>
</target>
<target name="testWlrmicJArg" if="wlrmic.present" depends="init">
<base-rmic
- compiler="weblogic"
- >
- <compilerarg value="-J-mx256m" />
+ compiler="weblogic">
+ <compilerarg value="-J-mx256m"/>
</base-rmic>
</target>
-->
<target name="testForking" if="rmic.present" depends="init">
<base-rmic
- compiler="forking"
- />
+ compiler="forking"/>
<assertBaseCompiled/>
</target>
<target name="testBadName" depends="init">
<base-rmic
- compiler="no-such-compiler"
- />
+ compiler="no-such-compiler"/>
</target>
<target name="testExplicitClass" if="rmic.present" depends="init">
<base-rmic
- compiler="org.apache.tools.ant.taskdefs.rmic.ForkingSunRmic"
- />
+ compiler="org.apache.tools.ant.taskdefs.rmic.ForkingSunRmic"/>
<assertBaseCompiled/>
</target>
-
+
<target name="testWrongClass" depends="init">
<base-rmic
- compiler="org.apache.tools.ant.BuildException"
- />
+ compiler="org.apache.tools.ant.BuildException"/>
</target>
<target name="testNoBase" depends="init">
@@ -373,10 +364,9 @@
<target name="testFailingAdapter" depends="init">
<base-rmic
- compiler="org.apache.tools.ant.taskdefs.rmic.RmicAdvancedTest$FailingRmicAdapter"
- />
+ compiler="org.apache.tools.ant.taskdefs.rmic.RmicAdvancedTest$FailingRmicAdapter"/>
</target>
-
+
<target name="compileAntTimestamp" depends="init">
<javac
destdir="${build.dir}"
@@ -387,30 +377,26 @@
<target name="testAntClasspath" depends="compileAntTimestamp">
<base-rmic
- compiler="default"
- />
+ compiler="default"/>
<assertAntCompiled/>
</target>
<target name="testAntClasspathDest" depends="compileAntTimestamp">
<dest-rmic
- compiler="default"
- />
+ compiler="default"/>
<assertAntCompiledInDest/>
</target>
<target name="testForkingAntClasspath" depends="compileAntTimestamp">
<base-rmic
- compiler="forking"
- />
- <assertAntCompiled />
+ compiler="forking"/>
+ <assertAntCompiled/>
</target>
<target name="testForkingAntClasspathDest" depends="compileAntTimestamp">
<dest-rmic
- compiler="forking"
- />
- <assertAntCompiledInDest />
+ compiler="forking"/>
+ <assertAntCompiledInDest/>
</target>
<target name="testDefaultBadClass" depends="init">
@@ -419,19 +405,17 @@
<target name="testMagicProperty" depends="init">
<property name="build.rmic" value="no-such-adapter"/>
- <base-rmic
- />
+ <base-rmic/>
</target>
<target name="testMagicPropertyOverridesEmptyString" depends="init">
<property name="build.rmic" value="no-such-adapter"/>
- <base-rmic compiler=""
- />
+ <base-rmic compiler=""/>
</target>
<target name="testMagicPropertyIsEmptyString" depends="init">
<property name="build.rmic" value=""/>
- <base-rmic />
+ <base-rmic/>
<assertBaseCompiled/>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/signjar.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/signjar.xml b/src/etc/testcases/taskdefs/signjar.xml
index 38a1359..7c55e58 100644
--- a/src/etc/testcases/taskdefs/signjar.xml
+++ b/src/etc/testcases/taskdefs/signjar.xml
@@ -20,21 +20,21 @@
<import file="../buildfiletest-base.xml"/>
<target name="setUp">
- <mkdir dir="${output}" />
- <property name="subdir" location="${output}/subdir" />
+ <mkdir dir="${output}"/>
+ <property name="subdir" location="${output}/subdir"/>
<property name="classes.dir" value="../../../build/classes"/>
- <property name="test.jar" location="${output}/signtest.jar" />
- <property name="subdirtest.jar" location="${subdir}/signtest.jar" />
+ <property name="test.jar" location="${output}/signtest.jar"/>
+ <property name="subdirtest.jar" location="${subdir}/signtest.jar"/>
</target>
<macrodef name="assertSigned">
- <attribute name="jar" default="${test.jar}" />
+ <attribute name="jar" default="${test.jar}"/>
<sequential>
- <fail message="not signed: @{jar}" >
+ <fail message="not signed: @{jar}">
<condition>
- <not><issigned file="@{jar}" /></not>
+ <not><issigned file="@{jar}"/></not>
</condition>
</fail>
</sequential>
@@ -51,7 +51,7 @@
</presetdef>
<presetdef name="sign">
- <sign-base jar="${test.jar}" />
+ <sign-base jar="${test.jar}"/>
</presetdef>
<target name="jar" depends="setUp">
@@ -63,7 +63,7 @@
</target>
<target name="basic" depends="jar">
- <sign />
+ <sign/>
<assertSigned/>
</target>
@@ -85,13 +85,12 @@
<target name="urlKeystoreHTTP" depends="jar">
<sign
- keystore="http://ant.apache.org/webtest/testkeystore"
- />
+ keystore="http://ant.apache.org/webtest/testkeystore"/>
<assertSigned/>
</target>
<target name="testTsaLocalhost" depends="jar">
- <sign tsaurl="http://localhost:0/" />
+ <sign tsaurl="http://localhost:0/"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/sleep.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/sleep.xml b/src/etc/testcases/taskdefs/sleep.xml
index e161322..34314be 100644
--- a/src/etc/testcases/taskdefs/sleep.xml
+++ b/src/etc/testcases/taskdefs/sleep.xml
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="sleeptest" default="all" >
+<project name="sleeptest" default="all">
<target name="test1">
- <sleep />
+ <sleep/>
</target>
<target name="test2">
@@ -42,6 +42,6 @@
</target>
<target name="all"
- depends="test1,test2,test3,test4,test5" />
+ depends="test1,test2,test3,test4,test5"/>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/style/build.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/style/build.xml b/src/etc/testcases/taskdefs/style/build.xml
index c91d10f..82b3847 100644
--- a/src/etc/testcases/taskdefs/style/build.xml
+++ b/src/etc/testcases/taskdefs/style/build.xml
@@ -21,7 +21,7 @@
<import file="../../buildfiletest-base.xml"/>
<target name="setUp">
- <mkdir dir="${output}" />
+ <mkdir dir="${output}"/>
</target>
@@ -51,7 +51,7 @@
<target name="testTransferParameterUnsetWithIf">
<xslt in="data.xml" out="${output}/out.xml" style="printParams.xsl">
- <param name="undefined" expression="${value}" if="value" />
+ <param name="undefined" expression="${value}" if="value"/>
</xslt>
</target>
@@ -124,7 +124,7 @@
<!-- also testing style as resources, with refid -->
<file id="xslFile" file="printParams.xsl"/>
<xslt in="data.xml" out="${output}/out.xml" style="printParams.xsl">
- <style refid="xslFile" />
+ <style refid="xslFile"/>
</xslt>
</target>
@@ -158,10 +158,8 @@
basedir="${output}/xml"
includes="**/*.xml"
extension=".txt"
-
filenameparameter="filename"
- filedirparameter="filedir"
- />
+ filedirparameter="filedir"/>
</target>
<target name="testFilenameAsParam">
@@ -175,9 +173,7 @@
basedir="${output}/xml"
includes="**/*.xml"
extension=".txt"
-
- filenameparameter="filename"
- />
+ filenameparameter="filename"/>
</target>
<target name="testFilenameAsParamNoSetting">
@@ -190,8 +186,8 @@
destdir="${output}"
basedir="${output}/xml"
includes="**/*.xml"
- extension=".txt"
- /> <!-- without 'filenameparameter' to check, that the xsl:param is NOT set -->
+ extension=".txt"/>
+ <!-- without 'filenameparameter' to check, that the xsl:param is NOT set -->
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/sync.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/sync.xml b/src/etc/testcases/taskdefs/sync.xml
index d2eb126..bc28362 100644
--- a/src/etc/testcases/taskdefs/sync.xml
+++ b/src/etc/testcases/taskdefs/sync.xml
@@ -19,7 +19,7 @@
<import file="../buildfiletest-base.xml"/>
<target name="setUp">
- <mkdir dir="${output}" />
+ <mkdir dir="${output}"/>
<property name="src" location="${output}/source"/>
<property name="dest" location="${output}/target"/>
<mkdir dir="${src}"/>
@@ -138,4 +138,4 @@
</sync>
</target>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/tar.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/tar.xml b/src/etc/testcases/taskdefs/tar.xml
index 2eda0b5..f979d8b 100644
--- a/src/etc/testcases/taskdefs/tar.xml
+++ b/src/etc/testcases/taskdefs/tar.xml
@@ -176,15 +176,15 @@
<target name="feather">
<tar destfile="${output}/asf-logo.gif.tar"
basedir=".."
- includes="asf-logo.gif" />
+ includes="asf-logo.gif"/>
<tar destfile="${output}/asf-logo.gif.tar.gz"
basedir=".."
- includes="asf-logo.gif"
+ includes="asf-logo.gif"
compression="gzip"/>
<tar destfile="${output}/asf-logo.gif.tar.bz2"
basedir=".."
includes="asf-logo.gif"
- compression="bzip2" />
+ compression="bzip2"/>
</target>
<target name="testGZipResource">
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/taskdef.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/taskdef.xml b/src/etc/testcases/taskdefs/taskdef.xml
index 4b0658e..6b65449 100644
--- a/src/etc/testcases/taskdefs/taskdef.xml
+++ b/src/etc/testcases/taskdefs/taskdef.xml
@@ -19,13 +19,13 @@
<project name="xxx-test" basedir="." default="test1">
<path id="testclasses">
- <pathelement location="../../../../build/testcases" />
- <pathelement path="${java.class.path}" />
+ <pathelement location="../../../../build/testcases"/>
+ <pathelement path="${java.class.path}"/>
</path>
<taskdef name="global"
classname="org.example.tasks.TaskdefTestContainerTask">
- <classpath refid="testclasses" />
+ <classpath refid="testclasses"/>
</taskdef>
<target name="test1">
@@ -45,41 +45,41 @@
</target>
<target name="test5">
- <taskdef name="test" classname="org.apache.tools.ant.Project" />
+ <taskdef name="test" classname="org.apache.tools.ant.Project"/>
</target>
<target name="test5a">
- <taskdef name="test" classname="org.apache.tools.ant.taskdefs.Copy" />
+ <taskdef name="test" classname="org.apache.tools.ant.taskdefs.Copy"/>
</target>
<target name="test6">
<taskdef name="test6"
classname="org.example.tasks.TaskdefTestSimpleTask">
- <classpath refid="testclasses" />
+ <classpath refid="testclasses"/>
</taskdef>
<test6>
- <echo message="worked" />
+ <echo message="worked"/>
</test6>
</target>
<target name="test7">
<taskdef name="test7"
classname="org.example.tasks.TaskdefTestContainerTask">
- <classpath refid="testclasses" />
+ <classpath refid="testclasses"/>
</taskdef>
<test7>
- <echo message="worked" />
+ <echo message="worked"/>
</test7>
</target>
<target name="testGlobal">
<global>
- <echo message="worked" />
+ <echo message="worked"/>
</global>
</target>
<target name="testOverride">
- <taskdef name="copy" classname="org.apache.tools.ant.taskdefs.Echo" />
+ <taskdef name="copy" classname="org.apache.tools.ant.taskdefs.Echo"/>
<copy>In target</copy>
<sequential>
<copy>In TaskContainer</copy>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/test.antlib.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/test.antlib.xml b/src/etc/testcases/taskdefs/test.antlib.xml
index 37ff7f8..81123ad 100644
--- a/src/etc/testcases/taskdefs/test.antlib.xml
+++ b/src/etc/testcases/taskdefs/test.antlib.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
<antlib>
- <typedef
+ <typedef
name="mytask" onerror="ignore"
classname="org.apache.tools.ant.taskdefs.AntlibTest$MyTask"/>
</antlib>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/test2.antlib.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/test2.antlib.xml b/src/etc/testcases/taskdefs/test2.antlib.xml
index 9a2509e..3c4ce2a 100644
--- a/src/etc/testcases/taskdefs/test2.antlib.xml
+++ b/src/etc/testcases/taskdefs/test2.antlib.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
<antlib>
- <typedef
+ <typedef
name="mytask2" onerror="ignore"
classname="org.apache.tools.ant.taskdefs.AntlibTest$MyTask2"/>
</antlib>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/touch.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/touch.xml b/src/etc/testcases/taskdefs/touch.xml
index 3b426d9..8aab42e 100644
--- a/src/etc/testcases/taskdefs/touch.xml
+++ b/src/etc/testcases/taskdefs/touch.xml
@@ -17,15 +17,15 @@
-->
<project default="cleanup" basedir=".">
- <property name="mappermillis" value="1072224000000" />
-
+ <property name="mappermillis" value="1072224000000"/>
+
<selector id="map.selector">
- <date millis="${mappermillis}" />
+ <date millis="${mappermillis}"/>
</selector>
<target name="cleanup">
<delete>
- <fileset dir="." includes="touchtest*" />
+ <fileset dir="." includes="touchtest*"/>
</delete>
</target>
@@ -38,9 +38,9 @@
</target>
<target name="testNow">
- <touch file="touchtest" />
+ <touch file="touchtest"/>
</target>
-
+
<target name="testMillis">
<!-- this one is about 21 years after the epoch -->
<!-- less than 20 years after the epoch, test does not pass on my Win2K/FAT -->
@@ -48,23 +48,23 @@
<!-- see http://developer.java.sun.com/developer/bugParade/bugs/4177432.html -->
<!-- and http://developer.java.sun.com/developer/bugParade/bugs/4697792.html -->
<!-- not sure why -->
- <touch file="touchtest" millis="662256000000" />
+ <touch file="touchtest" millis="662256000000"/>
</target>
-
+
<target name="test2000">
<!-- this number of milliseconds is 30 * 365 * 24 * 3600 * 1000 -->
<!-- so the corresponding time is at the end of 1999 -->
- <touch file="touchtest" millis="946080000000" />
+ <touch file="touchtest" millis="946080000000"/>
</target>
-
+
<target name="testFilelist">
- <touch millis="662256000000" >
+ <touch millis="662256000000">
<filelist dir="." files="touchtest"/>
</touch>
</target>
<target name="testFileset" depends="testNow">
- <touch millis="946080000000" >
+ <touch millis="946080000000">
<fileset dir="." includes="touchtest"/>
</touch>
</target>
@@ -76,43 +76,43 @@
</target>
<target name="testMappedFileset">
- <touch file="touchtest" millis="${mappermillis}" />
+ <touch file="touchtest" millis="${mappermillis}"/>
<touch>
- <fileset file="touchtest" />
+ <fileset file="touchtest"/>
<compositemapper>
- <globmapper from="*" to="*foo" />
- <globmapper from="*" to="*bar" />
+ <globmapper from="*" to="*foo"/>
+ <globmapper from="*" to="*bar"/>
</compositemapper>
</touch>
<fileset id="touchtest" file="touchtest">
- <selector refid="map.selector" />
+ <selector refid="map.selector"/>
</fileset>
<fileset id="touchtestfoo" file="touchtestfoo">
- <selector refid="map.selector" />
+ <selector refid="map.selector"/>
</fileset>
<fileset id="touchtestbar" file="touchtestbar">
- <selector refid="map.selector" />
+ <selector refid="map.selector"/>
</fileset>
<pathconvert property="touchtest" pathsep=" "
- refid="touchtest" setonempty="false" />
+ refid="touchtest" setonempty="false"/>
<pathconvert property="touchtestfoo" pathsep=" "
- refid="touchtestfoo" setonempty="false" />
+ refid="touchtestfoo" setonempty="false"/>
<pathconvert property="touchtestbar" pathsep=" "
- refid="touchtestbar" setonempty="false" />
+ refid="touchtestbar" setonempty="false"/>
<fail>
<condition>
<not>
<and>
- <isset property="touchtest" />
- <isset property="touchtestfoo" />
- <isset property="touchtestbar" />
+ <isset property="touchtest"/>
+ <isset property="touchtestfoo"/>
+ <isset property="touchtestbar"/>
</and>
</not>
</condition>
@@ -121,45 +121,45 @@
</target>
<target name="testExplicitMappedFileset">
- <touch file="touchtest" millis="${mappermillis}" />
+ <touch file="touchtest" millis="${mappermillis}"/>
<touch>
- <fileset file="touchtest" />
+ <fileset file="touchtest"/>
<mapper>
<compositemapper>
- <globmapper from="*" to="*foo" />
- <globmapper from="*" to="*bar" />
+ <globmapper from="*" to="*foo"/>
+ <globmapper from="*" to="*bar"/>
</compositemapper>
</mapper>
</touch>
<fileset id="touchtest" file="touchtest">
- <selector refid="map.selector" />
+ <selector refid="map.selector"/>
</fileset>
<fileset id="touchtestfoo" file="touchtestfoo">
- <selector refid="map.selector" />
+ <selector refid="map.selector"/>
</fileset>
<fileset id="touchtestbar" file="touchtestbar">
- <selector refid="map.selector" />
+ <selector refid="map.selector"/>
</fileset>
<pathconvert property="touchtest" pathsep=" "
- refid="touchtest" setonempty="false" />
+ refid="touchtest" setonempty="false"/>
<pathconvert property="touchtestfoo" pathsep=" "
- refid="touchtestfoo" setonempty="false" />
+ refid="touchtestfoo" setonempty="false"/>
<pathconvert property="touchtestbar" pathsep=" "
- refid="touchtestbar" setonempty="false" />
+ refid="touchtestbar" setonempty="false"/>
<fail>
<condition>
<not>
<and>
- <isset property="touchtest" />
- <isset property="touchtestfoo" />
- <isset property="touchtestbar" />
+ <isset property="touchtest"/>
+ <isset property="touchtestfoo"/>
+ <isset property="touchtestbar"/>
</and>
</not>
</condition>
@@ -169,21 +169,21 @@
<target name="testMappedFilelist">
<touch millis="${mappermillis}">
- <filelist dir="." files="idonotexist" />
- <mergemapper to="touchtest" />
+ <filelist dir="." files="idonotexist"/>
+ <mergemapper to="touchtest"/>
</touch>
<fileset id="touchtest" file="touchtest">
- <selector refid="map.selector" />
+ <selector refid="map.selector"/>
</fileset>
<pathconvert property="touchtest" pathsep=" "
- refid="touchtest" setonempty="false" />
+ refid="touchtest" setonempty="false"/>
<fail>
<condition>
<not>
- <isset property="touchtest" />
+ <isset property="touchtest"/>
</not>
</condition>
</fail>
@@ -191,26 +191,26 @@
</target>
<target name="testGoodPattern">
- <touch file="touchtest" datetime="06242003142012GMTfoo" pattern="MMddyyyyHHmmssz'foo'" />
+ <touch file="touchtest" datetime="06242003142012GMTfoo" pattern="MMddyyyyHHmmssz'foo'"/>
<fileset id="touchtest" file="touchtest">
- <date millis="1056464412000" />
+ <date millis="1056464412000"/>
</fileset>
<pathconvert property="touchtest" pathsep=" "
- refid="touchtest" setonempty="false" />
+ refid="touchtest" setonempty="false"/>
<fail>
<condition>
<not>
- <isset property="touchtest" />
+ <isset property="touchtest"/>
</not>
</condition>
</fail>
</target>
<target name="testBadPattern">
- <touch file="touchtest" datetime="06242003142012GMTfoo" pattern="MMddyyyyHHmmssz'bar'" />
+ <touch file="touchtest" datetime="06242003142012GMTfoo" pattern="MMddyyyyHHmmssz'bar'"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/typeadapter.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/typeadapter.xml b/src/etc/testcases/taskdefs/typeadapter.xml
index c2aa70e..09bb6eb 100644
--- a/src/etc/testcases/taskdefs/typeadapter.xml
+++ b/src/etc/testcases/taskdefs/typeadapter.xml
@@ -19,8 +19,8 @@
<project name="test" basedir="." default="invalid">
<property name="testcases.dir" location="../../../../build/testcases"/>
<path id="testclasses">
- <pathelement location="${testcases.dir}" />
- <pathelement path="${java.class.path}" />
+ <pathelement location="${testcases.dir}"/>
+ <pathelement path="${java.class.path}"/>
</path>
<target name="taskadapter">
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/typedef.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/typedef.xml b/src/etc/testcases/taskdefs/typedef.xml
index 1c7922b..071d5ed 100644
--- a/src/etc/testcases/taskdefs/typedef.xml
+++ b/src/etc/testcases/taskdefs/typedef.xml
@@ -23,16 +23,16 @@
</target>
<target name="empty">
- <typedef />
+ <typedef/>
</target>
<target name="noClassname">
- <typedef name="dummy" />
+ <typedef name="dummy"/>
</target>
<target name="noName">
<typedef classname="org.example.types.TypedefTestType">
- <classpath refid="testclasses" />
+ <classpath refid="testclasses"/>
</typedef>
</target>
@@ -41,25 +41,25 @@
</target>
<path id="testclasses">
- <pathelement location="../../../../build/testcases" />
- <pathelement path="${java.class.path}" />
+ <pathelement location="../../../../build/testcases"/>
+ <pathelement path="${java.class.path}"/>
</path>
<typedef name="global"
classname="org.example.types.TypedefTestType">
- <classpath refid="testclasses" />
+ <classpath refid="testclasses"/>
</typedef>
<target name="testGlobal">
- <global id="global" />
+ <global id="global"/>
</target>
<target name="testLocal">
<typedef name="localtype"
classname="org.example.types.TypedefTestType">
- <classpath refid="testclasses" />
+ <classpath refid="testclasses"/>
</typedef>
- <localtype id="local" />
+ <localtype id="local"/>
</target>
<target name="double-notpresent">
@@ -69,16 +69,16 @@
onerror="ignore"/>
<mytask>hi</mytask>
</target>
-
+
<target name="noresourcefailall">
- <typedef resource="somenotpresentfile.properties" onerror="failall"/>
+ <typedef resource="somenotpresentfile.properties" onerror="failall"/>
</target>
-
+
<target name="noresourcefail">
- <typedef resource="somenotpresentfile.properties" onerror="fail"/>
+ <typedef resource="somenotpresentfile.properties" onerror="fail"/>
</target>
-
+
<target name="noresourcenotfail">
- <typedef resource="somenotpresentfile.properties" />
+ <typedef resource="somenotpresentfile.properties"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/untar.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/untar.xml b/src/etc/testcases/taskdefs/untar.xml
index 04d44b3..0990d66 100644
--- a/src/etc/testcases/taskdefs/untar.xml
+++ b/src/etc/testcases/taskdefs/untar.xml
@@ -26,26 +26,26 @@
</target>
<target name="testTarTask">
- <ant antfile="tar.xml" target="feather" />
- <untar src="${output}/asf-logo.gif.tar" dest="${output}/untar" />
+ <ant antfile="tar.xml" target="feather"/>
+ <untar src="${output}/asf-logo.gif.tar" dest="${output}/untar"/>
</target>
<target name="testGzipTarTask">
- <ant antfile="tar.xml" target="feather" />
- <untar src="${output}/asf-logo.gif.tar.gz" dest="${output}/untar" compression="gzip" />
+ <ant antfile="tar.xml" target="feather"/>
+ <untar src="${output}/asf-logo.gif.tar.gz" dest="${output}/untar" compression="gzip"/>
</target>
<target name="testBzip2TarTask">
- <ant antfile="tar.xml" target="feather" />
+ <ant antfile="tar.xml" target="feather"/>
<untar src="${output}/asf-logo.gif.tar.bz2" dest="${output}/untar" compression="bzip2"/>
</target>
<target name="realTest">
- <untar src="expected/asf-logo.gif.tar" dest="${output}/untar" />
+ <untar src="expected/asf-logo.gif.tar" dest="${output}/untar"/>
</target>
<target name="realGzipTest">
- <untar src="expected/asf-logo.gif.tar.gz" dest="${output}/untar" compression="gzip" />
+ <untar src="expected/asf-logo.gif.tar.gz" dest="${output}/untar" compression="gzip"/>
</target>
<target name="realBzip2Test">
@@ -54,7 +54,7 @@
<target name="srcDirTest">
- <untar src="." dest="${output}/untar" />
+ <untar src="." dest="${output}/untar"/>
</target>
<target name="encodingTest">
@@ -99,5 +99,5 @@
</tarfileset>
</copy>
</target>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/unzip.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/unzip.xml b/src/etc/testcases/taskdefs/unzip.xml
index ee96ee1..1ca5c81 100644
--- a/src/etc/testcases/taskdefs/unzip.xml
+++ b/src/etc/testcases/taskdefs/unzip.xml
@@ -38,17 +38,17 @@
</target>
<target name="testZipTask">
- <ant antfile="zip.xml" target="feather" />
- <unzip src="${output}/asf-logo.gif.zip" dest="${output}" />
+ <ant antfile="zip.xml" target="feather"/>
+ <unzip src="${output}/asf-logo.gif.zip" dest="${output}"/>
</target>
<target name="testUncompressedZipTask">
- <ant antfile="zip.xml" target="uncompressed-feather" />
- <unzip src="${output}/asf-logo.gif.zip" dest="${output}" />
+ <ant antfile="zip.xml" target="uncompressed-feather"/>
+ <unzip src="${output}/asf-logo.gif.zip" dest="${output}"/>
</target>
<target name="realTest">
- <unzip src="expected/asf-logo.gif.zip" dest="${output}" />
+ <unzip src="expected/asf-logo.gif.zip" dest="${output}"/>
</target>
<target name="prepareTestZip">
@@ -156,7 +156,7 @@
<include name="1/**"/>
</patternset>
<mapper type="glob" from="*" to="*.txt"/>
- <mapper type="flatten"/>
+ <mapper type="flatten"/>
</unzip>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/war.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/war.xml b/src/etc/testcases/taskdefs/war.xml
index b000ecf..de48039 100644
--- a/src/etc/testcases/taskdefs/war.xml
+++ b/src/etc/testcases/taskdefs/war.xml
@@ -20,7 +20,7 @@
<import file="../buildfiletest-base.xml"/>
<target name="setUp">
- <mkdir dir="${output}" />
+ <mkdir dir="${output}"/>
</target>
@@ -35,5 +35,5 @@
</war>
<unzip src="${output}/test.war" dest="${output}"/>
</target>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/xmlns.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/xmlns.xml b/src/etc/testcases/taskdefs/xmlns.xml
index e699166..19ab9cc 100644
--- a/src/etc/testcases/taskdefs/xmlns.xml
+++ b/src/etc/testcases/taskdefs/xmlns.xml
@@ -21,15 +21,15 @@
<property name="testcases.dir" location="../../../../build/testcases"/>
<path id="testclasses">
- <pathelement location="${testcases.dir}" />
- <pathelement path="${java.class.path}" />
+ <pathelement location="${testcases.dir}"/>
+ <pathelement path="${java.class.path}"/>
</path>
<target name="xmlns" xmlns:test="this.is.another.test.uri">
<typedef classname="org.apache.tools.ant.taskdefs.XmlnsTest$MyTask"
classpathref="testclasses"
name="mytask"
- uri="this.is.another.test.uri" />
+ uri="this.is.another.test.uri"/>
<test:mytask/>
</target>
@@ -46,22 +46,22 @@
<target name="xmlns.file" xmlns:test="this.is.a.test.uri">
<typedef file="test.antlib.xml"
classpathref="testclasses"
- uri="this.is.a.test.uri" />
+ uri="this.is.a.test.uri"/>
<test:mytask/>
</target>
<target name="core">
<typedef file="test.antlib.xml"
classpathref="testclasses"
- uri="antlib:org.apache.tools.ant" />
+ uri="antlib:org.apache.tools.ant"/>
<mytask/>
</target>
<target name="excluded">
<typedef file="test.antlib.xml"
classpathref="testclasses"
- uri="ant:notallowed" />
+ uri="ant:notallowed"/>
</target>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/xmlproperty/inputs/original.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/xmlproperty/inputs/original.xml b/src/etc/testcases/taskdefs/xmlproperty/inputs/original.xml
index ef2603c..dcda6bb 100644
--- a/src/etc/testcases/taskdefs/xmlproperty/inputs/original.xml
+++ b/src/etc/testcases/taskdefs/xmlproperty/inputs/original.xml
@@ -19,4 +19,3 @@
<inner-tag someattr="val">Text</inner-tag>
<a2><a3><a4>false</a4></a3></a2>
</root-tag>
-
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/xmlproperty_data.dtd
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/xmlproperty_data.dtd b/src/etc/testcases/taskdefs/xmlproperty_data.dtd
index 5d75d6e..11d6581 100644
--- a/src/etc/testcases/taskdefs/xmlproperty_data.dtd
+++ b/src/etc/testcases/taskdefs/xmlproperty_data.dtd
@@ -27,4 +27,3 @@
<!ELEMENT a4 (#PCDATA)>
<!ELEMENT cdatatag (#PCDATA)>
-
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/taskdefs/zip.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/zip.xml b/src/etc/testcases/taskdefs/zip.xml
index 61a54a3..4a84106 100644
--- a/src/etc/testcases/taskdefs/zip.xml
+++ b/src/etc/testcases/taskdefs/zip.xml
@@ -49,15 +49,15 @@
-->
<target name="test5">
- <zip zipfile="${output}/test5.zip" basedir="." >
- <exclude name="test5.zip" />
+ <zip zipfile="${output}/test5.zip" basedir=".">
+ <exclude name="test5.zip"/>
</zip>
</target>
<target name="test6">
<zip destFile="${output}/test6.zip" basedir=".">
- <include name="*.xml" />
- <exclude name="zip.*" />
+ <include name="*.xml"/>
+ <exclude name="zip.*"/>
</zip>
</target>
@@ -65,19 +65,19 @@
<copy todir="${output}">
<fileset dir="."/>
</copy>
- <zip destFile="${output}/inner7.zip" basedir="${output}" >
- <exclude name="inner7.zip" />
+ <zip destFile="${output}/inner7.zip" basedir="${output}">
+ <exclude name="inner7.zip"/>
</zip>
<zip destFile="${output}/test7.zip" basedir=".">
- <exclude name="**/*.*" />
- <zipfileset src="${output}/inner7.zip" />
+ <exclude name="**/*.*"/>
+ <zipfileset src="${output}/inner7.zip"/>
</zip>
</target>
<target name="feather">
<zip destFile="${output}/asf-logo.gif.zip"
basedir=".."
- includes="asf-logo.gif" />
+ includes="asf-logo.gif"/>
</target>
<target name="uncompressed-feather">
@@ -88,25 +88,25 @@
<!-- legacy attribute support -->
<target name="test8">
- <zip zipfile="${output}/test8.zip" basedir="." >
- <exclude name="test8.zip" />
+ <zip zipfile="${output}/test8.zip" basedir=".">
+ <exclude name="test8.zip"/>
</zip>
</target>
<target name="testZipgroupfileset">
<zip zipfile="${output}/zipgroupfileset.zip" basedir=".">
- <zipgroupfileset dir="zip"
- includes="zipgroupfileset*.zip"
- excludes="zipgroupfileset3.zip" />
- <include name="zip/zipgroupfileset3.zip" />
+ <zipgroupfileset dir="zip"
+ includes="zipgroupfileset*.zip"
+ excludes="zipgroupfileset3.zip"/>
+ <include name="zip/zipgroupfileset3.zip"/>
</zip>
</target>
<target name="testDuplicateFail">
<zip zipfile="${output}/duplicateFail.zip" basedir="." duplicate="fail">
- <zipgroupfileset dir="duplicate" includes="duplicate*.zip" />
+ <zipgroupfileset dir="duplicate" includes="duplicate*.zip"/>
</zip>
</target>
@@ -114,16 +114,16 @@
<zip destFile="${output}/asf-logo.gif.zip"
basedir=".."
includes="asf-logo.gif"
- update="true" />
+ update="true"/>
</target>
<target name="testUpdateIsNecessary" depends="feather">
- <touch file="${output}/dummyfile" />
+ <touch file="${output}/dummyfile"/>
<copy file="../asf-logo.gif" todir="${output}"/>
<zip destFile="${output}/asf-logo.gif.zip"
basedir="${output}"
includes="asf-logo.gif,dummyfile"
- update="true" />
+ update="true"/>
</target>
<!-- Bugzilla Report 18403 -->
@@ -153,7 +153,7 @@
<zip destFile="${output}/test3.zip" basedir="${output}/ziptest" whenempty="skip"/>
<fail message="archive should get skipped">
<condition>
- <available file="${output}/test3.zip" />
+ <available file="${output}/test3.zip"/>
</condition>
</fail>
</target>
@@ -166,15 +166,15 @@
<condition>
<or>
<not>
- <available file="${output}/test3.zip" />
+ <available file="${output}/test3.zip"/>
</not>
<resourcecount when="gt" count="0">
- <zipfileset src="${output}/test3.zip" />
+ <zipfileset src="${output}/test3.zip"/>
</resourcecount>
<resourcecount when="ne" count="1">
<restrict>
- <exists xmlns="antlib:org.apache.tools.ant.types.resources.selectors" />
- <zipentry zipfile="${output}/test3.zip" name="empty2/" />
+ <exists xmlns="antlib:org.apache.tools.ant.types.resources.selectors"/>
+ <zipentry zipfile="${output}/test3.zip" name="empty2/"/>
</restrict>
</resourcecount>
</or>
@@ -184,11 +184,11 @@
<!-- Bugzilla Report 40258 -->
<target name="zipEmptyDirFilesOnly">
- <mkdir dir="${output}/empty/empty2" />
- <zip destFile="${output}/test3.zip" basedir="${output}/empty" update="true" filesonly="true" />
+ <mkdir dir="${output}/empty/empty2"/>
+ <zip destFile="${output}/test3.zip" basedir="${output}/empty" update="true" filesonly="true"/>
<fail message="archive should get skipped">
<condition>
- <available file="${output}/test3.zip" />
+ <available file="${output}/test3.zip"/>
</condition>
</fail>
</target>
@@ -200,10 +200,10 @@
<condition>
<or>
<not>
- <available file="${output}/test3.zip" />
+ <available file="${output}/test3.zip"/>
</not>
<resourcecount when="gt" count="0">
- <zipfileset src="${output}/test3.zip" />
+ <zipfileset src="${output}/test3.zip"/>
</resourcecount>
</or>
</condition>
@@ -211,21 +211,21 @@
</target>
<target name="testCompressionLevel" depends="test6">
- <length property="test6.length" file="${output}/test6.zip" />
+ <length property="test6.length" file="${output}/test6.zip"/>
<copy todir="${output}">
<fileset dir=".">
<include name="*.xml"/>
</fileset>
</copy>
<zip destFile="${output}/testLevel.zip" basedir="${output}" level="9">
- <include name="*.xml" />
- <exclude name="zip.*" />
+ <include name="*.xml"/>
+ <exclude name="zip.*"/>
</zip>
<fail>
<condition>
<not>
<isfileselected file="${output}/testLevel.zip">
- <size when="less" value="${test6.length}" />
+ <size when="less" value="${test6.length}"/>
</isfileselected>
</not>
</condition>
@@ -288,17 +288,17 @@
<touch file="${output}/regexp.src/file1"/>
<zip destFile="${output}/regexp.zip">
<mappedresources>
- <fileset dir="${output}/regexp.src" includes="file1" />
- <regexpmapper from="^(([a-z][a-z]).*)" to="\2/\1.r" />
+ <fileset dir="${output}/regexp.src" includes="file1"/>
+ <regexpmapper from="^(([a-z][a-z]).*)" to="\2/\1.r"/>
</mappedresources>
</zip>
</target>
<target name="testRegexpMapper2">
- <sleep seconds="3" />
+ <sleep seconds="3"/>
<zip destFile="${output}/regexp.zip">
<mappedresources>
- <fileset dir="${output}/regexp.src" includes="file1" />
- <regexpmapper from="^(([a-z][a-z]).*)" to="\2/\1.r" />
+ <fileset dir="${output}/regexp.src" includes="file1"/>
+ <regexpmapper from="^(([a-z][a-z]).*)" to="\2/\1.r"/>
</mappedresources>
</zip>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/types/addtype.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/types/addtype.xml b/src/etc/testcases/types/addtype.xml
index cc8ff24..84247ed 100644
--- a/src/etc/testcases/types/addtype.xml
+++ b/src/etc/testcases/types/addtype.xml
@@ -57,38 +57,38 @@
<target name="init">
<property name="nested.package" value="org.apache.tools.ant.types."/>
<path id="test-classes">
- <pathelement location="../../../../build/testcases" />
- <pathelement path="${java.class.path}" />
+ <pathelement location="../../../../build/testcases"/>
+ <pathelement path="${java.class.path}"/>
</path>
<typedef loaderref="nested.loader" classpathref="test-classes"
- name = "nested.a"
+ name="nested.a"
classname="${nested.package}AddTypeTest$AImpl"/>
<typedef loaderref="nested.loader"
- name = "nested.b"
+ name="nested.b"
classname="${nested.package}AddTypeTest$BImpl"/>
<typedef loaderref="nested.loader"
- name = "nested.c"
+ name="nested.c"
classname="${nested.package}AddTypeTest$CImpl"/>
<typedef loaderref="nested.loader"
- name = "nested.ab"
+ name="nested.ab"
classname="${nested.package}AddTypeTest$ABImpl"/>
<taskdef loaderref="nested.loader"
- name = "nested.container"
+ name="nested.container"
classname="${nested.package}AddTypeTest$NestedContainer"/>
<taskdef loaderref="nested.loader"
- name = "nested.condition.task"
+ name="nested.condition.task"
classname="${nested.package}AddTypeTest$MyCondition"/>
<typedef loaderref="nested.loader"
- name = "nested.condition.type"
+ name="nested.condition.type"
classname="${nested.package}AddTypeTest$MyCondition"/>
<typedef loaderref="nested.loader"
- name = "myaddconfigured"
+ name="myaddconfigured"
classname="${nested.package}AddTypeTest$MyAddConfigured"/>
<typedef loaderref="nested.loader"
- name = "myaddconfiguredvalue"
+ name="myaddconfiguredvalue"
classname="${nested.package}AddTypeTest$MyAddConfiguredValue"/>
<typedef loaderref="nested.loader"
- name = "myvalue"
+ name="myvalue"
classname="${nested.package}AddTypeTest$MyValue"/>
</target>
@@ -103,7 +103,7 @@
<nested.b/>
</nested.container>
</target>
-
+
<target name="nested.c" depends="init">
<nested.container>
<nested.c/>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/types/assertions.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/types/assertions.xml b/src/etc/testcases/types/assertions.xml
index dee7ce7..ed5a12b 100644
--- a/src/etc/testcases/types/assertions.xml
+++ b/src/etc/testcases/types/assertions.xml
@@ -31,61 +31,60 @@
includes="*.java"
source="${source}"
debug="true"
- destdir="${output}"
- />
+ destdir="${output}"/>
</target>
<property name="src.dir" location="assertions"/>
<property name="classname" value="AssertionMain"/>
<property name="test.classname" value="AssertionTest"/>
-
+
<path id="assert.classpath">
<pathelement location="${output}"/>
- </path>
-
-
+ </path>
+
+
<!-- if per-class assertions work, this run asserts -->
<target name="test-classname" depends="setUp">
<java fork="true" failonerror="true"
classname="${classname}"
classpathref="assert.classpath">
<assertions enablesystemassertions="true">
- <enable class="${classname}" />
+ <enable class="${classname}"/>
</assertions>
</java>
</target>
-
+
<!-- if package works, this run asserts -->
<target name="test-package" depends="setUp">
- <java fork="true" failonerror="true"
+ <java fork="true" failonerror="true"
classname="${classname}"
classpathref="assert.classpath">
- <assertions enableSystemAssertions="false" >
- <enable package="..." />
+ <assertions enableSystemAssertions="false">
+ <enable package="..."/>
</assertions>
</java>
</target>
<!-- this test should run the app successfully -->
<target name="test-empty-assertions" depends="setUp">
- <java fork="true" failonerror="true"
+ <java fork="true" failonerror="true"
classname="${classname}"
classpathref="assert.classpath">
<assertions/>
</java>
- </target>
+ </target>
<!-- this test should run the app successfully -->
<target name="test-disable" depends="setUp">
<java fork="true" failonerror="true"
classname="${classname}"
classpathref="assert.classpath">
- <assertions enableSystemAssertions="false" >
- <enable package="..." />
- <disable class="${classname}" />
+ <assertions enableSystemAssertions="false">
+ <enable package="..."/>
+ <disable class="${classname}"/>
</assertions>
</java>
- </target>
+ </target>
<!-- repeated settigns result in the last declaration winning
except that the rule 'classes win over packages takes priority
@@ -94,14 +93,14 @@
<java fork="true" failonerror="true"
classname="${classname}"
classpathref="assert.classpath">
- <assertions enableSystemAssertions="false" >
- <enable package="..." />
- <disable class="${classname}" />
- <enable class="${classname}" />
- <disable package="..." />
+ <assertions enableSystemAssertions="false">
+ <enable package="..."/>
+ <disable class="${classname}"/>
+ <enable class="${classname}"/>
+ <disable package="..."/>
</assertions>
</java>
- </target>
+ </target>
<!-- repeated settigns result in the last declaration winning;
this run will not assert -->
@@ -109,38 +108,38 @@
<java fork="true" failonerror="true"
classname="${classname}"
classpathref="assert.classpath">
- <assertions enableSystemAssertions="false" >
- <enable package="..." />
- <enable class="${classname}" />
- <disable class="${classname}" />
+ <assertions enableSystemAssertions="false">
+ <enable package="..."/>
+ <enable class="${classname}"/>
+ <disable class="${classname}"/>
</assertions>
</java>
- </target>
-
+ </target>
+
<!-- if references work, this run asserts -->
<target name="test-references">
- <assertions id="project.assertions" >
- <enable package="org.apache.test" />
+ <assertions id="project.assertions">
+ <enable package="org.apache.test"/>
<disable package="org.apache.log4j"/>
<enable package="..."/>
- </assertions>
+ </assertions>
<java fork="true" failonerror="true"
classname="${classname}"
classpathref="assert.classpath">
<assertions refid="project.assertions"/>
</java>
</target>
-
+
<!-- when fork=false; we need to reject the construct -->
<target name="test-nofork" depends="setUp">
<java fork="false" failonerror="true"
classname="${classname}"
classpathref="assert.classpath">
<assertions enablesystemassertions="true">
- <enable class="${classname}" />
+ <enable class="${classname}"/>
</assertions>
</java>
- </target>
+ </target>
<!-- this throws a build error -->
<target name="test-multiple-assertions" depends="setUp">
@@ -148,58 +147,56 @@
classname="${classname}"
classpathref="assert.classpath">
<assertions enablesystemassertions="true">
- <enable class="${classname}" />
+ <enable class="${classname}"/>
</assertions>
<assertions/>
</java>
- </target>
-
+ </target>
+
<!-- should throw a build exception -->
<target name="test-reference-abuse" depends="setUp">
- <assertions id="project.assertions2" >
- <enable package="org.apache.test" />
+ <assertions id="project.assertions2">
+ <enable package="org.apache.test"/>
<disable package="org.apache.log4j"/>
<enable package="..."/>
- </assertions>
+ </assertions>
<java fork="true" failonerror="true"
classname="${classname}"
classpathref="assert.classpath">
<assertions refid="project.assertions2">
- <disable class="${classname}" />
- </assertions>
+ <disable class="${classname}"/>
+ </assertions>
</java>
- </target>
-
-
+ </target>
+
+
<target name="test-junit" depends="setUp">
- <junit fork="true"
- haltonerror="true" haltonfailure="true"
- >
+ <junit fork="true"
+ haltonerror="true" haltonfailure="true">
<classpath>
<path refid="assert.classpath"/>
</classpath>
- <formatter type="plain" usefile="false"/>
- <assertions >
- <enable class="${test.classname}" />
- </assertions>
+ <formatter type="plain" usefile="false"/>
+ <assertions>
+ <enable class="${test.classname}"/>
+ </assertions>
<test name="${test.classname}"/>
</junit>
</target>
-
+
<!-- This is here to show that setting it as a property works
so there is some defect in pass-on of assertions that
is causing the problem -->
<target name="test-junit-manual-setup" depends="setUp">
- <junit fork="true"
- haltonerror="true" haltonfailure="true"
- >
+ <junit fork="true"
+ haltonerror="true" haltonfailure="true">
<classpath>
<path refid="assert.classpath"/>
</classpath>
- <formatter type="plain" usefile="false"/>
+ <formatter type="plain" usefile="false"/>
<test name="${test.classname}"/>
<jvmarg value="-ea:AssertionTest"/>
</junit>
- </target>
-
+ </target>
+
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/types/filterset.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/types/filterset.xml b/src/etc/testcases/types/filterset.xml
index bf291e7..acb4a0d 100644
--- a/src/etc/testcases/types/filterset.xml
+++ b/src/etc/testcases/types/filterset.xml
@@ -20,34 +20,34 @@
<filter token="aaaa" value="1111"/>
<filter token="bbbb" value="2222"/>
</filterset>
-
+
<filterset id="testset.two" beginToken="%" endToken="^">
<filter token="cccc" value="3333"/>
<filter token="dddd" value="4444"/>
</filterset>
-
+
<target name="test1">
<delete file="dest1.txt"/>
<copy file="filterseta.txt" tofile="dest1.txt">
- <filterset refid="testset.one"/>
+ <filterset refid="testset.one"/>
</copy>
</target>
<target name="test2">
<delete file="dest2.txt"/>
<copy file="filtersetb.txt" tofile="dest2.txt">
- <filterset refid="testset.two"/>
+ <filterset refid="testset.two"/>
</copy>
</target>
<target name="test3">
<delete file="dest3.txt"/>
<copy file="filtersetc.txt" tofile="dest3.txt">
- <filterset refid="testset.one"/>
- <filterset refid="testset.two"/>
+ <filterset refid="testset.one"/>
+ <filterset refid="testset.two"/>
</copy>
</target>
-
+
<target name="test-nested-filtersets">
<filterset id="1">
<filter token="token1" value="value1"/>
@@ -68,15 +68,15 @@
<target name="testFiltersFileElement">
<copy file="filtersetd.txt" tofile="dest4.txt">
<filterset>
- <filtersfile file="filtersfile1" />
+ <filtersfile file="filtersfile1"/>
</filterset>
</copy>
<fail>
<condition>
<not>
<resourcesmatch asText="true">
- <file file="dest4.txt" />
- <string value="FOO BAR @baz@ @blah@" />
+ <file file="dest4.txt"/>
+ <string value="FOO BAR @baz@ @blah@"/>
</resourcesmatch>
</not>
</condition>
@@ -85,14 +85,14 @@
<target name="testFiltersFileAttribute">
<copy file="filtersetd.txt" tofile="dest5.txt">
- <filterset filtersfile="filtersfile1" />
+ <filterset filtersfile="filtersfile1"/>
</copy>
<fail>
<condition>
<not>
<resourcesmatch asText="true">
- <file file="dest5.txt" />
- <string value="FOO BAR @baz@ @blah@" />
+ <file file="dest5.txt"/>
+ <string value="FOO BAR @baz@ @blah@"/>
</resourcesmatch>
</not>
</condition>
@@ -102,15 +102,15 @@
<target name="testMultipleFiltersFiles">
<copy file="filtersetd.txt" tofile="dest6.txt">
<filterset filtersfile="filtersfile1">
- <filtersfile file="filtersfile2" />
+ <filtersfile file="filtersfile2"/>
</filterset>
</copy>
<fail>
<condition>
<not>
<resourcesmatch asText="true">
- <file file="dest6.txt" />
- <string value="FOO BAR BAZ @blah@" />
+ <file file="dest6.txt"/>
+ <string value="FOO BAR BAZ @blah@"/>
</resourcesmatch>
</not>
</condition>
@@ -119,19 +119,19 @@
<target name="testMissingFiltersFile">
<copy file="filtersetd.txt" tofile="dest7.txt">
- <filterset filtersfile="nonexistentfiltersfile" />
+ <filterset filtersfile="nonexistentfiltersfile"/>
</copy>
</target>
<target name="testAllowMissingFiltersFile">
<copy file="filtersetd.txt" tofile="dest8.txt">
<filterset filtersfile="nonexistentfiltersfile"
- onmissingfiltersfile="ignore" />
+ onmissingfiltersfile="ignore"/>
</copy>
<fail>
<condition>
<not>
- <filesmatch file1="filtersetd.txt" file2="dest8.txt" />
+ <filesmatch file1="filtersetd.txt" file2="dest8.txt"/>
</not>
</condition>
</fail>
@@ -139,7 +139,7 @@
<target name="cleanup">
<delete quiet="true">
- <fileset dir="." includes="dest?.txt" />
+ <fileset dir="." includes="dest?.txt"/>
</delete>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/types/flexinteger.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/types/flexinteger.xml b/src/etc/testcases/types/flexinteger.xml
index aa10aa0..35ad960 100644
--- a/src/etc/testcases/types/flexinteger.xml
+++ b/src/etc/testcases/types/flexinteger.xml
@@ -18,16 +18,15 @@
<project name="test" default="test" basedir=".">
<path id="testclasses">
- <pathelement location="../../../../build/testcases" />
- <pathelement path="${java.class.path}" />
+ <pathelement location="../../../../build/testcases"/>
+ <pathelement path="${java.class.path}"/>
</path>
<target name="test">
<taskdef name="flexint"
classname="org.apache.tools.ant.types.FlexIntegerTest"
- classpathref="testclasses"
- />
-
+ classpathref="testclasses"/>
+
<flexint propname="flexint.value1" value="0xA"/>
<flexint propname="flexint.value2" value="010"/>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/types/mapper.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/types/mapper.xml b/src/etc/testcases/types/mapper.xml
index a96f10c..5affffc 100644
--- a/src/etc/testcases/types/mapper.xml
+++ b/src/etc/testcases/types/mapper.xml
@@ -21,21 +21,21 @@
<import file="../buildfiletest-base.xml"/>
<target name="setUp">
- <mkdir dir="${output}" />
+ <mkdir dir="${output}"/>
</target>
<target name="test1" depends="setUp">
<union id="source.resourcecollection">
<fileset dir="../../../main">
- <include name="**/taskdefs/*.java" />
+ <include name="**/taskdefs/*.java"/>
</fileset>
<fileset dir="../../../tests/junit">
- <include name="**/taskdefs/*.java" />
+ <include name="**/taskdefs/*.java"/>
</fileset>
</union>
<copy todir="${output}">
<union refid="source.resourcecollection"/>
- <mapper type="flatten" />
+ <mapper type="flatten"/>
</copy>
<resourcecount property="sourcefiles.count">
<union refid="source.resourcecollection"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/types/mappers/define.mapperresult.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/types/mappers/define.mapperresult.xml b/src/etc/testcases/types/mappers/define.mapperresult.xml
index d9152a1..a14ba16 100644
--- a/src/etc/testcases/types/mappers/define.mapperresult.xml
+++ b/src/etc/testcases/types/mappers/define.mapperresult.xml
@@ -20,6 +20,6 @@
classpath="../../../../../build/testcases"
classname="org.apache.tools.ant.types.mappers.MapperResult"/>
- <!-- this is what you get with no result -->
- <property name="no-results" value="<NULL>" />
+ <!-- this is what you get with no result -->
+ <property name="no-results" value="<NULL>"/>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/types/mappers/globmapper.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/types/mappers/globmapper.xml b/src/etc/testcases/types/mappers/globmapper.xml
index 1666d81..1c4f29c 100644
--- a/src/etc/testcases/types/mappers/globmapper.xml
+++ b/src/etc/testcases/types/mappers/globmapper.xml
@@ -23,7 +23,7 @@
<globmapper from="d/e\*" to="*" handledirsep="yes"/>
</mapperresult>
</target>
-
+
<target name="ignore.case">
<mapperresult input="AbcDef.JaVa" output="bcDef.java.bak">
<globmapper from="a*.java" to="*.java.bak" casesensitive="no"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/types/mappers/scriptmapper.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/types/mappers/scriptmapper.xml b/src/etc/testcases/types/mappers/scriptmapper.xml
index d3e7a8d..27acfed 100644
--- a/src/etc/testcases/types/mappers/scriptmapper.xml
+++ b/src/etc/testcases/types/mappers/scriptmapper.xml
@@ -18,7 +18,7 @@
<project name="scriptmapper">
<import file="define.mapperresult.xml"/>
-
+
<target name="testSetSingle">
<mapperresult input="" output="a">
<scriptmapper language="javascript">
@@ -54,5 +54,5 @@
</scriptmapper>
</mapperresult>
</target>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/types/poly.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/types/poly.xml b/src/etc/testcases/types/poly.xml
index cabf9ec..adf2bca 100644
--- a/src/etc/testcases/types/poly.xml
+++ b/src/etc/testcases/types/poly.xml
@@ -16,23 +16,23 @@
limitations under the License.
-->
<project name="test" basedir=".">
-
+
<property name="c" value="org.apache.tools.ant.types.PolyTest"/>
-
+
<path id="test-c">
- <pathelement location="../../../../build/testcases" />
- <pathelement path="${java.class.path}" />
+ <pathelement location="../../../../build/testcases"/>
+ <pathelement path="${java.class.path}"/>
</path>
<target name="init">
- <typedef loaderref="poly" classpathref="test-c"
- name = "myfileset" classname="${c}$MyFileSet"/>
+ <typedef loaderref="poly" classpathref="test-c"
+ name="myfileset" classname="${c}$MyFileSet"/>
<typedef loaderref="poly" classpathref="test-c"
- name = "mypath" classname="${c}$MyPath"/>
+ name="mypath" classname="${c}$MyPath"/>
<typedef loaderref="poly" classpathref="test-c"
- name = "mytask" classname="${c}$MyTask"/>
+ name="mytask" classname="${c}$MyTask"/>
</target>
<target name="fileset" depends="init">
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/types/quote1.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/types/quote1.xml b/src/etc/testcases/types/quote1.xml
index 8e77122..cef576d 100644
--- a/src/etc/testcases/types/quote1.xml
+++ b/src/etc/testcases/types/quote1.xml
@@ -17,7 +17,7 @@
-->
<!-- I belong to:
- org.apache.tools.ant.types.XMLCatalogBuildFileTest.java
+ org.apache.tools.ant.types.XMLCatalogBuildFileTest.java
-->
<para>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/types/quote2.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/types/quote2.xml b/src/etc/testcases/types/quote2.xml
index ef9a3c3..8859d83 100644
--- a/src/etc/testcases/types/quote2.xml
+++ b/src/etc/testcases/types/quote2.xml
@@ -17,10 +17,9 @@
-->
<!-- I belong to:
- org.apache.tools.ant.types.XMLCatalogBuildFileTest.java
+ org.apache.tools.ant.types.XMLCatalogBuildFileTest.java
-->
<para>
No news is good news
</para>
-
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/types/redirector.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/types/redirector.xml b/src/etc/testcases/types/redirector.xml
index 4784e9f..077bd42 100644
--- a/src/etc/testcases/types/redirector.xml
+++ b/src/etc/testcases/types/redirector.xml
@@ -18,22 +18,22 @@
<project name="redirector" basedir=".">
<target name="test1" description="create ref">
- <redirector id="test1" output="out" />
+ <redirector id="test1" output="out"/>
</target>
<target name="test2" depends="test1" description="fail">
- <redirector refid="test1" output="out" />
+ <redirector refid="test1" output="out"/>
</target>
<target name="test3" depends="test1" description="fail">
<redirector refid="test1">
- <outputmapper type="flatten" />
+ <outputmapper type="flatten"/>
</redirector>
</target>
<target name="test4" depends="test1" description="pass">
<redirector>
- <outputmapper type="flatten" />
+ <outputmapper type="flatten"/>
</redirector>
</target>
@@ -42,36 +42,36 @@
testLogInputString can-cat
</echo>
<exec executable="cat">
- <redirector inputstring="foo" loginputstring="false" />
+ <redirector inputstring="foo" loginputstring="false"/>
</exec>
</target>
<target name="testRefid" depends="cat-check" if="can-cat">
<fail message="Property testRefid.out is already set!">
<condition>
- <isset property="testRefid.out" />
+ <isset property="testRefid.out"/>
</condition>
</fail>
- <redirector id="r" outputproperty="testRefid.out" inputstring="foo" />
+ <redirector id="r" outputproperty="testRefid.out" inputstring="foo"/>
<exec executable="cat">
- <redirector refid="r" />
+ <redirector refid="r"/>
</exec>
<fail>
<condition>
<not>
- <equals arg1="${testRefid.out}" arg2="foo" />
+ <equals arg1="${testRefid.out}" arg2="foo"/>
</not>
</condition>
</fail>
</target>
<target name="cat-check">
- <property environment="env" />
+ <property environment="env"/>
<condition property="can-cat">
<or>
- <available file="cat" filepath="${env.PATH}" property="can-cat" />
- <available file="cat.exe" filepath="${env.PATH}" property="can-cat" />
- <available file="cat.exe" filepath="${env.Path}" property="can-cat" />
+ <available file="cat" filepath="${env.PATH}" property="can-cat"/>
+ <available file="cat.exe" filepath="${env.PATH}" property="can-cat"/>
+ <available file="cat.exe" filepath="${env.Path}" property="can-cat"/>
</or>
</condition>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/types/resources/tarentry.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/types/resources/tarentry.xml b/src/etc/testcases/types/resources/tarentry.xml
index c0fa379..c4d60a7 100644
--- a/src/etc/testcases/types/resources/tarentry.xml
+++ b/src/etc/testcases/types/resources/tarentry.xml
@@ -27,7 +27,7 @@
</target>
<target name="uncompressSource" depends="setUp">
- <ant antfile="../../taskdefs/tar.xml" target="feather" />
+ <ant antfile="../../taskdefs/tar.xml" target="feather"/>
<copy todir="${output}">
<tarentry name="asf-logo.gif">
<gzipresource>
@@ -37,4 +37,4 @@
</copy>
</target>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/types/selectors.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/types/selectors.xml b/src/etc/testcases/types/selectors.xml
index 5a80d04..dcd65ee 100644
--- a/src/etc/testcases/types/selectors.xml
+++ b/src/etc/testcases/types/selectors.xml
@@ -34,31 +34,31 @@
value="${output}/selectortest2"/>
<target name="setupfiles">
- <mkdir dir="${test.dir}" />
- <mkdir dir="${test.dir}/zip" />
- <mkdir dir="${test.dir}/tar" />
- <mkdir dir="${test.dir}/tar/gz" />
- <mkdir dir="${test.dir}/tar/bz2" />
+ <mkdir dir="${test.dir}"/>
+ <mkdir dir="${test.dir}/zip"/>
+ <mkdir dir="${test.dir}/tar"/>
+ <mkdir dir="${test.dir}/tar/gz"/>
+ <mkdir dir="${test.dir}/tar/bz2"/>
<copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.md5"
- tofile="${test.dir}/asf-logo.gif.md5" />
+ tofile="${test.dir}/asf-logo.gif.md5"/>
<copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.bz2"
- tofile="${test.dir}/asf-logo.gif.bz2" />
+ tofile="${test.dir}/asf-logo.gif.bz2"/>
<copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.gz"
- tofile="${test.dir}/asf-logo.gif.gz" />
+ tofile="${test.dir}/asf-logo.gif.gz"/>
<copy file="${etc.dir}/taskdefs/expected/copy.filterset.filtered"
- tofile="${test.dir}/copy.filterset.filtered" />
+ tofile="${test.dir}/copy.filterset.filtered"/>
<copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.zip"
- tofile="${test.dir}/zip/asf-logo.gif.zip" />
+ tofile="${test.dir}/zip/asf-logo.gif.zip"/>
<copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.tar"
- tofile="${test.dir}/tar/asf-logo.gif.tar" />
+ tofile="${test.dir}/tar/asf-logo.gif.tar"/>
<copy file="${etc.dir}/taskdefs/expected/asf-logo-huge.tar.gz"
- tofile="${test.dir}/tar/asf-logo-huge.tar.gz" />
+ tofile="${test.dir}/tar/asf-logo-huge.tar.gz"/>
<copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.tar.gz"
- tofile="${test.dir}/tar/gz/asf-logo.gif.tar.gz" />
+ tofile="${test.dir}/tar/gz/asf-logo.gif.tar.gz"/>
<copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.tar.bz2"
- tofile="${test.dir}/tar/bz2/asf-logo.gif.tar.bz2" />
+ tofile="${test.dir}/tar/bz2/asf-logo.gif.tar.bz2"/>
<copy file="${etc.dir}/taskdefs/expected/asf-logo-huge.tar.bz2"
- tofile="${test.dir}/tar/bz2/asf-logo-huge.tar.bz2" />
+ tofile="${test.dir}/tar/bz2/asf-logo-huge.tar.bz2"/>
<!-- Make linefeeds consistent between platforms -->
<fixcrlf srcdir="${test.dir}" includes="*.filtered" eol="lf"/>
<!-- Set a known base time for all files -->
@@ -81,11 +81,11 @@
</target>
<target name="mirrorfiles">
- <mkdir dir="${mirror.dir}" />
- <mkdir dir="${mirror.dir}/zip" />
- <mkdir dir="${mirror.dir}/tar" />
- <mkdir dir="${mirror.dir}/tar/gz" />
- <mkdir dir="${mirror.dir}/tar/bz2" />
+ <mkdir dir="${mirror.dir}"/>
+ <mkdir dir="${mirror.dir}/zip"/>
+ <mkdir dir="${mirror.dir}/tar"/>
+ <mkdir dir="${mirror.dir}/tar/gz"/>
+ <mkdir dir="${mirror.dir}/tar/bz2"/>
<touch file="${mirror.dir}/asf-logo.gif.md5"/>
<touch file="${mirror.dir}/asf-logo.gif.bz2"/>
<touch file="${mirror.dir}/zip/asf-logo.gif.zip"/>
@@ -97,18 +97,18 @@
</target>
<target name="containsregexp">
- <mkdir dir="${testregexpsrc.dir}" />
- <mkdir dir="${testregexpdest.dir}" />
+ <mkdir dir="${testregexpsrc.dir}"/>
+ <mkdir dir="${testregexpdest.dir}"/>
<!-- Make two test files, shouldcopy.txt will get selected if everything works
shouldnotcopy.txt will not get selected for copy. The test looks to see
that only one file is copied
-->
- <echo message="Some testregexp text 2.0" file="${testregexpsrc.dir}/shouldcopy.txt" />
- <echo message="Some testregexp text 20" file="${testregexpsrc.dir}/shouldnotcopy.txt" />
+ <echo message="Some testregexp text 2.0" file="${testregexpsrc.dir}/shouldcopy.txt"/>
+ <echo message="Some testregexp text 20" file="${testregexpsrc.dir}/shouldnotcopy.txt"/>
<copy todir="${testregexpdest.dir}">
<fileset dir="${testregexpsrc.dir}">
- <include name="*.txt" />
- <containsregexp expression="[0-9]\.[0,1,2]" />
+ <include name="*.txt"/>
+ <containsregexp expression="[0-9]\.[0,1,2]"/>
</fileset>
</copy>
</target>
@@ -185,7 +185,7 @@
<copy todir="${test.dir}/to-1">
<fileset dir="${test.dir}/src">
<modified cache="propertyfile" algorithm="hashvalue" update="true">
- <param name="cache.cachefile" value="core.cache.properties" />
+ <param name="cache.cachefile" value="core.cache.properties"/>
</modified>
</fileset>
</copy>
@@ -193,7 +193,7 @@
<copy todir="${test.dir}/to-2">
<fileset dir="${test.dir}/src">
<modified cache="propertyfile" algorithm="hashvalue" update="true">
- <param name="cache.cachefile" value="core.cache.properties" />
+ <param name="cache.cachefile" value="core.cache.properties"/>
</modified>
</fileset>
</copy>
@@ -203,7 +203,7 @@
<copy todir="${test.dir}/to-3">
<fileset dir="${test.dir}/src">
<modified cache="propertyfile" algorithm="hashvalue" update="true">
- <param name="cache.cachefile" value="core.cache.properties" />
+ <param name="cache.cachefile" value="core.cache.properties"/>
</modified>
</fileset>
</copy>
@@ -214,9 +214,9 @@
<copy todir="${test.dir}/to-1">
<fileset dir="${test.dir}/src">
<custom classname="org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector">
- <param name="cache" value="propertyfile"/>
- <param name="algorithm" value="hashvalue"/>
- <param name="update" value="true"/>
+ <param name="cache" value="propertyfile"/>
+ <param name="algorithm" value="hashvalue"/>
+ <param name="update" value="true"/>
<param name="cache.cachefile" value="core.cache.properties"/>
</custom>
</fileset>
@@ -225,9 +225,9 @@
<copy todir="${test.dir}/to-2">
<fileset dir="${test.dir}/src">
<custom classname="org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector">
- <param name="cache" value="propertyfile"/>
- <param name="algorithm" value="hashvalue"/>
- <param name="update" value="true"/>
+ <param name="cache" value="propertyfile"/>
+ <param name="algorithm" value="hashvalue"/>
+ <param name="update" value="true"/>
<param name="cache.cachefile" value="core.cache.properties"/>
</custom>
</fileset>
@@ -238,9 +238,9 @@
<copy todir="${test.dir}/to-3">
<fileset dir="${test.dir}/src">
<custom classname="org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector">
- <param name="cache" value="propertyfile"/>
- <param name="algorithm" value="hashvalue"/>
- <param name="update" value="true"/>
+ <param name="cache" value="propertyfile"/>
+ <param name="algorithm" value="hashvalue"/>
+ <param name="update" value="true"/>
<param name="cache.cachefile" value="core.cache.properties"/>
</custom>
</fileset>
@@ -254,8 +254,7 @@
<modified
algorithmclass="${pkg.test}.MockAlgorithm"
cacheclass="${pkg.test}.MockCache"
- comparatorclass="${pkg.test}.MockComparator"
- >
+ comparatorclass="${pkg.test}.MockComparator">
<classpath>
<pathelement location="${build.tests.value}"/>
</classpath>
@@ -273,9 +272,9 @@
<resourcecount when="equal" count="3">
<restrict>
<resources>
- <file file="foo" />
- <resource name="foo" />
- <file file="foo" basedir="${basedir}" />
+ <file file="foo"/>
+ <resource name="foo"/>
+ <file file="foo" basedir="${basedir}"/>
</resources>
<modified selres="true" xmlns="antlib:org.apache.tools.ant.types.resources.selectors"/>
</restrict>
@@ -292,7 +291,7 @@
<resourcecount when="equal" count="1">
<restrict>
<resources>
- <resource name="notExisting" />
+ <resource name="notExisting"/>
</resources>
<modified selres="true" xmlns="antlib:org.apache.tools.ant.types.resources.selectors"/>
</restrict>
@@ -309,7 +308,7 @@
<resourcecount when="equal" count="0">
<restrict>
<resources>
- <resource name="notExisting" />
+ <resource name="notExisting"/>
</resources>
<modified selres="false" xmlns="antlib:org.apache.tools.ant.types.resources.selectors"/>
</restrict>
@@ -337,7 +336,7 @@
</resourcecount>
</not>
</condition>
- </fail>
+ </fail>
</sequential>
</macrodef>
<!-- select first time and create cachefile -->
@@ -351,6 +350,6 @@
<!-- copy third time: only the files with new CONTENT should be copied -->
<check count="2" message="Didnt select the 2 modified files."/>
- </target>
+ </target>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/types/selectors/scriptselector.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/types/selectors/scriptselector.xml b/src/etc/testcases/types/selectors/scriptselector.xml
index 80afe30..2405e33 100644
--- a/src/etc/testcases/types/selectors/scriptselector.xml
+++ b/src/etc/testcases/types/selectors/scriptselector.xml
@@ -17,8 +17,8 @@
-->
<project name="scriptselector" default="def" basedir=".">
- <property name="src.file" location="${ant.file}" />
-
+ <property name="src.file" location="${ant.file}"/>
+
<macrodef name="testselected">
<element name="selector" implicit="yes" optional="true"/>
<attribute name="message"/>
@@ -33,8 +33,8 @@
</condition>
</fail>
</sequential>
- </macrodef>
-
+ </macrodef>
+
<macrodef name="testnoselected">
<element name="selector" implicit="yes" optional="true"/>
<attribute name="message"/>
@@ -47,18 +47,18 @@
</condition>
</fail>
</sequential>
- </macrodef>
+ </macrodef>
<!-- this is here to test the macro is well coded -->
<target name="testNoSelector">
- <testselected message="testNoSelector" >
+ <testselected message="testNoSelector">
</testselected>
</target>
<target name="testNolanguage">
- <testselected message="testNolanguage" >
+ <testselected message="testNolanguage">
<selector>
- <scriptselector >
+ <scriptselector>
self.setSelected(true);
</scriptselector>
</selector>
@@ -66,7 +66,7 @@
</target>
<target name="testSelectionSetByDefault">
- <testselected message="testSelectionSetByDefault" >
+ <testselected message="testSelectionSetByDefault">
<selector>
<scriptselector language="javascript">
</scriptselector>
@@ -76,7 +76,7 @@
<target name="testSelectionSetWorks">
- <testselected message="testSelectionSetWorks" >
+ <testselected message="testSelectionSetWorks">
<selector>
<scriptselector language="javascript">
self.setSelected(false);
@@ -95,29 +95,29 @@
</selector>
</testnoselected>
</target>
-
+
<target name="testFileAttribute">
- <testselected message="testFileAttribute" >
+ <testselected message="testFileAttribute">
<selector>
<scriptselector language="javascript">
self.setSelected(file.equals(self.getFile()));
</scriptselector>
</selector>
</testselected>
- </target>
+ </target>
<target name="testFilenameAttribute">
- <testselected message="testFilenameAttribute" >
+ <testselected message="testFilenameAttribute">
<selector>
<scriptselector language="javascript">
self.setSelected(filename.equals(self.getFilename()));
</scriptselector>
</selector>
</testselected>
- </target>
-
+ </target>
+
<target name="testBasedirAttribute">
- <testselected message="testBasedirAttribute" >
+ <testselected message="testBasedirAttribute">
<selector>
<scriptselector language="javascript">
self.setSelected(basedir.equals(self.getBasedir()));
@@ -125,14 +125,14 @@
</selector>
</testselected>
</target>
-
+
<target name="notestFilenameLength">
- <testselected message="notestFilenameLength" >
+ <testselected message="notestFilenameLength">
<selector>
<scriptselector language="javascript">
self.setSelected((filename.length%2)==0);
</scriptselector>
</selector>
</testselected>
- </target>
+ </target>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/7df9120e/src/etc/testcases/types/selectors/signedselector.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/types/selectors/signedselector.xml b/src/etc/testcases/types/selectors/signedselector.xml
index 60fe940..ea611e8 100644
--- a/src/etc/testcases/types/selectors/signedselector.xml
+++ b/src/etc/testcases/types/selectors/signedselector.xml
@@ -31,7 +31,7 @@
</macrodef>
<property name="issigned.dir" location="../../taskdefs/conditions/jars"/>
-
+
<target name="selectsigned">
<pass failmessage="apassword.jar should be a signed file">
<isfileselected file="${issigned.dir}/apassword.jar">