diff --git a/WHATSNEW b/WHATSNEW
index b950a35bc..5233a0a09 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -48,7 +48,7 @@ Fixed bugs:
  * <cab> died with a NullPointerException since Ant 1.10.2.
    Bugzilla Report 62335
 
- * The <depend> task would fail with 
+ * The <depend> task would fail with
    "java.lang.ClassFormatError: Invalid Constant Pool entry Type 19" while
    parsing a module-info.class. The task is compatible with
    Java bytecode version 53 now.
diff --git a/src/etc/ant-update.xsl b/src/etc/ant-update.xsl
index c81a39f87..e013c13e7 100644
--- a/src/etc/ant-update.xsl
+++ b/src/etc/ant-update.xsl
@@ -17,21 +17,21 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  -->
- 
+
 <!--
 
   The purpose have this XSL is to provide a fast way to update a buildfile
   from deprecated tasks.
-  
+
   It should particularly be useful when there is a lot of build files to migrate.
   If you do not want to migrate to a particular task and want to keep it for
   various reason, just comment the appropriate template.
-  
+
   !!!! Use at your own risk. !!!!
-  
+
 -->
- 
- 
+
+
   <!-- (zip|jar|war|ear)file attributes are replaced by destfile in their respective task -->
   <xsl:template match="zip">
     <zip destfile="{@zipfile}">
@@ -53,8 +53,8 @@
       <xsl:apply-templates select="@*[not(name()='earfile')]|node()"/>
     </ear>
   </xsl:template>
-   
- 
+
+
   <!-- copydir is replaced by copy -->
   <xsl:template match="copydir">
     <copy todir="{@dest}">
@@ -113,5 +113,5 @@
       <xsl:apply-templates select="@*|node()"/>
     </xsl:copy>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/src/etc/changelog.xsl b/src/etc/changelog.xsl
index c6aef8fde..b6fc9b91e 100644
--- a/src/etc/changelog.xsl
+++ b/src/etc/changelog.xsl
@@ -19,7 +19,7 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-   
+
 -->
   <xsl:param name="title"/>
   <xsl:param name="module"/>
@@ -79,18 +79,18 @@
         <p style="text-align: right">Designed for use with <a href="http://ant.apache.org/">Apache Ant</a>.</p>
         <hr/>
         <table border="0" width="100%" cellspacing="1">
-          
+
           <xsl:apply-templates select=".//entry">
             <xsl:sort select="date" data-type="text" order="descending"/>
             <xsl:sort select="time" data-type="text" order="descending"/>
           </xsl:apply-templates>
-          
+
         </table>
-        
+
       </body>
     </html>
   </xsl:template>
-  
+
   <xsl:template match="entry">
     <tr>
       <td class="dateAndAuthor">
@@ -129,13 +129,13 @@
       <a>
         <xsl:choose>
           <xsl:when test="string-length(prevrevision) = 0 ">
-            <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?rev=<xsl:value-of select="revision" />&amp;content-type=text/x-cvsweb-markup</xsl:attribute>
+            <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module"/>/<xsl:value-of select="name"/>?rev=<xsl:value-of select="revision"/>&amp;content-type=text/x-cvsweb-markup</xsl:attribute>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?r1=<xsl:value-of select="revision" />&amp;r2=<xsl:value-of select="prevrevision"/></xsl:attribute>
+            <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module"/>/<xsl:value-of select="name"/>?r1=<xsl:value-of select="revision"/>&amp;r2=<xsl:value-of select="prevrevision"/></xsl:attribute>
           </xsl:otherwise>
         </xsl:choose>
-        <xsl:value-of select="name" /> (<xsl:value-of select="revision"/>)</a>
+        <xsl:value-of select="name"/> (<xsl:value-of select="revision"/>)</a>
     </li>
   </xsl:template>
 
@@ -144,5 +144,5 @@
   <xsl:template match="msg">
     <xsl:apply-templates/>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl b/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl
index 060f87885..c39c13a18 100644
--- a/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl
+++ b/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl
@@ -22,7 +22,7 @@
 -->
 
     <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-    <xsl:decimal-format decimal-separator="." grouping-separator="," />
+    <xsl:decimal-format decimal-separator="." grouping-separator=","/>
 
     <xsl:param name="output.dir" select="'.'"/>
     <xsl:param name="basedir" select="'.'"/>
@@ -76,7 +76,7 @@
 
 
     <!--
-    Key for detecting duplicate CheckModules 
+    Key for detecting duplicate CheckModules
     -->
     <xsl:key name="module" match="file/error" use="@source"/>
 
@@ -84,7 +84,7 @@
 
     <!--
     Generates the navagation bar.
-    --> 
+    -->
     <xsl:template match="checkstyle" mode="navigation">
         <ul id="navigation">
             <xsl:for-each select="file/error[generate-id() = generate-id(key('module',@source))]">
@@ -100,13 +100,13 @@
                 </a></li>
             </xsl:for-each>
         </ul>
-    </xsl:template> 
+    </xsl:template>
 
 
 
     <!--
     Generates the data part.
-    --> 
+    -->
     <xsl:template match="checkstyle" mode="data">
         <div id="content">
             <xsl:for-each select="file/error[generate-id() = generate-id(key('module',@source))]">
@@ -120,13 +120,13 @@
                 </div>
             </xsl:for-each>
         </div>
-    </xsl:template> 
+    </xsl:template>
 
 
 
     <!--
     Generates the content table for the given check module.
-    @param filter full qualified module name 
+    @param filter full qualified module name
     -->
     <xsl:template name="data">
         <xsl:param name="filter"/>
@@ -157,7 +157,7 @@
     Generates the data rows for the current check module.
     Ignores errors in the current file from other modules.
     @param node the file with the errors
-    @param filter full qualified module name 
+    @param filter full qualified module name
     -->
     <xsl:template name="data-rows">
         <xsl:param name="node"/>
@@ -180,68 +180,68 @@
 
 
 
-    <!-- 
+    <!--
     Generates the CSS with the layout instructions.
     Generated so this XSL is the single source of the whole report.
     -->
     <xsl:template name="sorted.css">
-        body { 
+        body {
           font:normal 80% arial,helvetica,sanserif;
-          color: black; 
-          background-color: white; 
-          margin: 0; 
-          padding: 1em; 
+          color: black;
+          background-color: white;
+          margin: 0;
+          padding: 1em;
           min-width: 41em;
-        } 
-        h1 { 
+        }
+        h1 {
           font-weight:bold;
           font-size:140%;
-          margin: 0 0 0.7em; 
-          padding: 0.3em; 
-          text-align: center; 
-          background-color: #eee; 
-          border: 2px ridge silver; 
-        } 
-        html<xsl:text disable-output-escaping="yes">&gt;</xsl:text>body h1 { 
+          margin: 0 0 0.7em;
+          padding: 0.3em;
+          text-align: center;
+          background-color: #eee;
+          border: 2px ridge silver;
+        }
+        html<xsl:text disable-output-escaping="yes">&gt;</xsl:text>body h1 {
           border-color: gray;
-        } 
-
-        ul#navigation { 
-          font-size: 0.83em; 
-          float: left; width: 18em; 
-          margin: 0 0 1.2em; padding: 0; 
-          border: 1px dashed silver; 
-        } 
-        ul#navigation li { 
-          list-style: none; 
-          margin: 0; padding: 0.2em; 
-        } 
-        ul#navigation a { 
-          display: block; 
-          padding: 0.2em; 
-          font-weight: bold; 
-        } 
-        ul#navigation a:link { 
-          color: black; background-color: #eee; 
-        } 
-        ul#navigation a:visited { 
-          color: #666; background-color: #eee; 
-        } 
-        ul#navigation a:hover { 
-          color: red; background-color: white; 
-        } 
-        ul#navigation a:active { 
-          color: white; background-color: gray; 
         }
 
-        div#content { 
-          margin: 0 1em 1em 16em; 
-          padding: 0 1em; 
-        } 
-        * html div#content { 
-          height: 1em;  /* Workaround 3-Pixel-Bug of Internet Explorers */ 
-        } 
-        div#content h2 { 
+        ul#navigation {
+          font-size: 0.83em;
+          float: left; width: 18em;
+          margin: 0 0 1.2em; padding: 0;
+          border: 1px dashed silver;
+        }
+        ul#navigation li {
+          list-style: none;
+          margin: 0; padding: 0.2em;
+        }
+        ul#navigation a {
+          display: block;
+          padding: 0.2em;
+          font-weight: bold;
+        }
+        ul#navigation a:link {
+          color: black; background-color: #eee;
+        }
+        ul#navigation a:visited {
+          color: #666; background-color: #eee;
+        }
+        ul#navigation a:hover {
+          color: red; background-color: white;
+        }
+        ul#navigation a:active {
+          color: white; background-color: gray;
+        }
+
+        div#content {
+          margin: 0 1em 1em 16em;
+          padding: 0 1em;
+        }
+        * html div#content {
+          height: 1em;  /* Workaround 3-Pixel-Bug of Internet Explorers */
+        }
+        div#content h2 {
           font-size:100%;
           font-weight:bold;
           background: #525D76;
@@ -251,11 +251,11 @@
           margin-right: 2px;
           margin-left: 2px;
           margin-bottom: 0;
-        } 
-        div#content p { 
-          font-size: 1em; 
-          margin: 1em 0; 
-        } 
+        }
+        div#content p {
+          font-size: 1em;
+          margin: 1em 0;
+        }
         table {
           width:100%;
           border-collapse:collapse;
@@ -275,55 +275,55 @@
         table tr:nth-child(even) td {
           background: #fff;
         }
-    </xsl:template> 
+    </xsl:template>
 
 
 
-    <!-- 
-    Generates the JavaScript for the dynamic style. 
+    <!--
+    Generates the JavaScript for the dynamic style.
     Generated so this XSL is the single source of the whole report.
     -->
     <xsl:template name="switch.js">
-        /* 
+        /*
          * Hides all "hideable" div-containers
          */
         function hideAll() {
           allElements = document.getElementsByTagName("div");
-          for (i = 0; i <xsl:text disable-output-escaping="yes">&lt;</xsl:text> allElements.length; i++) { 
-            if (allElements[i].className=="hideable") { 
-              allElements[i].style.display="none"; 
-            } 
-          } 
-          return; 
-        } 
-
-        /* 
+          for (i = 0; i <xsl:text disable-output-escaping="yes">&lt;</xsl:text> allElements.length; i++) {
+            if (allElements[i].className=="hideable") {
+              allElements[i].style.display="none";
+            }
+          }
+          return;
+        }
+
+        /*
          * Shows one div-container and hides the other.
          * @param id id of the element to show
          */
-        function change(id) { 
-          hideAll(); 
-          e = document.getElementById(id); 
-          if (e.style.display=="none") { 
-            e.style.display=""; 
-          } 
-          window.scrollTo(0, 0); 
-          return; 
-        } 
-
-        /* 
+        function change(id) {
+          hideAll();
+          e = document.getElementById(id);
+          if (e.style.display=="none") {
+            e.style.display="";
+          }
+          window.scrollTo(0, 0);
+          return;
+        }
+
+        /*
          * Shows only the first data row.
          * Used in body:onload so the user could directly see some messages.
          */
         function openFirst() {
           hideAll();
-          for (i = 0; i <xsl:text disable-output-escaping="yes">&lt;</xsl:text> allElements.length; i++) { 
-            if (allElements[i].className=="hideable") { 
+          for (i = 0; i <xsl:text disable-output-escaping="yes">&lt;</xsl:text> allElements.length; i++) {
+            if (allElements[i].className=="hideable") {
               allElements[i].style.display="";
-              return; 
-            } 
-          } 
-          return; 
+              return;
+            }
+          }
+          return;
         }
     </xsl:template>
 
diff --git a/src/etc/checkstyle/checkstyle-frames.xsl b/src/etc/checkstyle/checkstyle-frames.xsl
index c79c0b7b1..0a76bfdfe 100644
--- a/src/etc/checkstyle/checkstyle-frames.xsl
+++ b/src/etc/checkstyle/checkstyle-frames.xsl
@@ -22,7 +22,7 @@
 -->
 
     <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-    <xsl:decimal-format decimal-separator="." grouping-separator="," />
+    <xsl:decimal-format decimal-separator="." grouping-separator=","/>
 
     <xsl:param name="output.dir" select="'.'"/>
     <xsl:param name="basedir" select="'.'"/>
@@ -229,7 +229,7 @@
         <!-- Convert a windows path '\' to a unix path '/' for further processing. -->
         <xsl:variable name="path2" select="translate($path,'\','/')"/>
 
-        
+
         <xsl:if test="contains($path2,'/')">
             <xsl:text>../</xsl:text>
             <xsl:call-template name="path">
@@ -296,4 +296,4 @@
             <xsl:if test="position() mod 2 = 0">evenrow</xsl:if>
         </xsl:attribute>
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/src/etc/checkstyle/checkstyle-text.xsl b/src/etc/checkstyle/checkstyle-text.xsl
index 7359e4160..7a2f08ca5 100644
--- a/src/etc/checkstyle/checkstyle-text.xsl
+++ b/src/etc/checkstyle/checkstyle-text.xsl
@@ -31,4 +31,3 @@
         <xsl:value-of select="@message"/>
     </xsl:template>
 </xsl:stylesheet>
-
diff --git a/src/etc/checkstyle/checkstyle-xdoc.xsl b/src/etc/checkstyle/checkstyle-xdoc.xsl
index 5fc6eab38..76a86e241 100644
--- a/src/etc/checkstyle/checkstyle-xdoc.xsl
+++ b/src/etc/checkstyle/checkstyle-xdoc.xsl
@@ -22,7 +22,7 @@
 -->
 
     <xsl:output method="xml" indent="yes"/>
-    <xsl:decimal-format decimal-separator="." grouping-separator="," />
+    <xsl:decimal-format decimal-separator="." grouping-separator=","/>
 
     <xsl:param name="output.dir" select="'.'"/>
     <xsl:param name="basedir" select="'.'"/>
@@ -127,4 +127,3 @@
         </xsl:attribute>
     </xsl:template>
 </xsl:stylesheet>
-
diff --git a/src/etc/common2master.xsl b/src/etc/common2master.xsl
index da1527e97..b4c22ba5b 100644
--- a/src/etc/common2master.xsl
+++ b/src/etc/common2master.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- 
+<!--
 	This stylesheet can be used to generate a master buildfile from a common
 	buildfile (see manual for <subant>).
-	Foreach <target> in the common buildfile it generates a corresponding 
+	Foreach <target> in the common buildfile it generates a corresponding
 	target in the master buildfile for iterating over that target.
 -->
 <xsl:stylesheet
@@ -38,7 +38,7 @@
 
 <xsl:template match="project">
 <![CDATA[
-<project name="master"> 
+<project name="master">
 
     <macrodef name="iterate">
         <attribute name="target"/>
@@ -49,9 +49,9 @@
         </sequential>
     </macrodef>
 ]]>
-   
+
     <xsl:apply-templates/>
-    
+
 <![CDATA[
 </project>
 ]]>
@@ -70,4 +70,3 @@
 
 
 </xsl:stylesheet>
-
diff --git a/src/etc/coverage-frames.xsl b/src/etc/coverage-frames.xsl
index 9603597e8..a02f5437a 100644
--- a/src/etc/coverage-frames.xsl
+++ b/src/etc/coverage-frames.xsl
@@ -4,7 +4,7 @@
     xmlns:redirect="org.apache.xalan.lib.Redirect"
     extension-element-prefixes="redirect">
 <xsl:output method="html" indent="yes"/>
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
+<xsl:decimal-format decimal-separator="." grouping-separator=","/>
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
diff --git a/src/etc/jdepend-frames.xsl b/src/etc/jdepend-frames.xsl
index 802873450..a9bb68d73 100644
--- a/src/etc/jdepend-frames.xsl
+++ b/src/etc/jdepend-frames.xsl
@@ -19,7 +19,7 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-   
+
 -->
 <!--
 
diff --git a/src/etc/jdepend.xsl b/src/etc/jdepend.xsl
index f8132975f..907ade255 100644
--- a/src/etc/jdepend.xsl
+++ b/src/etc/jdepend.xsl
@@ -24,7 +24,7 @@
     <html>
     <head>
         <title>JDepend Analysis</title>
-        
+
     <style type="text/css">
       body {
         font:normal 68% verdana,arial,helvetica;
@@ -41,7 +41,7 @@
       table.details tr td{
         background:#eeeee0;
       }
-      
+
       p {
         line-height:1.5em;
         margin-top:0.5em; margin-bottom:1.0em;
@@ -76,8 +76,8 @@
         text-align:right;
       }
       </style>
-        
-        
+
+
     </head>
     <body>
     <!--h1>JDepend Report</h1>
@@ -87,11 +87,11 @@
         <li><xsl:value-of select="@name"/></li>
     </xsl:for-each>
     </ul-->
-    
+
     <h1><a name="top">JDepend Analysis</a></h1>
-    <p align="right">Designed for use with <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="http://jakarta.apache.org">Ant</a>.</p>
-    <hr size="2" />
-    
+    <p align="right">Designed for use with <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="https://ant.apache.org">Ant</a>.</p>
+    <hr size="2"/>
+
     <table width="100%"><tr><td>
     <a name="NVsummary"><h2>Summary</h2></a>
     </td><td align="right">
@@ -100,7 +100,7 @@
     [<a href="#NVcycles">cycles</a>]
     [<a href="#NVexplanations">explanations</a>]
     </td></tr></table>
-    
+
     <table width="100%" class="details">
         <tr>
             <th>Package</th>
@@ -112,7 +112,7 @@
             <th><a href="#EXabstractness">Abstractness</a></th>
             <th><a href="#EXinstability">Instability</a></th>
             <th><a href="#EXdistance">Distance</a></th>
-            
+
         </tr>
     <xsl:for-each select="./Packages/Package">
         <xsl:if test="count(error) = 0">
@@ -132,7 +132,7 @@
                 <td align="right"><xsl:value-of select="Stats/A"/></td>
                 <td align="right"><xsl:value-of select="Stats/I"/></td>
                 <td align="right"><xsl:value-of select="Stats/D"/></td>
-                
+
 
             </tr>
         </xsl:if>
@@ -148,7 +148,7 @@
         </xsl:if>
     </xsl:for-each>
     </table>
-    
+
     <table width="100%"><tr><td>
     <a name="NVpackages"><h2>Packages</h2></a>
     </td><td align="right">
@@ -157,12 +157,12 @@
     [<a href="#NVcycles">cycles</a>]
     [<a href="#NVexplanations">explanations</a>]
     </td></tr></table>
-    
+
     <xsl:for-each select="./Packages/Package">
         <xsl:if test="count(error) = 0">
             <h3><a><xsl:attribute name="name">PK<xsl:value-of select="@name"/></xsl:attribute>
             <xsl:value-of select="@name"/></a></h3>
-            
+
             <table width="100%"><tr>
                 <td><a href="#EXafferent">Afferent Couplings</a>: <xsl:value-of select="Stats/Ca"/></td>
                 <td><a href="#EXefferent">Efferent Couplings</a>: <xsl:value-of select="Stats/Ce"/></td>
@@ -170,7 +170,7 @@
                 <td><a href="#EXinstability">Instability</a>: <xsl:value-of select="Stats/I"/></td>
                 <td><a href="#EXdistance">Distance</a>: <xsl:value-of select="Stats/D"/></td>
             </tr></table>
-            
+
             <table width="100%" class="details">
                 <tr>
                     <th>Abstract Classes</th>
@@ -221,7 +221,7 @@
             </table>
         </xsl:if>
     </xsl:for-each>
-    
+
     <table width="100%"><tr><td>
     <a name="NVcycles"><h2>Cycles</h2></a>
     </td><td align="right">
@@ -230,7 +230,7 @@
     [<a href="#NVcycles">cycles</a>]
     [<a href="#NVexplanations">explanations</a>]
     </td></tr></table>
-    
+
     <xsl:if test="count(Cycles/Package) = 0">
         <p>There are no cyclic dependancies.</p>
     </xsl:if>
@@ -240,7 +240,7 @@
             <xsl:value-of select="."/><br/>
         </xsl:for-each></p>
     </xsl:for-each>
-    
+
     <table width="100%"><tr><td>
     <a name="NVexplanations"><h2>Explanations</h2></a>
     </td><td align="right">
@@ -249,16 +249,16 @@
     [<a href="#NVcycles">cycles</a>]
     [<a href="#NVexplanations">explanations</a>]
     </td></tr></table>
-    
+
     <p>The following explanations are for quick reference and are lifted directly from the original <a href="http://www.clarkware.com/software/JDepend.html">JDepend documentation</a>.</p>
-    
+
     <h3><a name="EXnumber">Number of Classes</a></h3>
         <p>The number of concrete and abstract classes (and interfaces) in the package is an indicator of the extensibility of the package.</p>
     <h3><a name="EXafferent">Afferent Couplings</a></h3>
         <p>The number of other packages that depend upon classes within the package is an indicator of the package's responsibility. </p>
     <h3><a name="EXefferent">Efferent Couplings</a></h3>
         <p>The number of other packages that the classes in the package depend upon is an indicator of the package's independence. </p>
-    <h3><a name="EXabstractness">Abstractness</a></h3> 
+    <h3><a name="EXabstractness">Abstractness</a></h3>
         <p>The ratio of the number of abstract classes (and interfaces) in the analyzed package to the total number of classes in the analyzed package. </p>
         <p>The range for this metric is 0 to 1, with A=0 indicating a completely concrete package and A=1 indicating a completely abstract package. </p>
     <h3><a name="EXinstability">Instability</a></h3>
@@ -268,7 +268,7 @@
         <p>The perpendicular distance of a package from the idealized line A + I = 1. This metric is an indicator of the package's balance between abstractness and stability. </p>
         <p>A package squarely on the main sequence is optimally balanced with respect to its abstractness and stability. Ideal packages are either completely abstract and stable (x=0, y=1) or completely concrete and instable (x=1, y=0). </p>
         <p>The range for this metric is 0 to 1, with D=0 indicating a package that is coincident with the main sequence and D=1 indicating a package that is as far from the main sequence as possible. </p>
-    
+
     </body>
     </html>
 </xsl:template>
diff --git a/src/etc/junit-frames-saxon.xsl b/src/etc/junit-frames-saxon.xsl
index 233352f41..c984ac8a7 100644
--- a/src/etc/junit-frames-saxon.xsl
+++ b/src/etc/junit-frames-saxon.xsl
@@ -592,7 +592,7 @@
                 <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
                 <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
                 <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
-                <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)" />
+                <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)"/>
                 <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
                 <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
                 <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
@@ -615,7 +615,7 @@
                         <td><a title="Display all tests" href="all-tests.html"><xsl:value-of select="$testCount"/></a></td>
                         <td><a title="Display all failures" href="alltests-fails.html"><xsl:value-of select="$failureCount"/></a></td>
                         <td><a title="Display all errors" href="alltests-errors.html"><xsl:value-of select="$errorCount"/></a></td>
-                        <td><a title="Display all skipped test" href="alltests-skipped.html"><xsl:value-of select="$skippedCount" /></a></td>
+                        <td><a title="Display all skipped test" href="alltests-skipped.html"><xsl:value-of select="$skippedCount"/></a></td>
                         <td>
                             <xsl:call-template name="display-percent">
                                 <xsl:with-param name="value" select="$successRate"/>
@@ -659,7 +659,7 @@
                             <td><xsl:value-of select="sum($insamepackage/@tests)"/></td>
                             <td><xsl:value-of select="sum($insamepackage/@errors)"/></td>
                             <td><xsl:value-of select="sum($insamepackage/@failures)"/></td>
-                            <td><xsl:value-of select="sum($insamepackage/@skipped)" /></td>
+                            <td><xsl:value-of select="sum($insamepackage/@skipped)"/></td>
                             <td>
                                 <xsl:call-template name="display-time">
                                     <xsl:with-param name="value" select="sum($insamepackage/@time)"/>
diff --git a/src/etc/junit-frames-xalan1.xsl b/src/etc/junit-frames-xalan1.xsl
index fbc28e133..f8035e72f 100644
--- a/src/etc/junit-frames-xalan1.xsl
+++ b/src/etc/junit-frames-xalan1.xsl
@@ -466,7 +466,7 @@ h6 {
             <td><xsl:value-of select="$testCount"/></td>
             <td><xsl:value-of select="$failureCount"/></td>
             <td><xsl:value-of select="$errorCount"/></td>
-            <td><xsl:value-of select="$skipCount" /></td>
+            <td><xsl:value-of select="$skipCount"/></td>
             <td>
                 <xsl:call-template name="display-percent">
                     <xsl:with-param name="value" select="$successRate"/>
@@ -510,7 +510,7 @@ h6 {
                     <td><xsl:value-of select="sum($insamepackage/@tests)"/></td>
                     <td><xsl:value-of select="sum($insamepackage/@errors)"/></td>
                     <td><xsl:value-of select="sum($insamepackage/@failures)"/></td>
-                    <td><xsl:value-of select="sum($insamepackage/@skipped)" /></td>
+                    <td><xsl:value-of select="sum($insamepackage/@skipped)"/></td>
                     <td>
                     <xsl:call-template name="display-time">
                         <xsl:with-param name="value" select="sum($insamepackage/@time)"/>
@@ -637,7 +637,7 @@ h6 {
         <td><xsl:apply-templates select="@tests"/></td>
         <td><xsl:apply-templates select="@errors"/></td>
         <td><xsl:apply-templates select="@failures"/></td>
-        <td><xsl:apply-templates select="@skipped" /></td>
+        <td><xsl:apply-templates select="@skipped"/></td>
         <td><xsl:call-template name="display-time">
                 <xsl:with-param name="value" select="@time"/>
             </xsl:call-template>
diff --git a/src/etc/junit-frames.xsl b/src/etc/junit-frames.xsl
index 49fc6671d..cdbb66963 100644
--- a/src/etc/junit-frames.xsl
+++ b/src/etc/junit-frames.xsl
@@ -79,7 +79,7 @@
         <xsl:with-param name="type" select="'errors'"/>
       </xsl:apply-templates>
     </redirect:write>
-    
+
     <!-- create the alltests-skipped.html at the root -->
     <redirect:write file="{$output.dir}/alltests-skipped.html">
       <xsl:apply-templates select="." mode="all.tests">
@@ -593,7 +593,7 @@ h6 {
         <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
         <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
         <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
-        <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)" />
+        <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)"/>
         <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
         <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
         <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
@@ -616,7 +616,7 @@ h6 {
             <td><a title="Display all tests" href="all-tests.html"><xsl:value-of select="$testCount"/></a></td>
             <td><a title="Display all failures" href="alltests-fails.html"><xsl:value-of select="$failureCount"/></a></td>
             <td><a title="Display all errors" href="alltests-errors.html"><xsl:value-of select="$errorCount"/></a></td>
-            <td><a title="Display all skipped test" href="alltests-skipped.html"><xsl:value-of select="$skippedCount" /></a></td>
+            <td><a title="Display all skipped test" href="alltests-skipped.html"><xsl:value-of select="$skippedCount"/></a></td>
             <td>
                 <xsl:call-template name="display-percent">
                     <xsl:with-param name="value" select="$successRate"/>
@@ -660,7 +660,7 @@ h6 {
                     <td><xsl:value-of select="sum($insamepackage/@tests)"/></td>
                     <td><xsl:value-of select="sum($insamepackage/@errors)"/></td>
                     <td><xsl:value-of select="sum($insamepackage/@failures)"/></td>
-                    <td><xsl:value-of select="sum($insamepackage/@skipped)" /></td>
+                    <td><xsl:value-of select="sum($insamepackage/@skipped)"/></td>
                     <td>
                     <xsl:call-template name="display-time">
                         <xsl:with-param name="value" select="sum($insamepackage/@time)"/>
diff --git a/src/etc/junit-noframes-saxon.xsl b/src/etc/junit-noframes-saxon.xsl
index fd1d3c98e..ca9acb921 100644
--- a/src/etc/junit-noframes-saxon.xsl
+++ b/src/etc/junit-noframes-saxon.xsl
@@ -4,8 +4,8 @@
     exclude-result-prefixes="xs"
     version="2.0">
 <xsl:output method="html" indent="yes" encoding="UTF-8"
-  doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
+  doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/>
+<xsl:decimal-format decimal-separator="." grouping-separator=","/>
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -165,7 +165,7 @@
                 <xsl:variable name="testCount" select="sum($testsuites-in-package/@tests)"/>
                 <xsl:variable name="errorCount" select="sum($testsuites-in-package/@errors)"/>
                 <xsl:variable name="failureCount" select="sum($testsuites-in-package/@failures)"/>
-                <xsl:variable name="skippedCount" select="sum($testsuites-in-package/@skipped)" />
+                <xsl:variable name="skippedCount" select="sum($testsuites-in-package/@skipped)"/>
                 <xsl:variable name="timeCount" select="sum($testsuites-in-package/@time)"/>
 
                 <!-- write a summary for the package -->
@@ -181,7 +181,7 @@
                     <td><xsl:value-of select="$testCount"/></td>
                     <td><xsl:value-of select="$errorCount"/></td>
                     <td><xsl:value-of select="$failureCount"/></td>
-                    <td><xsl:value-of select="$skippedCount" /></td>
+                    <td><xsl:value-of select="$skippedCount"/></td>
                     <td>
                     <xsl:call-template name="display-time">
                         <xsl:with-param name="value" select="$timeCount"/>
@@ -256,7 +256,7 @@
         <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
         <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
         <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
-        <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)" />
+        <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)"/>
         <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
         <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
         <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
@@ -278,7 +278,7 @@
             <td><xsl:value-of select="$testCount"/></td>
             <td><xsl:value-of select="$failureCount"/></td>
             <td><xsl:value-of select="$errorCount"/></td>
-            <td><xsl:value-of select="$skippedCount" /></td>
+            <td><xsl:value-of select="$skippedCount"/></td>
             <td>
                 <xsl:call-template name="display-percent">
                     <xsl:with-param name="value" select="$successRate"/>
@@ -377,7 +377,7 @@
         <td><xsl:value-of select="@tests"/></td>
         <td><xsl:value-of select="@errors"/></td>
         <td><xsl:value-of select="@failures"/></td>
-        <td><xsl:value-of select="@skipped" /></td>
+        <td><xsl:value-of select="@skipped"/></td>
         <td>
             <xsl:call-template name="display-time">
                 <xsl:with-param name="value" select="@time"/>
diff --git a/src/etc/junit-noframes.xsl b/src/etc/junit-noframes.xsl
index fa3ac3e96..f478fbb78 100644
--- a/src/etc/junit-noframes.xsl
+++ b/src/etc/junit-noframes.xsl
@@ -3,8 +3,8 @@
         xmlns:lxslt="http://xml.apache.org/xslt"
         xmlns:string="xalan://java.lang.String">
 <xsl:output method="html" indent="yes" encoding="UTF-8"
-  doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
+  doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/>
+<xsl:decimal-format decimal-separator="." grouping-separator=","/>
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -164,7 +164,7 @@
                 <xsl:variable name="testCount" select="sum($testsuites-in-package/@tests)"/>
                 <xsl:variable name="errorCount" select="sum($testsuites-in-package/@errors)"/>
                 <xsl:variable name="failureCount" select="sum($testsuites-in-package/@failures)"/>
-                <xsl:variable name="skippedCount" select="sum($testsuites-in-package/@skipped)" />
+                <xsl:variable name="skippedCount" select="sum($testsuites-in-package/@skipped)"/>
                 <xsl:variable name="timeCount" select="sum($testsuites-in-package/@time)"/>
 
                 <!-- write a summary for the package -->
@@ -180,7 +180,7 @@
                     <td><xsl:value-of select="$testCount"/></td>
                     <td><xsl:value-of select="$errorCount"/></td>
                     <td><xsl:value-of select="$failureCount"/></td>
-                    <td><xsl:value-of select="$skippedCount" /></td>
+                    <td><xsl:value-of select="$skippedCount"/></td>
                     <td>
                     <xsl:call-template name="display-time">
                         <xsl:with-param name="value" select="$timeCount"/>
@@ -255,7 +255,7 @@
         <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
         <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
         <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
-        <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)" />
+        <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)"/>
         <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
         <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
         <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
@@ -277,7 +277,7 @@
             <td><xsl:value-of select="$testCount"/></td>
             <td><xsl:value-of select="$failureCount"/></td>
             <td><xsl:value-of select="$errorCount"/></td>
-            <td><xsl:value-of select="$skippedCount" /></td>
+            <td><xsl:value-of select="$skippedCount"/></td>
             <td>
                 <xsl:call-template name="display-percent">
                     <xsl:with-param name="value" select="$successRate"/>
@@ -376,7 +376,7 @@
         <td><xsl:value-of select="@tests"/></td>
         <td><xsl:value-of select="@errors"/></td>
         <td><xsl:value-of select="@failures"/></td>
-        <td><xsl:value-of select="@skipped" /></td>
+        <td><xsl:value-of select="@skipped"/></td>
         <td>
             <xsl:call-template name="display-time">
                 <xsl:with-param name="value" select="@time"/>
diff --git a/src/etc/log.xsl b/src/etc/log.xsl
index 5040993b7..062d1391d 100644
--- a/src/etc/log.xsl
+++ b/src/etc/log.xsl
@@ -16,18 +16,18 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-   
+
 -->
- 
+
 <!--
 
   The purpose have this XSL is to provide a nice way to look at the output
-  from the Ant XmlLogger (ie: ant -listener org.apache.tools.ant.XmlLogger )
-  
+  from the Ant XmlLogger (ie: ant -listener org.apache.tools.ant.XmlLogger)
+
   @author <a href="mailto:sbailliez@apache.org">Stephane Bailliez</a>
-  
+
 -->
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
+<xsl:decimal-format decimal-separator="." grouping-separator=","/>
 
 <xsl:template match="/">
 <html>
@@ -75,10 +75,10 @@
       color:#FFFFFF;
       font-weight: bold
     }
-    .a td { 
+    .a td {
       background: #efefef;
     }
-    .b td { 
+    .b td {
       background: #fff;
     }
     th, td {
@@ -118,7 +118,7 @@
       </td>
     </tr>
     </table>
-      
+
     <table border="0" width="100%">
     <tr><td><hr noshade="yes" size="1"/></td></tr>
     </table>
@@ -138,7 +138,7 @@
     </xsl:attribute>
     <tr>
       <xsl:if test="@error">
-        <td nowrap="yes">Build Failed</td> 
+        <td nowrap="yes">Build Failed</td>
       </xsl:if>
       <xsl:if test="not(@error)">
         <td nowrap="yes">Build Complete</td>
diff --git a/src/etc/maudit-frames.xsl b/src/etc/maudit-frames.xsl
index c81f8dc3a..0ab62bca1 100644
--- a/src/etc/maudit-frames.xsl
+++ b/src/etc/maudit-frames.xsl
@@ -4,7 +4,7 @@
     xmlns:redirect="org.apache.xalan.lib.Redirect"
     extension-element-prefixes="redirect">
 <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
+<xsl:decimal-format decimal-separator="." grouping-separator=","/>
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
diff --git a/src/etc/mmetrics-frames.xsl b/src/etc/mmetrics-frames.xsl
index 2b0f6b81b..dce25dba9 100644
--- a/src/etc/mmetrics-frames.xsl
+++ b/src/etc/mmetrics-frames.xsl
@@ -6,7 +6,7 @@
   exclude-result-prefixes="xalan"
   extension-element-prefixes="redirect">
 <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
+<xsl:decimal-format decimal-separator="." grouping-separator=","/>
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
diff --git a/src/etc/performance/build.xml b/src/etc/performance/build.xml
index c3e3ed9ea..2497dfa79 100644
--- a/src/etc/performance/build.xml
+++ b/src/etc/performance/build.xml
@@ -28,7 +28,7 @@
       ANT_HOME_6_5 (the directory containing ant 1.6.5)
       ANT_HOME_6_4
       ANT_HOME_5_4
-    
+
     * run ant
     For example:
        export ANT_HOME="c:/cygwin/home/me/svn/trunk/dist"
@@ -63,7 +63,7 @@
       </ac:if>
     </sequential>
   </macrodef>
-  
+
   <target name="do-times">
     <run-ant-files env-ant="env.ANT_HOME"/>
     <run-ant-files env-ant="env.ANT_HOME_6_5"/>
diff --git a/src/etc/performance/dirscanner.xml b/src/etc/performance/dirscanner.xml
index 5628a46cc..2c845c3c1 100644
--- a/src/etc/performance/dirscanner.xml
+++ b/src/etc/performance/dirscanner.xml
@@ -57,8 +57,8 @@
   <target name="prepare-setup">
     <mkdir dir="${test.dir}/src/org/apache/tools/ant"/>
     <mkdir dir="${test.dir}/dest"/>
-    <echo file="${test.dir}/src/org/apache/tools/ant/DirscannerSetup.java"
-          ><![CDATA[
+    <echo file="${test.dir}/src/org/apache/tools/ant/DirscannerSetup.java">
+      <![CDATA[
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one or more
  *  contributor license agreements.  See the NOTICE file distributed with
diff --git a/src/etc/poms/ant-apache-log4j/pom.xml b/src/etc/poms/ant-apache-log4j/pom.xml
index 13e628215..13184d8ff 100644
--- a/src/etc/poms/ant-apache-log4j/pom.xml
+++ b/src/etc/poms/ant-apache-log4j/pom.xml
@@ -20,7 +20,7 @@
   Please contact us if you are not satisfied with the data contained in this POM.
   URL : http://ant.apache.org
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
@@ -29,7 +29,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <version>1.10.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-log4j</artifactId>
   <version>1.10.5-SNAPSHOT</version>
diff --git a/src/etc/poms/ant-apache-regexp/pom.xml b/src/etc/poms/ant-apache-regexp/pom.xml
index dfd3a60c2..7b0b52912 100644
--- a/src/etc/poms/ant-apache-regexp/pom.xml
+++ b/src/etc/poms/ant-apache-regexp/pom.xml
@@ -20,7 +20,7 @@
   Please contact us if you are not satisfied with the data contained in this POM.
   URL : http://ant.apache.org
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
@@ -66,5 +66,5 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>
   </build>
-  
+
 </project>
diff --git a/src/etc/poms/ant-apache-resolver/pom.xml b/src/etc/poms/ant-apache-resolver/pom.xml
index 290637a8d..716ec0729 100644
--- a/src/etc/poms/ant-apache-resolver/pom.xml
+++ b/src/etc/poms/ant-apache-resolver/pom.xml
@@ -20,7 +20,7 @@
   Please contact us if you are not satisfied with the data contained in this POM.
   URL : http://ant.apache.org
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
diff --git a/src/etc/poms/ant-apache-xalan2/pom.xml b/src/etc/poms/ant-apache-xalan2/pom.xml
index fbd868a45..121608165 100644
--- a/src/etc/poms/ant-apache-xalan2/pom.xml
+++ b/src/etc/poms/ant-apache-xalan2/pom.xml
@@ -20,7 +20,7 @@
   Please contact us if you are not satisfied with the data contained in this POM.
   URL : http://ant.apache.org
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
@@ -29,7 +29,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <version>1.10.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-xalan2</artifactId>
   <version>1.10.5-SNAPSHOT</version>
@@ -68,7 +68,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
                     <include name="junit-frames.xsl"/>
                     <include name="junit-noframes.xsl"/>
                   </fileset>
-                </copy>              
+                </copy>
               </tasks>
             </configuration>
           </execution>
diff --git a/src/etc/poms/ant-commons-logging/pom.xml b/src/etc/poms/ant-commons-logging/pom.xml
index 636339201..3349edee7 100644
--- a/src/etc/poms/ant-commons-logging/pom.xml
+++ b/src/etc/poms/ant-commons-logging/pom.xml
@@ -20,7 +20,7 @@
   Please contact us if you are not satisfied with the data contained in this POM.
   URL : http://ant.apache.org
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
diff --git a/src/etc/poms/ant-commons-net/pom.xml b/src/etc/poms/ant-commons-net/pom.xml
index be4dbbd5a..a7f8ae5c1 100644
--- a/src/etc/poms/ant-commons-net/pom.xml
+++ b/src/etc/poms/ant-commons-net/pom.xml
@@ -20,7 +20,7 @@
   Please contact us if you are not satisfied with the data contained in this POM.
   URL : http://ant.apache.org
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml
index f35c8e888..382a48999 100644
--- a/src/etc/poms/ant-javamail/pom.xml
+++ b/src/etc/poms/ant-javamail/pom.xml
@@ -20,7 +20,7 @@
   Please contact us if you are not satisfied with the data contained in this POM.
   URL : http://ant.apache.org
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
@@ -29,7 +29,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <version>1.10.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-javamail</artifactId>
   <version>1.10.5-SNAPSHOT</version>
@@ -50,7 +50,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
       <version>1.6.1</version>
       <scope>compile</scope>
     </dependency>
-  </dependencies> 
+  </dependencies>
   <build>
     <plugins>
       <plugin>
diff --git a/src/etc/poms/ant-jdepend/pom.xml b/src/etc/poms/ant-jdepend/pom.xml
index 37943e64c..e2bf3c9f3 100644
--- a/src/etc/poms/ant-jdepend/pom.xml
+++ b/src/etc/poms/ant-jdepend/pom.xml
@@ -30,7 +30,7 @@
     <version>1.10.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jdepend</artifactId>
   <version>1.10.5-SNAPSHOT</version>
diff --git a/src/etc/poms/ant-jmf/pom.xml b/src/etc/poms/ant-jmf/pom.xml
index 31975df4f..cb80123ad 100644
--- a/src/etc/poms/ant-jmf/pom.xml
+++ b/src/etc/poms/ant-jmf/pom.xml
@@ -20,7 +20,7 @@
   Please contact us if you are not satisfied with the data contained in this POM.
   URL : http://ant.apache.org
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
@@ -29,7 +29,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <version>1.10.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jmf</artifactId>
   <version>1.10.5-SNAPSHOT</version>
diff --git a/src/etc/poms/ant-jsch/pom.xml b/src/etc/poms/ant-jsch/pom.xml
index 85b70c3c5..4fa7116fd 100644
--- a/src/etc/poms/ant-jsch/pom.xml
+++ b/src/etc/poms/ant-jsch/pom.xml
@@ -20,7 +20,7 @@
   Please contact us if you are not satisfied with the data contained in this POM.
   URL : http://ant.apache.org
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
@@ -29,7 +29,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <version>1.10.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jsch</artifactId>
   <version>1.10.5-SNAPSHOT</version>
diff --git a/src/etc/poms/ant-junit/pom.xml b/src/etc/poms/ant-junit/pom.xml
index ed1b6f406..1b97d5914 100644
--- a/src/etc/poms/ant-junit/pom.xml
+++ b/src/etc/poms/ant-junit/pom.xml
@@ -20,7 +20,7 @@
   Please contact us if you are not satisfied with the data contained in this POM.
   URL : http://ant.apache.org
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
@@ -29,7 +29,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <version>1.10.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-junit</artifactId>
   <version>1.10.5-SNAPSHOT</version>
@@ -70,7 +70,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
                     <include name="junit-frames-saxon.xsl"/>
                     <include name="junit-noframes-saxon.xsl"/>
                   </fileset>
-                </copy>              
+                </copy>
               </tasks>
             </configuration>
           </execution>
diff --git a/src/etc/poms/ant-netrexx/pom.xml b/src/etc/poms/ant-netrexx/pom.xml
index 8c883c4d0..99d721d91 100644
--- a/src/etc/poms/ant-netrexx/pom.xml
+++ b/src/etc/poms/ant-netrexx/pom.xml
@@ -20,7 +20,7 @@
   Please contact us if you are not satisfied with the data contained in this POM.
   URL : http://ant.apache.org
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
@@ -29,7 +29,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <version>1.10.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-netrexx</artifactId>
   <version>1.10.5-SNAPSHOT</version>
diff --git a/src/etc/poms/ant-swing/pom.xml b/src/etc/poms/ant-swing/pom.xml
index 1bbb2d4f1..4ab2dc747 100644
--- a/src/etc/poms/ant-swing/pom.xml
+++ b/src/etc/poms/ant-swing/pom.xml
@@ -30,7 +30,7 @@
     <version>1.10.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-swing</artifactId>
   <version>1.10.5-SNAPSHOT</version>
diff --git a/src/etc/poms/ant-testutil/pom.xml b/src/etc/poms/ant-testutil/pom.xml
index 10224fa5d..6217339a6 100644
--- a/src/etc/poms/ant-testutil/pom.xml
+++ b/src/etc/poms/ant-testutil/pom.xml
@@ -30,7 +30,7 @@
     <version>1.10.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-testutil</artifactId>
   <version>1.10.5-SNAPSHOT</version>
diff --git a/src/etc/poms/ant-xz/pom.xml b/src/etc/poms/ant-xz/pom.xml
index a3587297c..c5d63e6f4 100644
--- a/src/etc/poms/ant-xz/pom.xml
+++ b/src/etc/poms/ant-xz/pom.xml
@@ -20,7 +20,7 @@
   Please contact us if you are not satisfied with the data contained in this POM.
   URL : http://ant.apache.org
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
diff --git a/src/etc/tagdiff.xsl b/src/etc/tagdiff.xsl
index 5d430a79d..774ac8367 100644
--- a/src/etc/tagdiff.xsl
+++ b/src/etc/tagdiff.xsl
@@ -56,10 +56,10 @@
           font-family: verdana,arial,helvetica;
           font-size: 80%;
           background:#eeeee0;
-          }	  
-	  </style> 
+          }
+	  </style>
       </head>
-      <body link="#000000" alink="#000000" vlink="#000000" text="#000000">       
+      <body link="#000000" alink="#000000" vlink="#000000" text="#000000">
           <h1>
             <a name="top"><xsl:value-of select="$title"/></a>
           </h1>
@@ -97,7 +97,7 @@
 			<xsl:with-param name="entries" select=".//entry[not(file/revision)][file/prevrevision]"/>
 		</xsl:call-template>
         </table>
-        
+
       </body>
     </html>
   </xsl:template>
@@ -125,7 +125,7 @@
 			</ul>
 		</td>
 	</tr>
-  </xsl:template>  
+  </xsl:template>
 
   <xsl:template match="entry">
 	<xsl:apply-templates select="file"/>
@@ -151,18 +151,18 @@
   <xsl:template match="file">
     <li>
       <a target="_new">
-        <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" /></xsl:attribute>
-        <xsl:value-of select="name" />
+        <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module"/>/<xsl:value-of select="name"/></xsl:attribute>
+        <xsl:value-of select="name"/>
       </a>
       <xsl:if test="string-length(prevrevision) > 0 or string-length(revision) > 0">
       <xsl:text> </xsl:text>
       <a target="_new">
         <xsl:choose>
           <xsl:when test="string-length(prevrevision) = 0 ">
-            <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?rev=<xsl:value-of select="revision" />&amp;content-type=text/x-cvsweb-markup</xsl:attribute>
+            <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module"/>/<xsl:value-of select="name"/>?rev=<xsl:value-of select="revision"/>&amp;content-type=text/x-cvsweb-markup</xsl:attribute>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?r1=<xsl:value-of select="revision" />&amp;r2=<xsl:value-of select="prevrevision"/>&amp;diff_format=h</xsl:attribute>
+            <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module"/>/<xsl:value-of select="name"/>?r1=<xsl:value-of select="revision"/>&amp;r2=<xsl:value-of select="prevrevision"/>&amp;diff_format=h</xsl:attribute>
           </xsl:otherwise>
         </xsl:choose> (<xsl:if test="count(prevrevision) &gt; 0"> <xsl:value-of select="prevrevision"/> --&gt; </xsl:if> <xsl:value-of select="revision"/>)
       </a>
@@ -175,5 +175,5 @@
   <xsl:template match="msg">
     <b><xsl:apply-templates/></b>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/src/etc/testcases/buildfiletest-base.xml b/src/etc/testcases/buildfiletest-base.xml
index fc1e8b0b0..5e0439a0b 100644
--- a/src/etc/testcases/buildfiletest-base.xml
+++ b/src/etc/testcases/buildfiletest-base.xml
@@ -7,5 +7,5 @@
     <delete dir="${input}"/>
     <delete dir="${output}"/>
   </target>
-  
+
 </project>
diff --git a/src/etc/testcases/core/directoryscanner.xml b/src/etc/testcases/core/directoryscanner.xml
index 7e8683a4a..0ef2f7911 100644
--- a/src/etc/testcases/core/directoryscanner.xml
+++ b/src/etc/testcases/core/directoryscanner.xml
@@ -29,7 +29,7 @@
         <touch file="${output}/delta/delta.xml"/>
     </target>
 
-    <target name="children-of-excluded-dir-setup" depends="extended-setup" />
+    <target name="children-of-excluded-dir-setup" depends="extended-setup"/>
 
     <target name="symlink-setup" depends="setUp">
         <mkdir dir="${output}/epsilon/gamma"/>
diff --git a/src/etc/testcases/core/dispatch/dispatch.xml b/src/etc/testcases/core/dispatch/dispatch.xml
index d529644de..43eef7310 100644
--- a/src/etc/testcases/core/dispatch/dispatch.xml
+++ b/src/etc/testcases/core/dispatch/dispatch.xml
@@ -19,14 +19,14 @@
 <project name="dispatch-test" default="disp">
 
   <path id="testclasses">
-    <pathelement location="../../../../build/testcases" />
-    <pathelement path="${java.class.path}" />
+    <pathelement location="../../../../build/testcases"/>
+    <pathelement path="${java.class.path}"/>
   </path>
 
   <target name="disp">
     <taskdef name="disptask"
              classname="org.apache.tools.ant.taskdefs.PickOneTask">
-      <classpath refid="testclasses" />
+      <classpath refid="testclasses"/>
     </taskdef>
     <disptask action="list"/>
   </target>
diff --git a/src/etc/testcases/core/executor.xml b/src/etc/testcases/core/executor.xml
index 080c8dc78..005baa500 100644
--- a/src/etc/testcases/core/executor.xml
+++ b/src/etc/testcases/core/executor.xml
@@ -18,7 +18,7 @@
 <project>
   <target name="foo">
     <echo>foo</echo>
-    <fail if="failfoo" message="failfoo" />
+    <fail if="failfoo" message="failfoo"/>
   </target>
   <target name="a" depends="foo">
     <echo>a</echo>
diff --git a/src/etc/testcases/core/extended-taskdef.xml b/src/etc/testcases/core/extended-taskdef.xml
index 58ca97980..0d63ea863 100644
--- a/src/etc/testcases/core/extended-taskdef.xml
+++ b/src/etc/testcases/core/extended-taskdef.xml
@@ -24,7 +24,7 @@
   <property name="src" value="Foo.java"/>
   <property name="taskdefs" value="tasks.properties"/>
 
-  <target name="write" >
+  <target name="write">
     <echo file="${src}">
       import org.apache.tools.ant.BuildException;
 
@@ -67,7 +67,7 @@
       <fileset dir="${basedir}"
           includes="${src},*.class"/>
     </delete>
-    <delete file="${taskdefs}" />
+    <delete file="${taskdefs}"/>
   </target>
 
 </project>
diff --git a/src/etc/testcases/core/immutable.xml b/src/etc/testcases/core/immutable.xml
index 26fda087d..64cda00b0 100644
--- a/src/etc/testcases/core/immutable.xml
+++ b/src/etc/testcases/core/immutable.xml
@@ -56,19 +56,19 @@
 
   <target name="test7">
     <property name="test" value="original"/>
-    <pathconvert targetos="unix" property="test" >
+    <pathconvert targetos="unix" property="test">
       <path>
-        <pathelement location="/lib/weblogicaux.jar" />
-        <pathelement location="/classes" />
-        <pathelement location="/mssqlserver4/classes" />
-        <pathelement location="c:\winnt\System32" />
+        <pathelement location="/lib/weblogicaux.jar"/>
+        <pathelement location="/classes"/>
+        <pathelement location="/mssqlserver4/classes"/>
+        <pathelement location="c:\winnt\System32"/>
       </path>
     </pathconvert>
   </target>
 
   <target name="test8">
     <antcall inheritAll="false" target="echo-target">
-      <param name="echo.value" value="Meep meep!" />
+      <param name="echo.value" value="Meep meep!"/>
     </antcall>
   </target>
 
diff --git a/src/etc/testcases/core/loaderref/loaderref.xml b/src/etc/testcases/core/loaderref/loaderref.xml
index 83974979b..ed95beb8b 100644
--- a/src/etc/testcases/core/loaderref/loaderref.xml
+++ b/src/etc/testcases/core/loaderref/loaderref.xml
@@ -36,7 +36,7 @@ This build file is intended to be used for testing Ant
     <javac srcdir="${src.dir}" destdir="${output}"/>
   </target>
 
-  <target name="testbadref" depends="compile" >
+  <target name="testbadref" depends="compile">
     <taskdef loaderref="loaderref-test"
              name="test1"
              classname="Test1"
diff --git a/src/etc/testcases/core/location.xml b/src/etc/testcases/core/location.xml
index 7e8f63943..324d4426c 100644
--- a/src/etc/testcases/core/location.xml
+++ b/src/etc/testcases/core/location.xml
@@ -37,11 +37,11 @@
 
   <target name="define">
     <property name="testclasses"
-      location="../../../../build/testcases" />
+      location="../../../../build/testcases"/>
     <taskdef name="echoloc"
       classname="org.apache.tools.ant.LocationTest$EchoLocation">
       <classpath>
-        <pathelement location="${testclasses}" />
+        <pathelement location="${testclasses}"/>
         <pathelement path="${java.class.path}"/>
       </classpath>
     </taskdef>
@@ -71,4 +71,4 @@
     <echoloc3/>
   </target>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/src/etc/testcases/core/taskcontainer.xml b/src/etc/testcases/core/taskcontainer.xml
index 4a2137301..c3f305424 100644
--- a/src/etc/testcases/core/taskcontainer.xml
+++ b/src/etc/testcases/core/taskcontainer.xml
@@ -18,11 +18,11 @@
 <project default="dont-run-this">
 
   <import file="../buildfiletest-base.xml"/>
-  
+
   <target name="dont-run-this">
     <fail>This build file is supposed to be run by a Unit test</fail>
   </target>
- 
+
 
   <target name="testPropertyExpansion">
     <sequential>
@@ -36,7 +36,7 @@
     <mkdir dir="${output}"/>
     <javac srcdir="containersrc" destdir="${output}" debug="on"/>
 
-    <sequential>    
+    <sequential>
       <taskdef name="sseq" classpath="${output}" classname="test.SpecialSeq"/>
       <sseq>
         <fileset dir="."/>
@@ -49,14 +49,14 @@
   </target>
 
   <target name="testCaseInsensitive">
-    <taskdef name="Prattle" classname="org.apache.tools.ant.taskdefs.Echo"/>  
-    <taskdef name="Seq"  
-             classname="org.apache.tools.ant.taskdefs.Sequential"/>  
-    <Prattle>hello</Prattle>  
-    <Seq>  
-      <Prattle> world</Prattle>  
-    </Seq>  
-  </target>  
-
-  
+    <taskdef name="Prattle" classname="org.apache.tools.ant.taskdefs.Echo"/>
+    <taskdef name="Seq"
+             classname="org.apache.tools.ant.taskdefs.Sequential"/>
+    <Prattle>hello</Prattle>
+    <Seq>
+      <Prattle> world</Prattle>
+    </Seq>
+  </target>
+
+
 </project>
diff --git a/src/etc/testcases/core/topleveltasks/notarget.xml b/src/etc/testcases/core/topleveltasks/notarget.xml
index 25437515e..9ce0239a6 100644
--- a/src/etc/testcases/core/topleveltasks/notarget.xml
+++ b/src/etc/testcases/core/topleveltasks/notarget.xml
@@ -16,6 +16,6 @@
    limitations under the License.
 -->
 <project default="foo">
-  <echo message="Called" />
-  <target name="foo" />
+  <echo message="Called"/>
+  <target name="foo"/>
 </project>
diff --git a/src/etc/testcases/core/topleveltasks/targetlevelant.xml b/src/etc/testcases/core/topleveltasks/targetlevelant.xml
index 9b1bb1dfc..61229f9b6 100644
--- a/src/etc/testcases/core/topleveltasks/targetlevelant.xml
+++ b/src/etc/testcases/core/topleveltasks/targetlevelant.xml
@@ -17,6 +17,6 @@
 -->
 <project basedir="." default="foo">
   <target name="foo">
-    <ant antfile="notarget.xml" />
+    <ant antfile="notarget.xml"/>
   </target>
 </project>
diff --git a/src/etc/testcases/core/topleveltasks/toplevelant.xml b/src/etc/testcases/core/topleveltasks/toplevelant.xml
index 968ad6c17..67a5cae9f 100644
--- a/src/etc/testcases/core/topleveltasks/toplevelant.xml
+++ b/src/etc/testcases/core/topleveltasks/toplevelant.xml
@@ -16,6 +16,6 @@
    limitations under the License.
 -->
 <project basedir="." default="foo">
-  <ant antfile="notarget.xml" />
-  <target name="foo" />
+  <ant antfile="notarget.xml"/>
+  <target name="foo"/>
 </project>
diff --git a/src/etc/testcases/core/unknownelement.xml b/src/etc/testcases/core/unknownelement.xml
index b6d89394c..fec8f1865 100644
--- a/src/etc/testcases/core/unknownelement.xml
+++ b/src/etc/testcases/core/unknownelement.xml
@@ -17,7 +17,7 @@
 -->
 <project>
   <target name="testMaybeConfigure">
-    <taskdef name="parent" 
+    <taskdef name="parent"
              classname="org.apache.tools.ant.UnknownElementTest$Parent"
              loaderref="unknown.id">
       <classpath>
diff --git a/src/etc/testcases/filters/concat.xml b/src/etc/testcases/filters/concat.xml
index 262dd1608..7aca7bd10 100644
--- a/src/etc/testcases/filters/concat.xml
+++ b/src/etc/testcases/filters/concat.xml
@@ -20,7 +20,7 @@
   <import file="../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
     <echo file="${output}/prepend.txt" message="this-should-be-the-first-line${line.separator}"/>
     <echo file="${output}/append.txt" message="this-should-be-the-last-line${line.separator}"/>
     <copy file="input/head-tail.test" tofile="${output}/concatfilter.test"/>
diff --git a/src/etc/testcases/filters/dynamicfilter.xml b/src/etc/testcases/filters/dynamicfilter.xml
index cb52d2158..ef9ffc374 100644
--- a/src/etc/testcases/filters/dynamicfilter.xml
+++ b/src/etc/testcases/filters/dynamicfilter.xml
@@ -20,20 +20,20 @@
   <import file="../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
   </target>
 
   <target name="dynamicfilter">
     <path id="test-classes">
-      <pathelement location="../../../../build/testcases" />
-      <pathelement path="${java.class.path}" />
+      <pathelement location="../../../../build/testcases"/>
+      <pathelement path="${java.class.path}"/>
     </path>
-    <typedef 
-      name="customfilter" 
+    <typedef
+      name="customfilter"
       classname="org.apache.tools.ant.filters.DynamicFilterTest$CustomFilter">
       <classpath refid="test-classes"/>
     </typedef>
-    
+
     <concat destfile="${output}/input">
       hello world
     </concat>
diff --git a/src/etc/testcases/filters/tokenfilter.xml b/src/etc/testcases/filters/tokenfilter.xml
index b1b5aef4e..965398ef7 100644
--- a/src/etc/testcases/filters/tokenfilter.xml
+++ b/src/etc/testcases/filters/tokenfilter.xml
@@ -20,7 +20,7 @@
   <import file="../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
   </target>
 
   <target name="tokenfilter">
@@ -34,7 +34,7 @@
   <target name="trimignore">
     <concat destfile="${output}/input">
       Hello
-      
+
       World
     </concat>
     <copy file="${output}/input" tofile="${output}/output" overwrite="yes">
@@ -314,17 +314,17 @@
 
   <target name="customtokenfilter">
     <path id="test-classes">
-      <pathelement location="../../../../build/testcases" />
-      <pathelement path="${java.class.path}" />
+      <pathelement location="../../../../build/testcases"/>
+      <pathelement path="${java.class.path}"/>
     </path>
 
 
-    <typedef 
-      name="capitalize" 
+    <typedef
+      name="capitalize"
       classname="org.apache.tools.ant.filters.TokenFilterTest$Capitalize">
       <classpath refid="test-classes"/>
     </typedef>
-    
+
     <concat destfile="${output}/input">
       hello world
     </concat>
@@ -344,7 +344,7 @@
       i = 1;
     </script>
   </target>
-  
+
   <target name="hasregex">
     <concat destfile="${output}/replaceregexp">
       hello world
diff --git a/src/etc/testcases/taskdefs/abstractcvstask.xml b/src/etc/testcases/taskdefs/abstractcvstask.xml
index 5de8b5e77..3f7f258d2 100644
--- a/src/etc/testcases/taskdefs/abstractcvstask.xml
+++ b/src/etc/testcases/taskdefs/abstractcvstask.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-<project name="abstractcvstask-test" basedir="../../../../" 
+<project name="abstractcvstask-test" basedir="../../../../"
          default="tearDown">
 
   <import file="../buildfiletest-base.xml" optional="false"/>
@@ -29,7 +29,7 @@
     <cvs cvsroot="anoncvs@anoncvs.ca.openbsd.org:/cvs"
          package="src/Makefile"
          dest="${output}"
-         quiet="true" />
+         quiet="true"/>
   </target>
 
   <target name="tag-attribute">
@@ -37,7 +37,7 @@
          package="src/Makefile"
          dest="${output}"
          quiet="true"
-         tag="OPENBSD_5_3" />
+         tag="OPENBSD_5_3"/>
     <cvs cvsroot="anoncvs@anoncvs.ca.openbsd.org:/cvs"
          package="src/Makefile"
          dest="${output}"
diff --git a/src/etc/testcases/taskdefs/ant.xml b/src/etc/testcases/taskdefs/ant.xml
index 33ef1dab2..74a4953bb 100644
--- a/src/etc/testcases/taskdefs/ant.xml
+++ b/src/etc/testcases/taskdefs/ant.xml
@@ -19,14 +19,14 @@
 <project name="ant-test" basedir="." default="test1">
 
   <path id="inheritable">
-    <pathelement path="${java.class.path}" />
+    <pathelement path="${java.class.path}"/>
   </path>
 
   <target name="cleanup">
-    <delete file="test1.log" />
-    <delete file="test2.log" />
-    <delete file="ant/test3.log" />
-    <delete file="ant/test4.log" />
+    <delete file="test1.log"/>
+    <delete file="test2.log"/>
+    <delete file="ant/test3.log"/>
+    <delete file="ant/test4.log"/>
   </target>
 
   <target name="all" depends="test1,test2,test3,test4"/>
@@ -63,38 +63,38 @@
   </target>
 
   <target name="inheritBasedir">
-    <ant antfile="ant/ant.xml" target="dummy" inheritAll="true" />
+    <ant antfile="ant/ant.xml" target="dummy" inheritAll="true"/>
   </target>
 
   <target name="doNotInheritBasedir">
-    <ant antfile="ant/ant.xml" target="dummy" inheritAll="false" />
+    <ant antfile="ant/ant.xml" target="dummy" inheritAll="false"/>
   </target>
 
   <target name="explicitBasedir1">
-    <ant antfile="taskdefs/ant/ant.xml" target="dummy" inheritAll="true" 
-         dir=".." />
+    <ant antfile="taskdefs/ant/ant.xml" target="dummy" inheritAll="true"
+         dir=".."/>
   </target>
 
   <target name="explicitBasedir2">
-    <ant antfile="taskdefs/ant/ant.xml" target="dummy" inheritAll="false" 
-         dir=".." />
+    <ant antfile="taskdefs/ant/ant.xml" target="dummy" inheritAll="false"
+         dir=".."/>
   </target>
 
   <target name="tripleCall">
-    <ant antfile="ant/ant.xml" target="callback" inheritAll="false" />
+    <ant antfile="ant/ant.xml" target="callback" inheritAll="false"/>
   </target>
 
   <target name="testInherit">
-    <ant antfile="ant/references.xml" inheritRefs="true" target="dummy" />
+    <ant antfile="ant/references.xml" inheritRefs="true" target="dummy"/>
   </target>
 
   <target name="testNoInherit">
-    <ant antfile="ant/references.xml" inheritRefs="false" target="dummy" />
+    <ant antfile="ant/references.xml" inheritRefs="false" target="dummy"/>
   </target>
 
   <target name="testRename">
     <ant antfile="ant/references.xml" inheritRefs="false" target="dummy">
-      <reference refid="path" torefid="newpath" />
+      <reference refid="path" torefid="newpath"/>
     </ant>
   </target>
 
@@ -107,71 +107,71 @@
       <pathelement location="${rootdir}/test/testframework.jar"/>
       <path refid="project.classpath"/>
     </path>
-    <ant antfile="ant/references.xml"  target="testInheritPath">
+    <ant antfile="ant/references.xml" target="testInheritPath">
       <reference refid="test.classpath"/>
     </ant>
   </target>
 
   <target name="testLogfilePlacement">
     <ant antfile="ant.xml" target="dummy" output="test1.log"
-         inheritall="false" />
-    <ant antfile="ant.xml" target="dummy" output="test2.log" />
+         inheritall="false"/>
+    <ant antfile="ant.xml" target="dummy" output="test2.log"/>
     <ant antfile="ant.xml" target="dummy" output="test3.log"
-         inheritall="false" dir="ant" />
-    <ant antfile="ant.xml" target="dummy" output="test4.log" 
-         dir="ant" />
+         inheritall="false" dir="ant"/>
+    <ant antfile="ant.xml" target="dummy" output="test4.log"
+         dir="ant"/>
   </target>
 
   <target name="testRefid">
     <ant antfile="ant/references.xml" inheritRefs="false" target="dummy">
-      <property name="testprop" refid="inheritable" />
+      <property name="testprop" refid="inheritable"/>
     </ant>
   </target>
 
   <target name="test-property-override-inheritall-start">
-    <property name="test" value="1" />
+    <property name="test" value="1"/>
     <ant antfile="ant.xml"
          target="test-property-override-inheritall-level-2"
          inheritall="true">
-      <property name="test" value="2" />
+      <property name="test" value="2"/>
     </ant>
   </target>
 
   <target name="test-property-override-inheritall-level-2">
-    <property name="test" value="3" />
+    <property name="test" value="3"/>
     <ant antfile="ant.xml"
          target="test-property-override-inheritall-level-3"
          inheritall="true">
-      <property name="test" value="4" />
+      <property name="test" value="4"/>
     </ant>
   </target>
 
   <target name="test-property-override-inheritall-level-3">
-    <property name="test" value="5" />
-    <echo message="The value of test is ${test}" />
+    <property name="test" value="5"/>
+    <echo message="The value of test is ${test}"/>
   </target>
 
   <target name="test-property-override-no-inheritall-start">
-    <property name="test" value="1" />
+    <property name="test" value="1"/>
     <ant antfile="ant.xml"
          target="test-property-override-no-inheritall-level-2"
          inheritall="false">
-      <property name="test" value="2" />
+      <property name="test" value="2"/>
     </ant>
   </target>
 
   <target name="test-property-override-no-inheritall-level-2">
-    <property name="test" value="3" />
+    <property name="test" value="3"/>
     <ant antfile="ant.xml"
          target="test-property-override-no-inheritall-level-3"
          inheritall="false">
-      <property name="test" value="4" />
+      <property name="test" value="4"/>
     </ant>
   </target>
 
   <target name="test-property-override-no-inheritall-level-3">
-    <property name="test" value="5" />
-    <echo message="The value of test is ${test}" />
+    <property name="test" value="5"/>
+    <echo message="The value of test is ${test}"/>
   </target>
 
   <target name="test-propertyset">
@@ -181,7 +181,7 @@
       <propertyref name="test1"/>
       <mapper type="glob" from="*" to="*.x"/>
     </propertyset>
-    <ant antfile="ant.xml" target="echo-for-propertyset-test" 
+    <ant antfile="ant.xml" target="echo-for-propertyset-test"
          inheritall="false">
       <propertyset refid="set"/>
     </ant>
@@ -199,7 +199,7 @@
 
   <target name="middleman" depends="infinite-loop-via-depends"/>
   <target name="dependent" depends="middleman"/>
-  
+
   <target name="multi-same-property">
     <ant antfile="ant.xml" target="echo-for-multi-same">
       <property name="prop" value="one"/>
@@ -224,22 +224,22 @@
 
   <target name="blank-target">
     <ant antfile="ant.topleveltest.xml">
-      <target name="" />
+      <target name=""/>
     </ant>
   </target>
 
   <target name="multiple-targets">
     <ant antfile="ant.xml">
-      <target name="ta" />
-      <target name="tb" />
-      <target name="tc" />
+      <target name="ta"/>
+      <target name="tb"/>
+      <target name="tc"/>
     </ant>
   </target>
 
   <target name="multiple-targets-2">
     <ant antfile="ant.xml">
-      <target name="tb" />
-      <target name="da" />
+      <target name="tb"/>
+      <target name="da"/>
     </ant>
   </target>
 
diff --git a/src/etc/testcases/taskdefs/ant/ant.xml b/src/etc/testcases/taskdefs/ant/ant.xml
index 52c9a70d9..89658827c 100644
--- a/src/etc/testcases/taskdefs/ant/ant.xml
+++ b/src/etc/testcases/taskdefs/ant/ant.xml
@@ -22,12 +22,12 @@
   </target>
 
   <target name="dummy">
-    <echo message="${basedir}" />
+    <echo message="${basedir}"/>
   </target>
 
   <target name="callback">
-    <ant antfile="../ant.xml" target="dummy" inheritAll="false" />
+    <ant antfile="../ant.xml" target="dummy" inheritAll="false"/>
   </target>
 
 
-</project>
\ No newline at end of file
+</project>
diff --git a/src/etc/testcases/taskdefs/ant/references.xml b/src/etc/testcases/taskdefs/ant/references.xml
index 0f3a6930f..6966db77b 100644
--- a/src/etc/testcases/taskdefs/ant/references.xml
+++ b/src/etc/testcases/taskdefs/ant/references.xml
@@ -17,13 +17,13 @@
 -->
 <project name="test" default="def" basedir=".">
 
-  <path id="no-override" />
+  <path id="no-override"/>
 
   <target name="def">
     <fail>This build file should only be run from within the testcase</fail>
   </target>
 
-  <target name="dummy" />
+  <target name="dummy"/>
 
   <target name="testInheritPath">
     <pathconvert refid="test.classpath" pathsep="${line.separator}" property="myprop"/>
diff --git a/src/etc/testcases/taskdefs/antlib.xml b/src/etc/testcases/taskdefs/antlib.xml
index d1c4061e1..12214377e 100644
--- a/src/etc/testcases/taskdefs/antlib.xml
+++ b/src/etc/testcases/taskdefs/antlib.xml
@@ -20,8 +20,8 @@
   <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="antlib.file">
@@ -53,13 +53,13 @@
     <x:p xmlns:x="abc">Hello from x:p</x:p>
   </target>
 
-  <target name="antlib_uri" >
+  <target name="antlib_uri">
     <typedef uri="antlib:org.example.tasks" onerror="failall"/>
   </target>
 
   <target name="antlib_uri_auto" xmlns:ex="antlib:org.example.tasks">
     <ex:simple>
-      <echo message="inside simple" />
+      <echo message="inside simple"/>
     </ex:simple>
   </target>
 
@@ -68,5 +68,5 @@
       <echo message="inside simple"/>
     </ex:simple>
   </target>
-  
-</project>
\ No newline at end of file
+
+</project>
diff --git a/src/etc/testcases/taskdefs/available.xml b/src/etc/testcases/taskdefs/available.xml
index 324c054d1..5bc71edec 100644
--- a/src/etc/testcases/taskdefs/available.xml
+++ b/src/etc/testcases/taskdefs/available.xml
@@ -21,7 +21,7 @@
   <import file="../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
   </target>
 
   <target name="test1">
@@ -37,91 +37,91 @@
   </target>
 
   <target name="test4">
-    <available property="test" 
+    <available property="test"
                file="src/etc/testcases/taskdefs/this_file_does_not_exist"/>
   </target>
 
   <target name="test5">
-    <available property="test" 
+    <available property="test"
                file="available.xml"/>
   </target>
 
   <target name="test6">
-    <available property="test" 
+    <available property="test"
                resource="org/apache/tools/ant/taskdefs/this_resource_does_not_exist"/>
   </target>
 
   <target name="test7">
-    <available property="test" 
+    <available property="test"
                resource="org/apache/tools/ant/taskdefs/defaults.properties"/>
   </target>
 
   <target name="test8">
-    <available property="test" 
+    <available property="test"
                classname="org.apache.tools.ant.taskdefs.this_class_does_not_exist"/>
   </target>
 
   <target name="test9">
-    <available property="test" 
+    <available property="test"
                classname="org.apache.tools.ant.taskdefs.Ant"/>
   </target>
 
   <target name="test10">
-    <available property="test" 
+    <available property="test"
                file="available.xml"
                resource="org/apache/tools/ant/taskdefs/defaults.properties"
                classname="org.apache.tools.ant.taskdefs.Ant"/>
   </target>
-  
+
   <target name="test11">
-    <available property="test" 
+    <available property="test"
                file="src/etc/testcases/taskdefs/available.xml"
                resource="org/apache/tools/ant/taskdefs/defaults.properties"
                classname="org.apache.tools.ant.taskdefs.this_class_does_not_exist"/>
-  </target>  
-  
+  </target>
+
   <target name="test12">
-    <available property="" 
+    <available property=""
                file="available.xml"/>
   </target>
 
   <target name="test13">
-    <available property="test" 
-               file="" type="file" />
+    <available property="test"
+               file="" type="file"/>
   </target>
 
   <target name="test13b">
-    <available property="test" 
+    <available property="test"
                file=""/>
   </target>
 
   <target name="test14">
-    <available property="test" 
+    <available property="test"
                resource=""/>
   </target>
 
   <target name="test15">
-    <available property="test" 
+    <available property="test"
                classname="org.apache.tools.ant.taskdefs.this_class_does_not_exist"/>
   </target>
 
   <target name="test16">
-    <available property="test" 
+    <available property="test"
                file="" type="dir"/>
   </target>
 
   <target name="test17">
-    <available property="test" 
+    <available property="test"
                file="../taskdefs" type="dir"/>
   </target>
 
   <target name="test18">
-    <available property="test" 
+    <available property="test"
                file="../this_dir_should_never_exist" type="dir"/>
   </target>
 
   <target name="test19">
-    <available property="test" 
+    <available property="test"
                file="available.xml" type="Foo"/>
   </target>
 
@@ -134,7 +134,7 @@
     <available property="test" ignoresystemclasses="true"
                classname="org.apache.tools.ant.launch.AntMain">
       <classpath>
-        <pathelement location="${ant.home}/lib/ant-launcher.jar" />
+        <pathelement location="${ant.home}/lib/ant-launcher.jar"/>
       </classpath>
     </available>
   </target>
@@ -161,29 +161,29 @@
 
   <target name="searchInPathNotThere">
     <available file="not_there" filepath="..:optional"
-               property="test" />
+               property="test"/>
   </target>
 
   <target name="searchInPathIsThere">
     <available file="pvcs.xml" filepath="..:optional"
-               property="test" />
+               property="test"/>
   </target>
 
   <target name="testDoubleBasedir">
     <echo>testing ${basedir}${file.separator}${ant.file}</echo>
     <fail>
       <condition>
-        <available file="${basedir}${file.separator}${ant.file}" />
+        <available file="${basedir}${file.separator}${ant.file}"/>
       </condition>
     </fail>
   </target>
 
   <target name="prep.parents">
-    <mkdir  dir="${output}/greatgrandparent/grandparent/parent/dir"/>
-    <touch  file="${output}/greatgrandparent/a.txt"/>
-    <touch  file="${output}/greatgrandparent/grandparent/b.txt"/>
-    <touch  file="${output}/greatgrandparent/grandparent/parent/c.txt"/>
-    <touch  file="${output}/greatgrandparent/grandparent/parent/dir/d.txt"/>
+    <mkdir dir="${output}/greatgrandparent/grandparent/parent/dir"/>
+    <touch file="${output}/greatgrandparent/a.txt"/>
+    <touch file="${output}/greatgrandparent/grandparent/b.txt"/>
+    <touch file="${output}/greatgrandparent/grandparent/parent/c.txt"/>
+    <touch file="${output}/greatgrandparent/grandparent/parent/dir/d.txt"/>
     <property name="available.test.dir"
               value="${output}/greatgrandparent/grandparent/parent/dir"/>
   </target>
diff --git a/src/etc/testcases/taskdefs/basename.xml b/src/etc/testcases/taskdefs/basename.xml
index c5fd2abc0..b3f1f26c1 100644
--- a/src/etc/testcases/taskdefs/basename.xml
+++ b/src/etc/testcases/taskdefs/basename.xml
@@ -45,7 +45,7 @@
   <target name="testNoDots">
     <basename property="file.wo.suf" file="foo.bartxt" suffix="txt"/>
   </target>
-  
+
   <target name="testValueEqualsSuffixWithDot">
     <basename property="file.wo.suf" file=".txt" suffix=".txt"/>
   </target>
@@ -53,5 +53,5 @@
   <target name="testValueEqualsSuffixWithoutDot">
     <basename property="file.wo.suf" file=".txt" suffix="txt"/>
   </target>
-  
+
 </project>
diff --git a/src/etc/testcases/taskdefs/bunzip2.xml b/src/etc/testcases/taskdefs/bunzip2.xml
index 8ae17580e..8f69aeb33 100644
--- a/src/etc/testcases/taskdefs/bunzip2.xml
+++ b/src/etc/testcases/taskdefs/bunzip2.xml
@@ -27,7 +27,7 @@
   </target>
 
   <target name="realTest">
-    <bunzip2 src="expected/asf-logo-huge.tar.bz2" dest="${output}/asf-logo-huge.tar" />
+    <bunzip2 src="expected/asf-logo-huge.tar.bz2" dest="${output}/asf-logo-huge.tar"/>
   </target>
 
   <target name="realTestWithResource">
diff --git a/src/etc/testcases/taskdefs/bzip2.xml b/src/etc/testcases/taskdefs/bzip2.xml
index e133dae0a..857b27a97 100644
--- a/src/etc/testcases/taskdefs/bzip2.xml
+++ b/src/etc/testcases/taskdefs/bzip2.xml
@@ -22,7 +22,7 @@
 
   <target name="realTest">
     <bzip2 src="${output}/asf-logo-huge-from-gzip.tar"
-           zipfile="${output}/asf-logo-huge.tar.bz2" />
+           zipfile="${output}/asf-logo-huge.tar.bz2"/>
   </target>
 
   <target name="realTestWithResource">
@@ -33,7 +33,7 @@
 
   <target name="testDateCheck">
     <touch file="${output}/asf-logo.gif.bz2"/>
-    <bzip2 src="../asf-logo.gif" zipfile="${output}/asf-logo.gif.bz2" />
+    <bzip2 src="../asf-logo.gif" zipfile="${output}/asf-logo.gif.bz2"/>
   </target>
 
   <target name="prepare">
diff --git a/src/etc/testcases/taskdefs/checksum.xml b/src/etc/testcases/taskdefs/checksum.xml
index e82fb697c..78f6f6f46 100644
--- a/src/etc/testcases/taskdefs/checksum.xml
+++ b/src/etc/testcases/taskdefs/checksum.xml
@@ -18,19 +18,19 @@
 <project default="cleanup" basedir=".">
 
   <macrodef name="compare">
-    <attribute name="expected" />
-    <attribute name="output" />
+    <attribute name="expected"/>
+    <attribute name="output"/>
     <sequential>
       <loadfile property="expected" srcfile="@{expected}">
-        <filterchain><striplinebreaks /></filterchain>
+        <filterchain><striplinebreaks/></filterchain>
       </loadfile>
       <loadfile property="output" srcfile="@{output}">
-        <filterchain><striplinebreaks /></filterchain>
+        <filterchain><striplinebreaks/></filterchain>
       </loadfile>
       <fail message="${output} not = ${expected}">
         <condition>
           <not>
-            <equals arg1="${output}" arg2="${expected}" />
+            <equals arg1="${output}" arg2="${expected}"/>
           </not>
         </condition>
       </fail>
@@ -38,31 +38,31 @@
   </macrodef>
 
   <macrodef name="testverify">
-    <attribute name="checknologo" default="false" />
-    <element name="stuff" implicit="true" />
+    <attribute name="checknologo" default="false"/>
+    <element name="stuff" implicit="true"/>
     <sequential>
       <fail>
         <condition>
           <or>
-            <isset property="logo.MD5" />
-            <isset property="no.logo.MD5" />
+            <isset property="logo.MD5"/>
+            <isset property="no.logo.MD5"/>
           </or>
         </condition>
       </fail>
-      <stuff />
+      <stuff/>
       <fail>
         <condition>
           <not>
-            <istrue value="${logo.MD5}" /> 
+            <istrue value="${logo.MD5}"/>
           </not>
         </condition>
       </fail>
       <fail>
         <condition>
           <and>
-            <istrue value="@{checknologo}" />
+            <istrue value="@{checknologo}"/>
             <not>
-              <isfalse value="${no.logo.MD5}" />
+              <isfalse value="${no.logo.MD5}"/>
             </not>
           </and>
         </condition>
@@ -70,8 +70,8 @@
       <fail>
         <condition>
           <and>
-            <isfalse value="@{checknologo}" />
-            <isset property="no.logo.MD5" />
+            <isfalse value="@{checknologo}"/>
+            <isset property="no.logo.MD5"/>
           </and>
         </condition>
       </fail>
@@ -79,52 +79,52 @@
   </macrodef>
 
   <target name="cleanup">
-    <delete file="../asf-logo.gif.MD5" />
-    <delete file="../asf-logo.gif.md5" />
-    <delete file="../asf-logo.gif.MD5SUM" />
-    <delete file="../asf-logo.gif.md5sum" />
-    <delete file="../asf-logo.gif.SVF" />
-    <delete file="../asf-logo.gif.svf" />
-    <delete file="../asf-logo.gif.pattern" />
-    <delete file="../asf-logo.gif.PATTERN" />
+    <delete file="../asf-logo.gif.MD5"/>
+    <delete file="../asf-logo.gif.md5"/>
+    <delete file="../asf-logo.gif.MD5SUM"/>
+    <delete file="../asf-logo.gif.md5sum"/>
+    <delete file="../asf-logo.gif.SVF"/>
+    <delete file="../asf-logo.gif.svf"/>
+    <delete file="../asf-logo.gif.pattern"/>
+    <delete file="../asf-logo.gif.PATTERN"/>
     <delete>
       <fileset dir="checksum">
         <include name="**/*.MD5"/>
       </fileset>
     </delete>
-    <delete dir="checksum/checksums" />
+    <delete dir="checksum/checksums"/>
   </target>
 
   <target name="createMd5">
-    <checksum file="../asf-logo.gif" fileext=".MD5" />
-    <compare expected="expected/asf-logo.gif.md5" output="../asf-logo.gif.MD5" />
+    <checksum file="../asf-logo.gif" fileext=".MD5"/>
+    <compare expected="expected/asf-logo.gif.md5" output="../asf-logo.gif.MD5"/>
   </target>
 
   <target name="createMD5SUMformat">
-    <checksum file="../asf-logo.gif" format="MD5SUM" fileext=".MD5SUM" />
-    <compare expected="expected/asf-logo.gif.md5sum" output="../asf-logo.gif.MD5SUM" />
+    <checksum file="../asf-logo.gif" format="MD5SUM" fileext=".MD5SUM"/>
+    <compare expected="expected/asf-logo.gif.md5sum" output="../asf-logo.gif.MD5SUM"/>
   </target>
 
   <target name="createSVFformat">
-    <checksum file="../asf-logo.gif" format="SVF" fileext=".SVF" />
-    <compare expected="expected/asf-logo.gif.svf" output="../asf-logo.gif.SVF" />
+    <checksum file="../asf-logo.gif" format="SVF" fileext=".SVF"/>
+    <compare expected="expected/asf-logo.gif.svf" output="../asf-logo.gif.SVF"/>
   </target>
 
   <target name="createPattern">
-    <checksum file="../asf-logo.gif" pattern="foo{0}bar" fileext=".PATTERN" />
-    <compare expected="expected/asf-logo.gif.pattern" output="../asf-logo.gif.PATTERN" />
+    <checksum file="../asf-logo.gif" pattern="foo{0}bar" fileext=".PATTERN"/>
+    <compare expected="expected/asf-logo.gif.pattern" output="../asf-logo.gif.PATTERN"/>
   </target>
 
   <target name="setProperty">
-    <checksum file="../asf-logo.gif" property="logo.MD5" />
+    <checksum file="../asf-logo.gif" property="logo.MD5"/>
     <fail>
       <condition>
         <or>
           <not>
             <equals arg1="0541d3df42520911f268abc730f3afe0"
-                    arg2="${logo.MD5}" />
+                    arg2="${logo.MD5}"/>
           </not>
-          <available file="../asf-logo.gif.MD5" />
+          <available file="../asf-logo.gif.MD5"/>
         </or>
       </condition>
     </fail>
@@ -132,25 +132,25 @@
 
   <target name="verifyAsTask">
     <testverify checknologo="true">
-      <copy file="expected/asf-logo.gif.md5" todir=".." />
+      <copy file="expected/asf-logo.gif.md5" todir=".."/>
       <checksum file="../asf-logo.gif" fileext=".md5"
-                verifyproperty="logo.MD5" />
+                verifyproperty="logo.MD5"/>
 
       <copy file="checksum.xml" tofile="../asf-logo.gif.MD5"
-            overwrite="true" />
+            overwrite="true"/>
       <checksum file="../asf-logo.gif" fileext=".MD5"
-                verifyproperty="no.logo.MD5" />
+                verifyproperty="no.logo.MD5"/>
     </testverify>
   </target>
 
   <target name="verifyMD5SUMAsTask">
     <testverify checknologo="true">
-      <copy file="expected/asf-logo.gif.md5sum" todir=".." />
+      <copy file="expected/asf-logo.gif.md5sum" todir=".."/>
       <checksum file="../asf-logo.gif" fileext=".md5sum"
                 verifyproperty="logo.MD5" format="MD5SUM"/>
 
       <copy file="checksum.xml" tofile="../asf-logo.gif.MD5SUM"
-            overwrite="true" />
+            overwrite="true"/>
       <checksum file="../asf-logo.gif" fileext=".MD5SUM"
                 verifyproperty="no.logo.MD5" format="MD5SUM"/>
     </testverify>
@@ -158,15 +158,15 @@
 
   <target name="verifyAsCondition">
     <testverify>
-      <copy file="expected/asf-logo.gif.md5" todir=".." />
+      <copy file="expected/asf-logo.gif.md5" todir=".."/>
       <condition property="logo.MD5">
-        <checksum file="../asf-logo.gif" fileext=".md5" />
+        <checksum file="../asf-logo.gif" fileext=".md5"/>
       </condition>
 
       <copy file="checksum.xml" tofile="../asf-logo.gif.MD5"
-            overwrite="true" />
+            overwrite="true"/>
       <condition property="no.logo.MD5">
-        <checksum file="../asf-logo.gif" fileext=".MD5" />
+        <checksum file="../asf-logo.gif" fileext=".MD5"/>
       </condition>
     </testverify>
   </target>
@@ -174,7 +174,7 @@
   <target name="verifyFromProperty">
     <fail>
       <condition>
-        <isset property="verify" />
+        <isset property="verify"/>
       </condition>
     </fail>
     <checksum property="checksum" file="checksum.xml"/>
@@ -183,7 +183,7 @@
     <fail>
       <condition>
         <not>
-          <istrue value="${verify}" />
+          <istrue value="${verify}"/>
         </not>
       </condition>
     </fail>
@@ -198,7 +198,7 @@
     <fail>
       <condition>
         <not>
-          <equals arg1="ef8f1477fcc9bf93832c1a74f629c626" arg2="${total}" />
+          <equals arg1="ef8f1477fcc9bf93832c1a74f629c626" arg2="${total}"/>
         </not>
       </condition>
     </fail>
@@ -215,7 +215,7 @@
     <fail>
       <condition>
         <not>
-          <equals arg1="ef8f1477fcc9bf93832c1a74f629c626" arg2="${total}" />
+          <equals arg1="ef8f1477fcc9bf93832c1a74f629c626" arg2="${total}"/>
         </not>
       </condition>
     </fail>
@@ -230,26 +230,26 @@
     <fail>
       <condition>
         <not>
-          <equals arg1="ef8f1477fcc9bf93832c1a74f629c626" arg2="${total}" />
+          <equals arg1="ef8f1477fcc9bf93832c1a74f629c626" arg2="${total}"/>
         </not>
       </condition>
     </fail>
     <pathconvert property="srcdirfile">
-      <file file="checksum/foo/zap/Eenie.MD5" />
+      <file file="checksum/foo/zap/Eenie.MD5"/>
     </pathconvert>
     <pathconvert property="destdirfile">
-      <file file="checksum/checksums/foo/zap/Eenie.MD5" />
+      <file file="checksum/checksums/foo/zap/Eenie.MD5"/>
     </pathconvert>
     <fail message="Checksums should be written to ${destdirfile}">
       <condition>
         <not>
-          <available file="${destdirfile}" />
+          <available file="${destdirfile}"/>
         </not>
       </condition>
     </fail>
     <fail message="Checksums should not be written to ${srcdirfile}">
       <condition>
-        <available file="${srcdirfile}" />
+        <available file="${srcdirfile}"/>
       </condition>
     </fail>
   </target>
diff --git a/src/etc/testcases/taskdefs/classloader.xml b/src/etc/testcases/taskdefs/classloader.xml
index 02e47ab5d..21ecf0f8d 100644
--- a/src/etc/testcases/taskdefs/classloader.xml
+++ b/src/etc/testcases/taskdefs/classloader.xml
@@ -19,22 +19,22 @@
 
   <target name="init">
 
-    <path id="myJars" >
+    <path id="myJars">
       <!-- both ant-junit.jar and junit.jar must be loaded from the same path -->
-      <pathelement path="${ant.home}/lib/ant-junit.jar" />
-      <pathelement path="${junit.jar}" />
+      <pathelement path="${ant.home}/lib/ant-junit.jar"/>
+      <pathelement path="${junit.jar}"/>
     </path>
 
-    <classloader classpathRef="myJars" 
-                 reverse="true" >
-      
+    <classloader classpathRef="myJars"
+                 reverse="true">
+
     </classloader>
-    <junit />
-  
+    <junit/>
+
   </target>
 
   <target name="main" depends="init">
-    <echo message="Found JUNIT" />
+    <echo message="Found JUNIT"/>
   </target>
 
 </project>
diff --git a/src/etc/testcases/taskdefs/concat.xml b/src/etc/testcases/taskdefs/concat.xml
index 235b15289..394cba0b2 100644
--- a/src/etc/testcases/taskdefs/concat.xml
+++ b/src/etc/testcases/taskdefs/concat.xml
@@ -18,10 +18,10 @@
 
 <project name="concat-test" basedir="." default="test1">
 
-  <property name="tmp.file" value="concat.tmp" />
-  <property name="tmp.file.2" value="concat.tmp.2" />
+  <property name="tmp.file" value="concat.tmp"/>
+  <property name="tmp.file.2" value="concat.tmp.2"/>
 
-  <property name="world" value="World" />
+  <property name="world" value="World"/>
 
   <target name="cleanup">
     <delete file="TESTDEST"/>
@@ -49,8 +49,8 @@
 
   <target name="test4">
     <concat destfile="${tmp.file.2}">
-      <fileset dir="${basedir}" includes="${tmp.file}" />
-      <filelist dir="${basedir}" files="${tmp.file},${tmp.file}" />
+      <fileset dir="${basedir}" includes="${tmp.file}"/>
+      <filelist dir="${basedir}" files="${tmp.file},${tmp.file}"/>
     </concat>
   </target>
 
@@ -158,7 +158,7 @@
       </filterchain>
     </concat>
   </target>
-  
+
   <target name="testmultireader">
     <concat destfile="${tmp.file}">Hello, World
     </concat>
@@ -183,7 +183,7 @@
       </filterchain>
     </concat>
   </target>
-  
+
   <target name="create-noel">
     <concat destfile="concat.noeol">This has no end of line</concat>
   </target>
diff --git a/src/etc/testcases/taskdefs/condition.xml b/src/etc/testcases/taskdefs/condition.xml
index 81660ae6e..416394aa2 100644
--- a/src/etc/testcases/taskdefs/condition.xml
+++ b/src/etc/testcases/taskdefs/condition.xml
@@ -21,14 +21,14 @@
 
   <target name="basic">
     <condition property="basic">
-      <equals arg1="a" arg2="a" />
+      <equals arg1="a" arg2="a"/>
     </condition>
     <echo>${basic}</echo>
   </target>
 
   <target name="condition-incomplete">
-    <condition >
-      <equals arg1="a" arg2="a" />
+    <condition>
+      <equals arg1="a" arg2="a"/>
     </condition>
   </target>
 
@@ -40,21 +40,21 @@
   <target name="shortcut">
     <property name="shortcut" value="set"/>
     <condition property="shortcut">
-      <equals arg1="a" arg2="a" />
+      <equals arg1="a" arg2="a"/>
     </condition>
     <echo>${shortcut}</echo>
   </target>
 
   <target name="dontset">
     <condition property="dontset">
-      <equals arg1="a" arg2="b" />
+      <equals arg1="a" arg2="b"/>
     </condition>
     <echo>${dontset}</echo>
   </target>
 
   <target name="setvalue">
-    <condition property="setvalue" value="woowoo" >
-      <equals arg1="a" arg2="a" />
+    <condition property="setvalue" value="woowoo">
+      <equals arg1="a" arg2="a"/>
     </condition>
     <echo>${setvalue}</echo>
   </target>
@@ -62,7 +62,7 @@
   <target name="negation">
     <condition property="negation">
       <not>
-        <equals arg1="a" arg2="B" />
+        <equals arg1="a" arg2="B"/>
       </not>
     </condition>
     <echo>${negation}</echo>
@@ -71,7 +71,7 @@
   <target name="negationfalse">
     <condition property="negationfalse">
       <not>
-        <equals arg1="a" arg2="a" />
+        <equals arg1="a" arg2="a"/>
       </not>
     </condition>
     <echo>${negationfalse}</echo>
@@ -79,7 +79,7 @@
 
   <target name="negationincomplete">
     <condition property="negationincomplete">
-      <not />
+      <not/>
     </condition>
     <echo>${negationincomplete}</echo>
   </target>
@@ -87,8 +87,8 @@
   <target name="and">
     <condition property="and">
       <and>
-        <equals arg1="a" arg2="a" />
-        <equals arg1="B" arg2="B" />
+        <equals arg1="a" arg2="a"/>
+        <equals arg1="B" arg2="B"/>
       </and>
     </condition>
     <echo>${and}</echo>
@@ -97,8 +97,8 @@
   <target name="andfails">
     <condition property="andfails">
       <and>
-        <equals arg1="a" arg2="B" />
-        <equals arg1="B" arg2="a" />
+        <equals arg1="a" arg2="B"/>
+        <equals arg1="B" arg2="a"/>
       </and>
     </condition>
     <echo>${andfails}</echo>
@@ -107,7 +107,7 @@
   <target name="andincomplete">
     <condition property="andincomplete">
       <and>
-        <equals arg1="a" arg2="B" />
+        <equals arg1="a" arg2="B"/>
       </and>
     </condition>
     <echo>${andincomplete}</echo>
@@ -123,8 +123,8 @@
   <target name="or">
     <condition property="or">
       <or>
-        <equals arg1="a" arg2="B" />
-        <equals arg1="B" arg2="B" />
+        <equals arg1="a" arg2="B"/>
+        <equals arg1="B" arg2="B"/>
       </or>
     </condition>
     <echo>${or}</echo>
@@ -133,7 +133,7 @@
   <target name="orincomplete">
     <condition property="orincomplete">
       <or>
-        <equals arg1="a" arg2="a" />
+        <equals arg1="a" arg2="a"/>
       </or>
     </condition>
     <echo>${orincomplete}</echo>
@@ -149,8 +149,8 @@
   <target name="orfails">
     <condition property="orfails">
       <or>
-        <equals arg1="a" arg2="B" />
-        <equals arg1="B" arg2="a" />
+        <equals arg1="a" arg2="B"/>
+        <equals arg1="B" arg2="a"/>
       </or>
     </condition>
     <echo>${orfails}</echo>
@@ -159,23 +159,23 @@
   <target name="orboth">
     <condition property="orboth">
       <or>
-        <equals arg1="a" arg2="a" />
-        <equals arg1="B" arg2="B" />
+        <equals arg1="a" arg2="a"/>
+        <equals arg1="B" arg2="B"/>
       </or>
     </condition>
     <echo>${orboth}</echo>
   </target>
 
-  <target name="filesmatch-identical" >
+  <target name="filesmatch-identical">
     <condition property="filesmatch-identical">
         <filesmatch
           file1="condition.xml"
-          file2="condition.xml" />
+          file2="condition.xml"/>
     </condition>
     <echo>${filesmatch-identical}</echo>
   </target>
 
-  <target name="filesmatch-incomplete" >
+  <target name="filesmatch-incomplete">
     <condition property="filesmatch-incomplete">
         <filesmatch
           file1="condition.xml"/>
@@ -183,20 +183,20 @@
     <echo>${filesmatch-incomplete}</echo>
   </target>
 
-  <target name="filesmatch-oddsizes" >
+  <target name="filesmatch-oddsizes">
     <condition property="filesmatch-oddsizes">
         <filesmatch
           file1="condition.xml"
-          file2="property.xml" />
+          file2="property.xml"/>
     </condition>
     <echo>${filesmatch-oddsizes}</echo>
   </target>
 
-  <target name="filesmatch-existence" >
+  <target name="filesmatch-existence">
     <condition property="filesmatch-existence">
       <filesmatch
         file1="condition.xml"
-        file2="this-file-doesnt-exist.xml" />
+        file2="this-file-doesnt-exist.xml"/>
     </condition>
     <echo>${filesmatch-existence}</echo>
   </target>
@@ -205,67 +205,67 @@
     <fail>
       <condition>
         <not>
-          <filesmatch file1="idonotexist" file2="andneitherdoi" />
+          <filesmatch file1="idonotexist" file2="andneitherdoi"/>
         </not>
       </condition>
     </fail>
   </target>
 
   <target name="filesmatch-different">
-    <echo file="match1.txt" message="012345676890" />
-    <echo file="match2.txt" message="012345676889" />
+    <echo file="match1.txt" message="012345676890"/>
+    <echo file="match2.txt" message="012345676889"/>
     <condition property="filesmatch-different">
       <filesmatch
         file1="match1.txt"
-        file2="match2.txt" />
+        file2="match2.txt"/>
     </condition>
     <echo>${filesmatch-different}</echo>
   </target>
 
-  <target name="filesmatch-match" >
-    <echo file="match3.txt" message="012345676890" />
-    <echo file="match4.txt" message="012345676890" />
+  <target name="filesmatch-match">
+    <echo file="match3.txt" message="012345676890"/>
+    <echo file="match4.txt" message="012345676890"/>
     <condition property="filesmatch-match">
       <filesmatch
         file1="match3.txt"
-        file2="match4.txt" />
+        file2="match4.txt"/>
     </condition>
     <echo>${filesmatch-match}</echo>
   </target>
 
-  <target name="filesmatch-different-eol" >
-    <echo file="match7.txt" message="012345676890" />
-    <echo file="match8.txt" message="012345676890" />
-    <fixcrlf file="match7.txt" eol="cr" fixlast="true" />
-    <fixcrlf file="match8.txt" eol="lf" fixlast="true" />
+  <target name="filesmatch-different-eol">
+    <echo file="match7.txt" message="012345676890"/>
+    <echo file="match8.txt" message="012345676890"/>
+    <fixcrlf file="match7.txt" eol="cr" fixlast="true"/>
+    <fixcrlf file="match8.txt" eol="lf" fixlast="true"/>
     <fail>
       <condition>
-        <filesmatch file1="match7.txt" file2="match8.txt" />
+        <filesmatch file1="match7.txt" file2="match8.txt"/>
       </condition>
     </fail>
   </target>
 
-  <target name="filesmatch-same-eol" >
-    <echo file="match9.txt" message="012345676890" />
-    <echo file="match10.txt" message="012345676890" />
-    <fixcrlf file="match9.txt" eol="crlf" fixlast="true" />
-    <fixcrlf file="match10.txt" eol="lf" fixlast="true" />
+  <target name="filesmatch-same-eol">
+    <echo file="match9.txt" message="012345676890"/>
+    <echo file="match10.txt" message="012345676890"/>
+    <fixcrlf file="match9.txt" eol="crlf" fixlast="true"/>
+    <fixcrlf file="match10.txt" eol="lf" fixlast="true"/>
     <fail>
       <condition>
         <not>
-          <filesmatch file1="match9.txt" file2="match10.txt" textfile="true" />
+          <filesmatch file1="match9.txt" file2="match10.txt" textfile="true"/>
         </not>
       </condition>
     </fail>
   </target>
 
   <target name="filesmatch-different-sizes">
-    <echo file="match5.txt" message="012345676890" />
-    <echo file="match6.txt" message="0123456768" />
+    <echo file="match5.txt" message="012345676890"/>
+    <echo file="match6.txt" message="0123456768"/>
     <condition property="filesmatch-different-sizes">
       <filesmatch
         file1="match5.txt"
-        file2="match6.txt" />
+        file2="match6.txt"/>
     </condition>
     <echo>${filesmatch-different-sizes}</echo>
   </target>
@@ -274,146 +274,146 @@
     <condition property="filesmatch-different-sizes">
       <filesmatch
         file1="condition.xml"
-        file2="missing-file.txt" />
+        file2="missing-file.txt"/>
     </condition>
     <echo>${filesmatch-different-onemissing}</echo>
   </target>
 
-  <target name="contains" >
+  <target name="contains">
     <condition property="contains">
       <contains
         string="abcd"
-        substring="cd" />
+        substring="cd"/>
     </condition>
     <echo>${contains}</echo>
   </target>
 
-  <target name="contains-doesnt" >
+  <target name="contains-doesnt">
     <condition property="contains-doesnt">
       <contains
         string="abcd"
-        substring="CD" />
+        substring="CD"/>
     </condition>
     <echo>${contains-doesnt}</echo>
   </target>
 
-  <target name="contains-anycase" >
+  <target name="contains-anycase">
     <condition property="contains-anycase">
       <contains casesensitive="false"
         string="abcd"
-        substring="CD" />
+        substring="CD"/>
     </condition>
     <echo>${contains-anycase}</echo>
   </target>
 
-  <target name="contains-incomplete1" >
+  <target name="contains-incomplete1">
     <condition property="contains-incomplete1">
       <contains
-        string="abcd" />
+        string="abcd"/>
     </condition>
     <echo>${contains-incomplete1}</echo>
   </target>
 
-  <target name="contains-incomplete2" >
+  <target name="contains-incomplete2">
     <condition property="contains-incomplete2">
       <contains
-        substring="CD" />
+        substring="CD"/>
     </condition>
     <echo>${contains-incomplete2}</echo>
   </target>
 
-  <target name="istrue" >
-    <property name="t" value="true" />
-    <property name="o" value="o" />
-    <property name="n" value="n" />
+  <target name="istrue">
+    <property name="t" value="true"/>
+    <property name="o" value="o"/>
+    <property name="n" value="n"/>
     <condition property="istrue">
       <and>
-        <istrue value="${t}" />
-        <istrue value="TRUE" />
-        <istrue value="yes" />
-        <istrue value="YeS" />
-        <istrue value="on" />
-        <istrue value="${o}${n}" />
+        <istrue value="${t}"/>
+        <istrue value="TRUE"/>
+        <istrue value="yes"/>
+        <istrue value="YeS"/>
+        <istrue value="on"/>
+        <istrue value="${o}${n}"/>
       </and>
     </condition>
     <echo>${istrue}</echo>
   </target>
 
-  <target name="istrue-not" >
+  <target name="istrue-not">
     <condition property="istrue-not">
       <istrue
-        value="this sentence is true" />
+        value="this sentence is true"/>
     </condition>
     <echo>${istrue-not}</echo>
   </target>
 
-  <target name="istrue-false" >
+  <target name="istrue-false">
     <condition property="istrue-false">
       <or>
-        <istrue value="false" />
-        <istrue value="" />
+        <istrue value="false"/>
+        <istrue value=""/>
       </or>
     </condition>
     <echo>${istrue-false}</echo>
   </target>
 
-  <target name="istrue-incomplete" >
+  <target name="istrue-incomplete">
     <condition property="istrue-incomplete">
-      <istrue />
+      <istrue/>
     </condition>
     <echo>${istrue-incomplete}</echo>
   </target>
 
-  <target name="isfalse-true" >
-    <property name="t" value="true" />
+  <target name="isfalse-true">
+    <property name="t" value="true"/>
     <condition property="isfalse-true">
       <isfalse
-        value="${t}" />
+        value="${t}"/>
     </condition>
     <echo>${isfalse-true}</echo>
   </target>
 
-  <target name="isfalse-not" >
+  <target name="isfalse-not">
     <condition property="isfalse-not">
       <isfalse
-        value="this sentence is true" />
+        value="this sentence is true"/>
     </condition>
     <echo>${isfalse-not}</echo>
   </target>
 
-  <target name="isfalse-false" >
+  <target name="isfalse-false">
     <condition property="isfalse-false">
       <isfalse
-        value="false" />
+        value="false"/>
     </condition>
     <echo>${isfalse-false}</echo>
   </target>
 
-  <target name="isfalse-incomplete" >
+  <target name="isfalse-incomplete">
     <condition property="isfalse-incomplete">
-      <isfalse />
+      <isfalse/>
     </condition>
     <echo>${isfalse-incomplete}</echo>
   </target>
 
   <target name="testElse">
     <condition property="unset" value="foo">
-      <or />
+      <or/>
     </condition>
     <condition property="value" value="foo" else="bar">
-      <and />
+      <and/>
     </condition>
     <condition property="else" value="foo" else="bar">
-      <or />
+      <or/>
     </condition>
     <fail>
       <condition>
         <or>
-          <isset property="unset" />
+          <isset property="unset"/>
           <not>
             <and>
-              <equals arg1="${value}" arg2="foo" />
-              <equals arg1="${else}" arg2="bar" />
+              <equals arg1="${value}" arg2="foo"/>
+              <equals arg1="${else}" arg2="bar"/>
             </and>
           </not>
         </or>
@@ -423,14 +423,14 @@
 
   <target name="resourcesmatch-error">
     <condition property="errorexpected">
-      <resourcesmatch />
+      <resourcesmatch/>
     </condition>
   </target>
 
   <target name="resourcesmatch-match-empty">
     <condition property="errorexpected">
       <resourcesmatch>
-        <resources />
+        <resources/>
       </resourcesmatch>
     </condition>
   </target>
@@ -438,7 +438,7 @@
   <target name="resourcesmatch-match-one">
     <condition property="errorexpected">
       <resourcesmatch>
-        <string value="foo" />
+        <string value="foo"/>
       </resourcesmatch>
     </condition>
   </target>
@@ -448,8 +448,8 @@
       <condition>
         <not>
           <resourcesmatch>
-            <string value="foo" />
-            <string value="foo" />
+            <string value="foo"/>
+            <string value="foo"/>
           </resourcesmatch>
         </not>
       </condition>
@@ -461,9 +461,9 @@
       <condition>
         <not>
           <resourcesmatch>
-            <string value="foo" />
-            <string value="foo" />
-            <string value="foo" />
+            <string value="foo"/>
+            <string value="foo"/>
+            <string value="foo"/>
           </resourcesmatch>
         </not>
       </condition>
@@ -471,27 +471,27 @@
   </target>
 
   <target name="resourcesmatch-differ">
-    <echo file="match11.txt" message="foo" />
-    <fixcrlf file="match11.txt" eol="crlf" fixlast="true" />
+    <echo file="match11.txt" message="foo"/>
+    <fixcrlf file="match11.txt" eol="crlf" fixlast="true"/>
     <fail>
       <condition>
         <resourcesmatch>
-          <file file="match11.txt" />
-          <string value="foo" />
+          <file file="match11.txt"/>
+          <string value="foo"/>
         </resourcesmatch>
       </condition>
     </fail>
   </target>
 
   <target name="resourcesmatch-match-text">
-    <echo file="match11.txt" message="foo" />
-    <fixcrlf file="match11.txt" eol="crlf" />
+    <echo file="match11.txt" message="foo"/>
+    <fixcrlf file="match11.txt" eol="crlf"/>
     <fail>
       <condition>
         <not>
           <resourcesmatch astext="true">
-            <file file="match11.txt" />
-            <string value="foo" />
+            <file file="match11.txt"/>
+            <string value="foo"/>
           </resourcesmatch>
         </not>
       </condition>
@@ -503,18 +503,18 @@
       <condition>
         <not>
           <resourcesmatch>
-            <resource name="foo" exists="false" />
-            <resource name="bar" exists="false" />
-            <resource name="baz" exists="false" />
+            <resource name="foo" exists="false"/>
+            <resource name="bar" exists="false"/>
+            <resource name="baz" exists="false"/>
           </resourcesmatch>
         </not>
       </condition>
     </fail>
   </target>
 
-  <target name="cleanup" >
+  <target name="cleanup">
     <delete>
-      <fileset dir="." includes="match?.txt,match??.txt" />
+      <fileset dir="." includes="match?.txt,match??.txt"/>
     </delete>
   </target>
 
diff --git a/src/etc/testcases/taskdefs/conditions/antversion.xml b/src/etc/testcases/taskdefs/conditions/antversion.xml
index 80a113328..f59be0cd0 100644
--- a/src/etc/testcases/taskdefs/conditions/antversion.xml
+++ b/src/etc/testcases/taskdefs/conditions/antversion.xml
@@ -21,7 +21,7 @@
                 <fail>
                         <condition>
                                 <not>
-                                        <antversion atleast="1.7" />
+                                        <antversion atleast="1.7"/>
                                 </not>
                         </condition>
                 Should be at least 1.7
@@ -32,7 +32,7 @@
                 <fail>
                         <condition>
                                 <not>
-                                        <antversion exactly="1.10.5" />
+                                        <antversion exactly="1.10.5"/>
                                 </not>
                         </condition>
                         Should be exactly 1.10.5
@@ -40,11 +40,11 @@
         </target>
 
         <target name="testatleastfail">
-                <property name="version" value="1.8.9" />
+                <property name="version" value="1.8.9"/>
                 <fail>
                         <condition>
                                 <not>
-                                        <antversion atleast="1.9.8" />
+                                        <antversion atleast="1.9.8"/>
                                 </not>
                         </condition>
                 Should be at least 1.9.8
@@ -52,11 +52,11 @@
         </target>
 
         <target name="testexactlyfail">
-                <property name="version" value="1.8.0" />
+                <property name="version" value="1.8.0"/>
                 <fail>
                         <condition>
                                 <not>
-                                        <antversion exactly="1.9.8" />
+                                        <antversion exactly="1.9.8"/>
                                 </not>
                         </condition>
                   Should be exactly 1.9.8
diff --git a/src/etc/testcases/taskdefs/conditions/isfailure.xml b/src/etc/testcases/taskdefs/conditions/isfailure.xml
index b5d1a6a41..1dde9e715 100644
--- a/src/etc/testcases/taskdefs/conditions/isfailure.xml
+++ b/src/etc/testcases/taskdefs/conditions/isfailure.xml
@@ -22,37 +22,37 @@
       <condition>
         <or>
           <and>
-            <os family="openvms" />
+            <os family="openvms"/>
             <or>
-              <isfailure code="1" />
-              <isfailure code="3" />
-              <isfailure code="5" />
-              <isfailure code="7" />
-              <isfailure code="9" />
+              <isfailure code="1"/>
+              <isfailure code="3"/>
+              <isfailure code="5"/>
+              <isfailure code="7"/>
+              <isfailure code="9"/>
               <not>
                 <and>
-                  <isfailure code="0" />
-                  <isfailure code="2" />
-                  <isfailure code="4" />
-                  <isfailure code="6" />
-                  <isfailure code="8" />
+                  <isfailure code="0"/>
+                  <isfailure code="2"/>
+                  <isfailure code="4"/>
+                  <isfailure code="6"/>
+                  <isfailure code="8"/>
                 </and>
               </not>
             </or>
           </and>
           <and>
             <not>
-              <os family="openvms" />
+              <os family="openvms"/>
             </not>
             <or>
-              <isfailure code="0" />
+              <isfailure code="0"/>
               <not>
                 <and>
-                  <isfailure code="1" />
-                  <isfailure code="10" />
-                  <isfailure code="50" />
-                  <isfailure code="100" />
-                  <isfailure code="255" />
+                  <isfailure code="1"/>
+                  <isfailure code="10"/>
+                  <isfailure code="50"/>
+                  <isfailure code="100"/>
+                  <isfailure code="255"/>
                 </and>
               </not>
             </or>
diff --git a/src/etc/testcases/taskdefs/conditions/issigned.xml b/src/etc/testcases/taskdefs/conditions/issigned.xml
index 7cbf328fe..f4906dcbf 100644
--- a/src/etc/testcases/taskdefs/conditions/issigned.xml
+++ b/src/etc/testcases/taskdefs/conditions/issigned.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="all">
-  
+
   <target name="pass" description="check if a name of pass is ok">
     <fail message="name of pass not seen in the signed pass.jar">
       <condition>
diff --git a/src/etc/testcases/taskdefs/conditions/parsersupports.xml b/src/etc/testcases/taskdefs/conditions/parsersupports.xml
index c80fd3501..5bc52322b 100644
--- a/src/etc/testcases/taskdefs/conditions/parsersupports.xml
+++ b/src/etc/testcases/taskdefs/conditions/parsersupports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="parsersupports" >
+<project name="parsersupports">
 <!--
  *   Licensed to the Apache Software Foundation (ASF) under one or more
  *  contributor license agreements.  See the NOTICE file distributed with
@@ -20,7 +20,7 @@
 
   <target name="testEmpty">
     <condition property="empty">
-      <parsersupports />
+      <parsersupports/>
     </condition>
     <fail>Expected failure before here</fail>
   </target>
@@ -34,7 +34,7 @@
 
   <target name="testNamespaces">
     <fail>
-    <condition >
+    <condition>
       <not>
         <parsersupports feature="http://xml.org/sax/features/namespaces"/>
       </not>
@@ -61,14 +61,13 @@
       <condition>
         <not>
           <parsersupports
-            property="http://xml.org/sax/properties/declaration-handler"
-              />
+            property="http://xml.org/sax/properties/declaration-handler"/>
         </not>
       </condition>
       Expected no property
     </fail>
   </target>
-  
+
   <target name="testUnknownProperty">
     <fail>
       <condition>
@@ -78,7 +77,7 @@
       Expected unsupported property.
     </fail>
   </target>
-  
+
   <target name="testXercesProperty">
     <fail>
       <condition>
@@ -91,5 +90,5 @@
       Expected XSD support on Xerces.
     </fail>
   </target>
-  
-</project>
\ No newline at end of file
+
+</project>
diff --git a/src/etc/testcases/taskdefs/conditions/typefound.xml b/src/etc/testcases/taskdefs/conditions/typefound.xml
index 054ca6733..938f1f32b 100644
--- a/src/etc/testcases/taskdefs/conditions/typefound.xml
+++ b/src/etc/testcases/taskdefs/conditions/typefound.xml
@@ -27,7 +27,7 @@
 
     <target name="testUndefined">
         <condition property="testUndefined">
-            <typefound />
+            <typefound/>
         </condition>
     </target>
 
@@ -72,4 +72,4 @@
         </condition>
     </target>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/src/etc/testcases/taskdefs/conditions/xor.xml b/src/etc/testcases/taskdefs/conditions/xor.xml
index 895dccdbe..3ba32b3bd 100644
--- a/src/etc/testcases/taskdefs/conditions/xor.xml
+++ b/src/etc/testcases/taskdefs/conditions/xor.xml
@@ -17,9 +17,9 @@
 -->
 <project default="all">
 
-<!-- 
+<!--
   Xor semantics
-  
+
   in  out
   ==  ===
   00   0
@@ -29,7 +29,7 @@
 
 -->
 
-  <target name="testEmpty" >
+  <target name="testEmpty">
     <fail message="empty test">
       <condition>
           <xor/>
@@ -37,76 +37,76 @@
     </fail>
   </target>
 
-  <target name="test1" >
+  <target name="test1">
     <fail message="testTrue">
       <condition>
         <not>
           <xor>
-            <istrue value="true" />
+            <istrue value="true"/>
           </xor>
         </not>
       </condition>
     </fail>
   </target>
-  
-  <target name="test0" >
+
+  <target name="test0">
     <fail message="testFalse">
       <condition>
           <xor>
-            <istrue value="" />
+            <istrue value=""/>
           </xor>
       </condition>
     </fail>
   </target>
 
-  
-  <target name="test10" >
+
+  <target name="test10">
     <fail message="test10">
       <condition>
         <not>
           <xor>
-            <istrue value="true" />
-            <istrue value="" />
+            <istrue value="true"/>
+            <istrue value=""/>
           </xor>
         </not>
       </condition>
     </fail>
   </target>
 
-  <target name="test01" >
+  <target name="test01">
     <fail message="test01">
       <condition>
         <not>
           <xor>
-            <istrue value="" />
-            <istrue value="true" />
+            <istrue value=""/>
+            <istrue value="true"/>
           </xor>
         </not>
       </condition>
     </fail>
   </target>
-  
-  <target name="test00" >
+
+  <target name="test00">
     <fail message="test10">
       <condition>
         <xor>
-            <istrue value="" />
-            <istrue value="" />
+            <istrue value=""/>
+            <istrue value=""/>
         </xor>
       </condition>
     </fail>
   </target>
-  
-  <target name="test11" >
+
+  <target name="test11">
     <fail message="test11">
       <condition>
           <xor>
-            <istrue value="" />
-            <istrue value="" />
+            <istrue value=""/>
+            <istrue value=""/>
           </xor>
       </condition>
     </fail>
   </target>
 
-  
+
 </project>
diff --git a/src/etc/testcases/taskdefs/copy.xml b/src/etc/testcases/taskdefs/copy.xml
index 2601556fe..3b7f74a83 100644
--- a/src/etc/testcases/taskdefs/copy.xml
+++ b/src/etc/testcases/taskdefs/copy.xml
@@ -21,11 +21,11 @@
   <import file="../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
   </target>
 
   <target name="test1">
-    <copy file="copy.xml" tofile="${output}/copytest1.tmp" />
+    <copy file="copy.xml" tofile="${output}/copytest1.tmp"/>
   </target>
 
   <target name="test2">
@@ -42,7 +42,7 @@ PRODUCT_BUILD=6.5 (BLD_65036)
     </concat>
     <copy file="${output}/copy.filter.inp" tofile="${output}/copy.filter.out">
       <filterset begintoken="6" endtoken="4">
-        <filter token=".2.1." value="2.6.4" />
+        <filter token=".2.1." value="2.6.4"/>
       </filterset>
     </copy>
     <concat><path path="${output}/copy.filter.out"/></concat>
@@ -68,14 +68,14 @@ a=b=
     <copy file="copy.xml" tofile="${output}/copytest3b.tmp" overwrite="true"/>
       </target><target name="test3Part2">
     <!-- copy an old file onto a newer file (should not work) -->
-    <copy file="${output}/copytest3.tmp" tofile="${output}/copytest3b.tmp" />
+    <copy file="${output}/copytest3.tmp" tofile="${output}/copytest3b.tmp"/>
     <!-- copy an older file onto a new one, should succeed -->
     <copy file="${output}/copytest3.tmp" tofile="${output}/copytest3c.tmp"
       overwrite="true"
-      preservelastmodified="true" />
+      preservelastmodified="true"/>
     <!-- copy a newer file onto an older one (should work) -->
     <copy file="${output}/copytest3a.tmp" tofile="${output}/copytest3.tmp"
-      preservelastmodified="true" />
+      preservelastmodified="true"/>
     <!-- expected state :
       3a.tmp==3.tmp==copy.xml
       timeof(3a.tmp)==timeof(3.tmp)==now()-4
@@ -219,46 +219,46 @@ a=b=
   <target name="prepareDirset">
     <touch mkdirs="true">
       <filelist dir="${from.dir}/dirset">
-        <file name="a/x/foo" />
-        <file name="a/y/foo" />
-        <file name="a/z/foo" />
-        <file name="b/x/foo" />
-        <file name="b/y/foo" />
-        <file name="b/z/foo" />
+        <file name="a/x/foo"/>
+        <file name="a/y/foo"/>
+        <file name="a/z/foo"/>
+        <file name="b/x/foo"/>
+        <file name="b/y/foo"/>
+        <file name="b/z/foo"/>
       </filelist>
     </touch>
     <fail>
       <condition>
         <or>
           <resourcecount when="ne" count="9">
-            <dirset id="dirset" dir="${from.dir}/dirset" />
+            <dirset id="dirset" dir="${from.dir}/dirset"/>
           </resourcecount>
           <resourcecount when="ne" count="6">
-            <fileset dir="${from.dir}/dirset" />
+            <fileset dir="${from.dir}/dirset"/>
           </resourcecount>
         </or>
       </condition>
     </fail>
-    <delete dir="${to.dir}/dirset" />
+    <delete dir="${to.dir}/dirset"/>
     <fail>
       <condition>
-        <available file="${to.dir}/dirset" />
+        <available file="${to.dir}/dirset"/>
       </condition>
     </fail>
   </target>
 
   <target name="testDirset" depends="prepareDirset">
     <copy todir="${to.dir}/dirset">
-      <resources refid="dirset" />
+      <resources refid="dirset"/>
     </copy>
     <fail>
       <condition>
         <or>
           <resourcecount when="ne" count="9">
-            <dirset dir="${to.dir}/dirset" />
+            <dirset dir="${to.dir}/dirset"/>
           </resourcecount>
           <resourcecount when="ne" count="0">
-            <fileset dir="${to.dir}/dirset" />
+            <fileset dir="${to.dir}/dirset"/>
           </resourcecount>
         </or>
       </condition>
diff --git a/src/etc/testcases/taskdefs/copydir.xml b/src/etc/testcases/taskdefs/copydir.xml
index 8a8abd362..7bacfd9ee 100644
--- a/src/etc/testcases/taskdefs/copydir.xml
+++ b/src/etc/testcases/taskdefs/copydir.xml
@@ -21,7 +21,7 @@
   <import file="../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
   </target>
 
   <target name="test1">
@@ -37,18 +37,18 @@
   </target>
 
   <target name="test4">
-    <copydir src="." 
+    <copydir src="."
              dest="."/>
   </target>
 
   <target name="test5">
-    <mkdir dir="${output}/taskdefs.tmp" />
-    <copydir src="." 
+    <mkdir dir="${output}/taskdefs.tmp"/>
+    <copydir src="."
              dest="${output}/taskdefs.tmp"/>
   </target>
 
   <target name="test6">
-    <copydir src="." 
+    <copydir src="."
              dest="template.xml"/>
   </target>
 
diff --git a/src/etc/testcases/taskdefs/copyfile.xml b/src/etc/testcases/taskdefs/copyfile.xml
index 0f8c9ab00..798b12dfd 100644
--- a/src/etc/testcases/taskdefs/copyfile.xml
+++ b/src/etc/testcases/taskdefs/copyfile.xml
@@ -21,7 +21,7 @@
   <import file="../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
   </target>
 
   <target name="test1">
@@ -37,12 +37,12 @@
   </target>
 
   <target name="test4">
-    <copyfile src="template.xml" 
+    <copyfile src="template.xml"
              dest="template.xml"/>
   </target>
 
   <target name="test5">
-    <copyfile src="copyfile.xml" 
+    <copyfile src="copyfile.xml"
              dest="${output}/copyfile.tmp"/>
   </target>
 
@@ -50,7 +50,7 @@
     <mkdir dir="${output}/testdir"/>
     <copyfile src="copyfile.xml"
               dest="${output}/testdir"
-              forceoverwrite="true" />
+              forceoverwrite="true"/>
   </target>
 
 </project>
diff --git a/src/etc/testcases/taskdefs/cvspass.xml b/src/etc/testcases/taskdefs/cvspass.xml
index bbca110fe..690dfcfdf 100644
--- a/src/etc/testcases/taskdefs/cvspass.xml
+++ b/src/etc/testcases/taskdefs/cvspass.xml
@@ -21,23 +21,21 @@
   <taskdef name="cvspass" classname="org.apache.tools.ant.taskdefs.CVSPass"/>
 
   <target name="test1">
-    <cvspass />
+    <cvspass/>
   </target>
- 
+
   <target name="test2">
     <cvspass
       cvsroot=":pserver:anoncvs@jakarta.apache.org:/home/cvspublic"
-      passfile="testpassfile.tmp"
-    />
+      passfile="testpassfile.tmp"%/>
   </target>
- 
+
   <!-- testPassFile -->
   <target name="test3">
     <cvspass
       cvsroot=":pserver:anoncvs@jakarta.apache.org:/home/cvspublic"
       password="anoncvs"
-      passfile="testpassfile.tmp"
-    />
+      passfile="testpassfile.tmp"/>
   </target>
 
   <!-- testPassFileDuplicateEntry -->
@@ -45,18 +43,15 @@
     <cvspass
       cvsroot=":pserver:anoncvs@jakarta.apache.org:/home/cvspublic"
       password="anoncvs"
-      passfile="testpassfile.tmp"
-    />
+      passfile="testpassfile.tmp"/>
     <cvspass
       cvsroot=":pserver:anoncvs@jakarta.apache.org:/home/cvspublic"
       password="anoncvs"
-      passfile="testpassfile.tmp"
-    />
+      passfile="testpassfile.tmp"/>
     <cvspass
       cvsroot=":pserver:guest@cvs.tigris.org:/cvs"
       password="guest"
-      passfile="testpassfile.tmp"
-    />
+      passfile="testpassfile.tmp"/>
   </target>
 
   <!-- testPassFileMultipleEntry -->
@@ -64,21 +59,18 @@
     <cvspass
       cvsroot=":pserver:anoncvs@jakarta.apache.org:/home/cvspublic"
       password="anoncvs"
-      passfile="testpassfile.tmp"
-    />
+      passfile="testpassfile.tmp"/>
     <cvspass
       cvsroot=":pserver:anoncvs@xml.apache.org:/home/cvspublic"
       password="anoncvs"
-      passfile="testpassfile.tmp"
-    />
+      passfile="testpassfile.tmp"/>
     <cvspass
       cvsroot=":pserver:guest@cvs.tigris.org:/cvs"
       password="guest"
-      passfile="testpassfile.tmp"
-    />
+      passfile="testpassfile.tmp"/>
   </target>
 
-  <target name="cleanup"> 
+  <target name="cleanup">
     <delete file="testpassfile.tmp"/>
   </target>
 
diff --git a/src/etc/testcases/taskdefs/delete.xml b/src/etc/testcases/taskdefs/delete.xml
index d74c8babc..15428bc29 100644
--- a/src/etc/testcases/taskdefs/delete.xml
+++ b/src/etc/testcases/taskdefs/delete.xml
@@ -21,7 +21,7 @@
   <import file="../buildfiletest-base.xml"/>
 
 
-  <property name="dir" location="${output}" />
+  <property name="dir" location="${output}"/>
   <basename property="dirname" file="${output}"/>
 
   <macrodef name="expectabsent">
@@ -30,7 +30,7 @@
       <fileset id="detritus" dir="@{target}" erroronmissingdir="false"/>
       <fail message="@{target} still has: ${toString:detritus}">
         <condition>
-          <available file="@{target}" />
+          <available file="@{target}"/>
         </condition>
     </fail>
     </sequential>
@@ -42,11 +42,11 @@
         <condition>
           <or>
             <resourcecount when="greater" count="0">
-              <fileset dir="${dir}" />
+              <fileset dir="${dir}"/>
             </resourcecount>
             <not>
               <resourcecount count="${srcdirs}">
-                <dirset dir="${dir}" />
+                <dirset dir="${dir}"/>
               </resourcecount>
             </not>
           </or>
@@ -57,31 +57,31 @@
 
   <target name="init">
     <resourcecount property="srcdirs">
-      <dirset dir="${basedir}" />
+      <dirset dir="${basedir}"/>
     </resourcecount>
 
     <resourcecount property="srcsize">
-      <files includes="${basedir}/" />
+      <files includes="${basedir}/"/>
     </resourcecount>
 
-    <mkdir dir="${dir}" />
+    <mkdir dir="${dir}"/>
 
     <copy todir="${dir}">
-      <fileset dir="${basedir}" excludes="${dirname},${dirname}/**" />
+      <fileset dir="${basedir}" excludes="${dirname},${dirname}/**"/>
     </copy>
   </target>
 
   <target name="test1">
-    <delete />
+    <delete/>
   </target>
 
   <target name="test2" depends="init">
-    <delete file="${dir}" />
+    <delete file="${dir}"/>
     <fail>
       <condition>
         <not>
           <resourcecount count="${srcsize}">
-            <files includes="${dir}/" />
+            <files includes="${dir}/"/>
           </resourcecount>
         </not>
       </condition>
@@ -89,32 +89,32 @@
   </target>
 
   <target name="test4" depends="init">
-    <delete dir="${dir}" />
-    <expectabsent />
+    <delete dir="${dir}"/>
+    <expectabsent/>
   </target>
 
   <target name="test5" depends="init">
-    <delete dir="${dir}" includes="**" />
-    <expectdirsonly />
+    <delete dir="${dir}" includes="**"/>
+    <expectdirsonly/>
   </target>
 
   <target name="test6" depends="init">
-    <delete dir="${dir}" includes="**" includeemptydirs="true" />
-    <expectabsent />
+    <delete dir="${dir}" includes="**" includeemptydirs="true"/>
+    <expectabsent/>
   </target>
 
   <target name="test7" depends="init">
     <delete>
-      <fileset id="fs" dir="${dir}" />
+      <fileset id="fs" dir="${dir}"/>
     </delete>
-    <expectdirsonly />
+    <expectdirsonly/>
   </target>
 
   <target name="test8" depends="init">
     <delete includeemptydirs="true">
-      <fileset dir="${dir}" />
+      <fileset dir="${dir}"/>
     </delete>
-    <expectabsent />
+    <expectabsent/>
   </target>
 
   <target name="test9" depends="init">
@@ -123,46 +123,46 @@
           <include name="${dir}/**"/>
       </files>
     </delete>
-    <expectabsent />
+    <expectabsent/>
   </target>
 
   <target name="test10">
     <delete>
-      <filelist dir="${dir}" files="test10absentfile" />
+      <filelist dir="${dir}" files="test10absentfile"/>
     </delete>
   </target>
 
   <target name="test11">
     <delete failonerror="false">
-      <fileset dir="thisdenotesadirectorythatwillneverexistblah" />
+      <fileset dir="thisdenotesadirectorythatwillneverexistblah"/>
     </delete>
   </target>
 
   <target name="test12">
     <delete failonerror="false" includeemptydirs="true">
-      <fileset dir="thisdenotesadirectorythatwillneverexistblah" />
+      <fileset dir="thisdenotesadirectorythatwillneverexistblah"/>
     </delete>
   </target>
 
   <target name="test13" depends="init">
     <delete includeemptydirs="true">
-      <fileset dir="${dir}" />
-      <fileset dir="${dir}" />
+      <fileset dir="${dir}"/>
+      <fileset dir="${dir}"/>
     </delete>
-    <expectabsent />
+    <expectabsent/>
   </target>
 
   <target name="test14" depends="init">
 	<delete quiet="false">
-		<fileset dir="${dir}" />
-		<fileset dir="${dir}" />
+		<fileset dir="${dir}"/>
+		<fileset dir="${dir}"/>
 	</delete>
   </target>
 
   <target name="test15" depends="init">
 	<delete quiet="true">
-		<fileset dir="${dir}" />
-		<fileset dir="${dir}" />
+		<fileset dir="${dir}"/>
+		<fileset dir="${dir}"/>
 	</delete>
   </target>
   <!-- Bugzilla 40313 -->
diff --git a/src/etc/testcases/taskdefs/dynamictask.xml b/src/etc/testcases/taskdefs/dynamictask.xml
index 307181f29..409c7d729 100644
--- a/src/etc/testcases/taskdefs/dynamictask.xml
+++ b/src/etc/testcases/taskdefs/dynamictask.xml
@@ -19,14 +19,14 @@
 <project name="dynamic-test" default="simple">
 
   <path id="testclasses">
-    <pathelement location="../../../../build/testcases" />
-    <pathelement path="${java.class.path}" />
+    <pathelement location="../../../../build/testcases"/>
+    <pathelement path="${java.class.path}"/>
   </path>
 
   <target name="simple">
     <taskdef name="dyna"
              classname="org.apache.tools.ant.taskdefs.DynamicTask">
-      <classpath refid="testclasses" />
+      <classpath refid="testclasses"/>
     </taskdef>
     <dyna prop1="1" prop2="2">
       <sub prop3="3"/>
diff --git a/src/etc/testcases/taskdefs/echoxml.xml b/src/etc/testcases/taskdefs/echoxml.xml
index ec53abbb5..0c107c43a 100644
--- a/src/etc/testcases/taskdefs/echoxml.xml
+++ b/src/etc/testcases/taskdefs/echoxml.xml
@@ -16,31 +16,31 @@
   limitations under the License.
 -->
 <project>
-  <property name="file" location="echoed.xml" />
+  <property name="file" location="echoed.xml"/>
   <target name="init">
     <echoxml file="${file}">
       <project>
-        <property name="foo" value="bar" />
+        <property name="foo" value="bar"/>
         <fail message="$$$${foo}=$${foo}">
           <condition>
-            <istrue value="${mustfail}" />
+            <istrue value="${mustfail}"/>
           </condition>
         </fail>
       </project>
     </echoxml>
   </target>
   <target name="tearDown">
-    <delete file="${file}" />
+    <delete file="${file}"/>
   </target>
   <target name="testPass" depends="init">
-    <ant antfile="${file}" />
+    <ant antfile="${file}"/>
   </target>
   <target name="testFail" depends="init">
     <ant antfile="${file}">
-      <property name="mustfail" value="true" />
+      <property name="mustfail" value="true"/>
     </ant>
   </target>
   <target name="testEmpty">
-    <echoxml />
+    <echoxml/>
   </target>
 </project>
diff --git a/src/etc/testcases/taskdefs/email/mail.xml b/src/etc/testcases/taskdefs/email/mail.xml
index c56fd4037..8f0763535 100644
--- a/src/etc/testcases/taskdefs/email/mail.xml
+++ b/src/etc/testcases/taskdefs/email/mail.xml
@@ -21,20 +21,18 @@
   <target name="test1">
     <!-- this test is supposed to bring a build exception because user and password is not allowed with plain encoding -->
     <mail host="localhost" port="25" from="joe@abc.com" to="laura@xyz.com" subject="hello" encoding="plain" user="joe" password="secret">
-        <message>
+      <message>
             Hi Laura, how are you doing ?
-        </message>
+      </message>
     </mail>
   </target>
   <target name="test2">
-      <!-- this test is supposed to bring a build exception because SSL is not allowed with plain encoding -->
-      <mail host="localhost" port="465" from="joe@abc.com" to="laura@xyz.com" subject="hello" encoding="plain" ssl="true">
-          <message>
+    <!-- this test is supposed to bring a build exception because SSL is not allowed with plain encoding -->
+    <mail host="localhost" port="465" from="joe@abc.com" to="laura@xyz.com" subject="hello" encoding="plain" ssl="true">
+      <message>
               Hi Laura, how are you doing ?
-          </message>
-      </mail>
-    </target>
-
-
+      </message>
+    </mail>
+  </target>
 
 </project>
diff --git a/src/etc/testcases/taskdefs/exec/blabla.xml b/src/etc/testcases/taskdefs/exec/blabla.xml
index 3b13195fd..b7a6dca31 100644
--- a/src/etc/testcases/taskdefs/exec/blabla.xml
+++ b/src/etc/testcases/taskdefs/exec/blabla.xml
@@ -1,7 +1,7 @@
 <project name="blabla" default="doit">
    <target name="blabla">
         <exec executable="sh">
-            <arg value="blabla.sh" />
+            <arg value="blabla.sh"/>
         </exec>
    </target>
    <target name="doit">
diff --git a/src/etc/testcases/taskdefs/fail.xml b/src/etc/testcases/taskdefs/fail.xml
index 0a6561e98..a5d88d146 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>
diff --git a/src/etc/testcases/taskdefs/filter.xml b/src/etc/testcases/taskdefs/filter.xml
index 303efa74b..d4a75257a 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>
diff --git a/src/etc/testcases/taskdefs/fixcrlf/build.xml b/src/etc/testcases/taskdefs/fixcrlf/build.xml
index e2fecac3d..e36ea00b2 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>
diff --git a/src/etc/testcases/taskdefs/get.xml b/src/etc/testcases/taskdefs/get.xml
index 188febddc..357117fbf 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>
@@ -128,7 +128,7 @@
 
   <target name="cleanup">
     <delete>
-      <fileset dir="${basedir}" includes="get.tmp" />
+      <fileset dir="${basedir}" includes="get.tmp"/>
     </delete>
   </target>
 
diff --git a/src/etc/testcases/taskdefs/gunzip.xml b/src/etc/testcases/taskdefs/gunzip.xml
index ea75d54df..91ef55c55 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">
diff --git a/src/etc/testcases/taskdefs/gzip.xml b/src/etc/testcases/taskdefs/gzip.xml
index f1c42623f..931bc39cb 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>
diff --git a/src/etc/testcases/taskdefs/import/import.xml b/src/etc/testcases/taskdefs/import/import.xml
index f84d8e33b..4741741b6 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">
diff --git a/src/etc/testcases/taskdefs/import/imported.xml b/src/etc/testcases/taskdefs/import/imported.xml
index 19dfdb078..09f721735 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>
diff --git a/src/etc/testcases/taskdefs/import/subdir/serial.xml b/src/etc/testcases/taskdefs/import/subdir/serial.xml
index 360f9d160..e5dd9b8e0 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>
-
diff --git a/src/etc/testcases/taskdefs/initializeclass.xml b/src/etc/testcases/taskdefs/initializeclass.xml
index 6e079919a..abd07a1ce 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>
diff --git a/src/etc/testcases/taskdefs/input.xml b/src/etc/testcases/taskdefs/input.xml
index d204b79d1..785d029b4 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>
diff --git a/src/etc/testcases/taskdefs/jar.xml b/src/etc/testcases/taskdefs/jar.xml
index 78d1abc68..bd18be5fb 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"/>
@@ -37,23 +37,20 @@
   <target name="test2">
     <jar
     	jarfile="jar.tmp"
-    	manifest="none"
-    />
+    	manifest="none"/>
   </target>
 
   <target name="test3">
     <jar
     	destfile="jar.tmp"
-	whenempty="format C: /y" 
-    />
+	whenempty="format C: /y"/>
   </target>
 
   <target name="test4">
    <jar
     	destfile="${tmp.jar}"
 	basedir="."
-	includes="jar.xml"
-    />
+	includes="jar.xml"/>
   </target>
 
   <target name="testNoRecreateWithUpdate">
@@ -61,8 +58,7 @@
          destfile="${tmp.jar}"
          basedir="."
          includes="jar.xml"
-         update="true"
-    />
+         update="true"/>
   </target>
 
   <target name="testRecreateNewerFileSetup" depends="test4">
@@ -73,8 +69,7 @@
     <jar
          destfile="${tmp.jar}"
          includes="*.xml"
-         basedir="."
-    />
+         basedir="."/>
   </target>
 
   <target name="testRecreateWithUpdateAdditionalFiles">
@@ -82,16 +77,14 @@
          destfile="${tmp.jar}"
          basedir="."
          includes="*.xml"
-         update="true"
-    />
+         update="true"/>
   </target>
 
   <target name="testRecreateWithoutUpdateNewerFile">
     <jar
          destfile="${tmp.jar}"
          basedir="."
-         includes="jar.xml"
-    />
+         includes="jar.xml"/>
   </target>
 
   <target name="testRecreateWithUpdateNewerFile">
@@ -99,8 +92,7 @@
          destfile="${tmp.jar}"
          basedir="."
          includes="jar.xml"
-         update="true"
-    />
+         update="true"/>
   </target>
 
   <target name="testManifestStaysIntact">
@@ -114,7 +106,7 @@
     <jar destfile="${tmp.jar}" basedir="." includes="jar.xml"
          update="true"/>
     <unjar src="${tmp.jar}" dest="${tmp.dir}"/>
-  </target>    
+  </target>
 
   <target name="testNoRecreateBasedirExcludesWithUpdate">
     <jar
@@ -122,8 +114,7 @@
          basedir="."
          includes="j*.xml"
          excludes="java.xml"
-         update="true"
-    />
+         update="true"/>
   </target>
 
   <target name="testNoRecreateBasedirExcludesWithoutUpdate">
@@ -131,8 +122,7 @@
          destfile="${tmp.jar}"
          basedir="."
          includes="j*.xml"
-         excludes="java.xml"
-    />
+         excludes="java.xml"/>
   </target>
 
   <target name="makezip">
@@ -225,7 +215,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 +238,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 +269,6 @@
         <attribute name="Implementation-Vendor"  value="Apache Software Foundation"/>
       </manifest>
     </jar>
-  </target>  
+  </target>
 
-    
 </project>
diff --git a/src/etc/testcases/taskdefs/java.xml b/src/etc/testcases/taskdefs/java.xml
index a3d377891..022a10f33 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}:
 &quot;${redirect.out.contents}&quot; expected &quot;foo&quot;</fail>
 
         <condition property="r1prop">
-            <equals arg1="${redirect.err}" arg2="" />
+            <equals arg1="${redirect.err}" arg2=""/>
         </condition>
 
         <fail unless="r1prop">
@@ -263,22 +256,22 @@ redirect.err=&quot;${redirect.err}&quot; 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=&quot;${redirect.err}&quot; 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=&quot;${redirect.err}&quot; 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}:
 &quot;${redirect.out.contents}&quot; expected &quot;foo&quot;</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=&quot;${redirect.err}&quot; 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=&quot;${redirect.err}&quot; 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=&quot;${redirect.err}&quot; 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}:
 &quot;${redirector.out.contents}&quot; expected &quot;foofoo&quot;</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=&quot;${redirect.err}&quot; 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>
diff --git a/src/etc/testcases/taskdefs/javadoc/javadoc.xml b/src/etc/testcases/taskdefs/javadoc/javadoc.xml
index 2a05ec0fe..2c13b711d 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>
 
diff --git a/src/etc/testcases/taskdefs/loadfile.xml b/src/etc/testcases/taskdefs/loadfile.xml
index 66c9ce4fe..92dfb53f4 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"/>
@@ -121,7 +119,7 @@ public class test1 {
       <echo file="nocomments.tmp">
 
 public class test1 {
-    
+
     int x = 1/2;
     private static final String GREETING="*/Hello/*";
     private static final String GREETING1="/*Hello*/";
@@ -129,13 +127,13 @@ public class test1 {
     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,&#10;2,&#13;3,&#13;&#10;4"
-      file="loadfile1.tmp"
-      />
+      file="loadfile1.tmp"/>
     <loadfile property="testOneLine"
         srcFile="loadfile1.tmp">
       <filterchain>
diff --git a/src/etc/testcases/taskdefs/makeurl.xml b/src/etc/testcases/taskdefs/makeurl.xml
index dafd00a25..e33a1767c 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>
 
diff --git a/src/etc/testcases/taskdefs/manifest.xml b/src/etc/testcases/taskdefs/manifest.xml
index aecaf9679..802ef61cb 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"/>
diff --git a/src/etc/testcases/taskdefs/manifestclasspath.xml b/src/etc/testcases/taskdefs/manifestclasspath.xml
index f8a479511..4f4f06003 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="&#227;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}"/>
diff --git a/src/etc/testcases/taskdefs/mkdir.xml b/src/etc/testcases/taskdefs/mkdir.xml
index 1ecc274da..1d1b89505 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">
diff --git a/src/etc/testcases/taskdefs/move.xml b/src/etc/testcases/taskdefs/move.xml
index 8b4a6c8ef..98cf596ce 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>
diff --git a/src/etc/testcases/taskdefs/multimap.xml b/src/etc/testcases/taskdefs/multimap.xml
index ce4b12185..f0ea0a6d8 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
        -->
diff --git a/src/etc/testcases/taskdefs/nice.xml b/src/etc/testcases/taskdefs/nice.xml
index e67ee19ce..5f07af0dd 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>
diff --git a/src/etc/testcases/taskdefs/optional/antlr/antlr.xml b/src/etc/testcases/taskdefs/optional/antlr/antlr.xml
index c136d0617..e23aafe54 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>
 
diff --git a/src/etc/testcases/taskdefs/optional/depend/depend.xml b/src/etc/testcases/taskdefs/optional/depend/depend.xml
index 26260a7c5..2eb39c59f 100644
--- a/src/etc/testcases/taskdefs/optional/depend/depend.xml
+++ b/src/etc/testcases/taskdefs/optional/depend/depend.xml
@@ -24,7 +24,7 @@
     <property name="classes.dir" value="${output}/classes"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
 
   </target>
 
@@ -105,17 +105,17 @@
       <condition>
         <not>
           <and>
-            <resourcecount count="2" refid="result" />
+            <resourcecount count="2" refid="result"/>
             <resourcecount count="1">
               <intersect>
-                <resources refid="result" />
-                <file file="${classes.dir}/B.class" />
+                <resources refid="result"/>
+                <file file="${classes.dir}/B.class"/>
               </intersect>
             </resourcecount>
             <resourcecount count="1">
               <intersect>
-                <resources refid="result" />
-                <file file="${classes.dir}/C.class" />
+                <resources refid="result"/>
+                <file file="${classes.dir}/C.class"/>
               </intersect>
             </resourcecount>
           </and>
@@ -159,7 +159,7 @@
 
   <target name="testmethodparaminner" depends="src4setup, compile">
     <classfileset id="result" dir="${classes.dir}" rootclass="test.MethodParam"/>
-  </target>  
+  </target>
 
   <target name="testnosource" depends="src1setup, compile">
     <depend destdir="${classes.dir}" closure="yes"/>
@@ -176,7 +176,7 @@
     </path>
 
     <javac srcdir="${tempsrc.dir}" destdir="${classes.dir}"
-           classpathref="path.compile" fork="false" />
+           classpathref="path.compile" fork="false"/>
 
    <depend srcdir="${tempsrc.dir}" destdir="${classes.dir}"
             closure="yes" dump="yes"
@@ -186,9 +186,9 @@
   </target>
 
   <target name="testcache" depends="src1setup, compile">
-    <depend cache="${cache.dir}" srcdir="${tempsrc.dir}" 
+    <depend cache="${cache.dir}" srcdir="${tempsrc.dir}"
             destdir="${classes.dir}" closure="yes"/>
-    <depend cache="${cache.dir}" srcdir="${tempsrc.dir}" 
+    <depend cache="${cache.dir}" srcdir="${tempsrc.dir}"
             destdir="${classes.dir}" closure="yes"/>
   </target>
 
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/A.java b/src/etc/testcases/taskdefs/optional/depend/src1/A.java
index dc6df2317..b7452c7dc 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/A.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/A.java
@@ -17,4 +17,3 @@ limitations under the License.
 public class A extends B {
     private D d = new D();
 }
-
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/B.java b/src/etc/testcases/taskdefs/optional/depend/src1/B.java
index 4be51f78c..86abefdef 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/B.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/B.java
@@ -16,4 +16,3 @@ limitations under the License.
 */
 public class B extends C {
 }
-
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/C.java b/src/etc/testcases/taskdefs/optional/depend/src1/C.java
index d2bfca9df..766c9bb58 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/C.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/C.java
@@ -16,4 +16,3 @@ limitations under the License.
 */
 public class C {
 }
-
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/D.java b/src/etc/testcases/taskdefs/optional/depend/src1/D.java
index 127de5731..81f4545c3 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/D.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/D.java
@@ -16,4 +16,3 @@ limitations under the License.
 */
 public class D {
 }
-
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/E.java b/src/etc/testcases/taskdefs/optional/depend/src1/E.java
index 0efd6134e..4f4834f1b 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/E.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/E.java
@@ -19,4 +19,3 @@ public class E {
         System.out.println(A.class);
     }
 }
-
diff --git a/src/etc/testcases/taskdefs/optional/depend/src2/A.java b/src/etc/testcases/taskdefs/optional/depend/src2/A.java
index 02b35be7e..a9a07fa7b 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src2/A.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src2/A.java
@@ -18,4 +18,3 @@ public class A {
     static private class Inner extends B {
     }
 }
-
diff --git a/src/etc/testcases/taskdefs/optional/depend/src2/B.java b/src/etc/testcases/taskdefs/optional/depend/src2/B.java
index bc7b7d24f..08111803a 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src2/B.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src2/B.java
@@ -16,4 +16,3 @@ limitations under the License.
 */
 public class B {
 }
-
diff --git a/src/etc/testcases/taskdefs/optional/depend/src3/A.java b/src/etc/testcases/taskdefs/optional/depend/src3/A.java
index 1d973b156..ae2c6a281 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src3/A.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src3/A.java
@@ -20,4 +20,3 @@ public class A {
         }
     }
 }
-
diff --git a/src/etc/testcases/taskdefs/optional/depend/src3/B.java b/src/etc/testcases/taskdefs/optional/depend/src3/B.java
index bc7b7d24f..08111803a 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src3/B.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src3/B.java
@@ -16,4 +16,3 @@ limitations under the License.
 */
 public class B {
 }
-
diff --git a/src/etc/testcases/taskdefs/optional/depend/src4/test/MethodParam.java b/src/etc/testcases/taskdefs/optional/depend/src4/test/MethodParam.java
index 276f0163a..3c88ed350 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src4/test/MethodParam.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src4/test/MethodParam.java
@@ -21,4 +21,3 @@ public class MethodParam {
         System.out.print(ContainsOnlyInner.class);
     }
 }
-
diff --git a/src/etc/testcases/taskdefs/optional/depend/src4/test/Outer.java b/src/etc/testcases/taskdefs/optional/depend/src4/test/Outer.java
index 0b7090023..c2491f775 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src4/test/Outer.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src4/test/Outer.java
@@ -20,4 +20,3 @@ public class Outer {
     static class Inner {
     }
 }
-
diff --git a/src/etc/testcases/taskdefs/optional/depend/src5/B.java b/src/etc/testcases/taskdefs/optional/depend/src5/B.java
index bc7b7d24f..08111803a 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src5/B.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src5/B.java
@@ -16,4 +16,3 @@ limitations under the License.
 */
 public class B {
 }
-
diff --git a/src/etc/testcases/taskdefs/optional/echoproperties.xml b/src/etc/testcases/taskdefs/optional/echoproperties.xml
index 7b1b8bb86..26df2d586 100644
--- a/src/etc/testcases/taskdefs/optional/echoproperties.xml
+++ b/src/etc/testcases/taskdefs/optional/echoproperties.xml
@@ -21,12 +21,12 @@
   </target>
 
   <target name="setup">
-    <property name="a.set" value="true" />
-    <property name="b.set" value="false" />
+    <property name="a.set" value="true"/>
+    <property name="b.set" value="false"/>
   </target>
 
   <target name="testEchoToLog" depends="setup">
-    <echoproperties />
+    <echoproperties/>
   </target>
 
   <target name="testEchoWithEmptyPrefixToLog" depends="setup">
@@ -34,55 +34,55 @@
   </target>
 
   <target name="testEchoToLogXml" depends="setup">
-    <echoproperties format="xml" />
+    <echoproperties format="xml"/>
   </target>
 
   <target name="testReadAndEchoToLog" depends="setup">
-    <echoproperties srcfile="echoproperties.properties" />
+    <echoproperties srcfile="echoproperties.properties"/>
   </target>
 
   <target name="testReadBadFile" depends="setup">
-    <echoproperties srcfile="." />
+    <echoproperties srcfile="."/>
   </target>
 
   <target name="testReadBadFileFail" depends="setup">
-    <echoproperties srcfile="." failonerror="yes" />
+    <echoproperties srcfile="." failonerror="yes"/>
   </target>
 
   <target name="testReadBadFileNoFail" depends="setup">
-    <echoproperties srcfile="." failonerror="no" />
+    <echoproperties srcfile="." failonerror="no"/>
   </target>
 
   <target name="testEchoToBadFile" depends="setup">
-    <echoproperties destfile="." />
+    <echoproperties destfile="."/>
   </target>
 
   <target name="testEchoToBadFileFail" depends="setup">
-    <echoproperties destfile="." failonerror="yes" />
+    <echoproperties destfile="." failonerror="yes"/>
   </target>
 
   <target name="testEchoToBadFileNoFail" depends="setup">
-    <echoproperties destfile="." failonerror="no" />
+    <echoproperties destfile="." failonerror="no"/>
   </target>
 
   <target name="testEchoToGoodFile" depends="setup">
-    <echoproperties destfile="test.properties" />
+    <echoproperties destfile="test.properties"/>
   </target>
 
   <target name="testEchoToGoodFileXml" depends="setup">
-    <echoproperties destfile="test.xml" format="xml" />
+    <echoproperties destfile="test.xml" format="xml"/>
   </target>
 
   <target name="testEchoToGoodFileFail" depends="setup">
-    <echoproperties destfile="test.properties" failonerror="yes" />
+    <echoproperties destfile="test.properties" failonerror="yes"/>
   </target>
 
   <target name="testEchoToGoodFileNoFail" depends="setup">
-    <echoproperties destfile="test.properties" failonerror="no" />
+    <echoproperties destfile="test.properties" failonerror="no"/>
   </target>
 
   <target name="testEchoPrefix" depends="setup">
-    <echoproperties destfile="test-prefix.properties" prefix="a." />
+    <echoproperties destfile="test-prefix.properties" prefix="a."/>
   </target>
 
   <target name="testEchoPrefixAsPropertyset" depends="setup">
@@ -124,10 +124,9 @@
   </target>
 
   <target name="cleanup">
-    <delete file="test.properties" failonerror="no" />
-    <delete file="test-prefix.properties" failonerror="no" />
-    <delete file="test.xml" failonerror="no" />
+    <delete file="test.properties" failonerror="no"/>
+    <delete file="test-prefix.properties" failonerror="no"/>
+    <delete file="test.xml" failonerror="no"/>
   </target>
 
 </project>
-
diff --git a/src/etc/testcases/taskdefs/optional/i18n/translate/translate.xml b/src/etc/testcases/taskdefs/optional/i18n/translate/translate.xml
index e6debd500..a1249d38f 100644
--- a/src/etc/testcases/taskdefs/optional/i18n/translate/translate.xml
+++ b/src/etc/testcases/taskdefs/optional/i18n/translate/translate.xml
@@ -41,4 +41,3 @@
     </translate>
   </target>
 </project>
-
diff --git a/src/etc/testcases/taskdefs/optional/javah/build.xml b/src/etc/testcases/taskdefs/optional/javah/build.xml
index ea70b9e57..c95d2ad2c 100644
--- a/src/etc/testcases/taskdefs/optional/javah/build.xml
+++ b/src/etc/testcases/taskdefs/optional/javah/build.xml
@@ -42,7 +42,7 @@
       </classpath>
     </javah>
   </target>
-	
+
   <target name="test-fileset" depends="compile">
   	<javah destdir="${output}">
   	  <fileset dir="${output}">
diff --git a/src/etc/testcases/taskdefs/optional/jdepend/jdepend.xml b/src/etc/testcases/taskdefs/optional/jdepend/jdepend.xml
index 8418226b6..bf043cd83 100644
--- a/src/etc/testcases/taskdefs/optional/jdepend/jdepend.xml
+++ b/src/etc/testcases/taskdefs/optional/jdepend/jdepend.xml
@@ -17,18 +17,18 @@
 -->
 <project>
   <property name="testclasses" location="../../../../../../build/testcases"/>
-  
+
   <path id="all-test-classes.id">
-    <pathelement location="../../../../build/testcases" />
-    <pathelement path="${java.class.path}" />
+    <pathelement location="../../../../build/testcases"/>
+    <pathelement path="${java.class.path}"/>
   </path>
 
   <path id="example-classes.id">
-    <pathelement location="${testclasses}/org/apache/tools/ant/util/facade" />
+    <pathelement location="${testclasses}/org/apache/tools/ant/util/facade"/>
   </path>
 
   <path id="test-classes.id">
-    <pathelement location="${testclasses}" />
+    <pathelement location="${testclasses}"/>
   </path>
 
   <target name="simple">
@@ -67,4 +67,4 @@
     </jdepend>
   </target>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/src/etc/testcases/taskdefs/optional/junit.xml b/src/etc/testcases/taskdefs/optional/junit.xml
index 40bfda6f5..2cae4b9a5 100644
--- a/src/etc/testcases/taskdefs/optional/junit.xml
+++ b/src/etc/testcases/taskdefs/optional/junit.xml
@@ -20,75 +20,75 @@
   <import file="../../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
   </target>
 
-  <property name="showoutput" value="false" />
+  <property name="showoutput" value="false"/>
   <path id="test">
-    <pathelement path="${java.class.path}" />
-    <pathelement location="../../../../../build/testcases" />
+    <pathelement path="${java.class.path}"/>
+    <pathelement location="../../../../../build/testcases"/>
   </path>
 
   <target name="testForkedOutput">
-    <junit fork="yes" haltonerror="true" haltonfailure="true" 
+    <junit fork="yes" haltonerror="true" haltonfailure="true"
            showoutput="${showoutput}">
-      <test name="org.example.junit.Output" />
-      <classpath refid="test" />
+      <test name="org.example.junit.Output"/>
+      <classpath refid="test"/>
     </junit>
   </target>
 
   <target name="testNonForkedOutput">
     <junit fork="false" haltonerror="true" haltonfailure="true"
            showoutput="${showoutput}">
-      <test name="org.example.junit.Output" />
-      <classpath refid="test" />
+      <test name="org.example.junit.Output"/>
+      <classpath refid="test"/>
     </junit>
   </target>
 
   <target name="testForkedThreadedOutput">
     <junit fork="yes" haltonerror="true" haltonfailure="true"
            showoutput="${showoutput}">
-      <test name="org.example.junit.ThreadedOutput" />
-      <classpath refid="test" />
+      <test name="org.example.junit.ThreadedOutput"/>
+      <classpath refid="test"/>
     </junit>
   </target>
 
   <target name="testNonForkedThreadedOutput">
     <junit fork="false" haltonerror="true" haltonfailure="true"
            showoutput="${showoutput}">
-      <test name="org.example.junit.ThreadedOutput" />
-      <classpath refid="test" />
+      <test name="org.example.junit.ThreadedOutput"/>
+      <classpath refid="test"/>
     </junit>
   </target>
 
-  <target name="outputTests" 
-          depends="testForkedOutput,testNonForkedOutput,testForkedThreadedOutput,testNonForkedThreadedOutput" />
+  <target name="outputTests"
+          depends="testForkedOutput,testNonForkedOutput,testForkedThreadedOutput,testNonForkedThreadedOutput"/>
 
   <target name="crash">
     <junit fork="true" errorproperty="crashed">
       <test name="org.apache.tools.ant.taskdefs.optional.junit.VmCrash"/>
-      <classpath refid="test" />
+      <classpath refid="test"/>
     </junit>
   </target>
 
   <target name="nocrash">
     <junit fork="true" errorproperty="crashed">
       <test name="org.apache.tools.ant.taskdefs.optional.junit.NoVmCrash"/>
-      <classpath refid="test" />
+      <classpath refid="test"/>
     </junit>
   </target>
 
   <target name="timeout">
     <junit fork="true" errorproperty="timeout" timeout="1000">
       <test name="org.apache.tools.ant.taskdefs.optional.junit.Sleeper"/>
-      <classpath refid="test" />
+      <classpath refid="test"/>
     </junit>
   </target>
 
   <target name="notimeout">
     <junit fork="true" errorproperty="timeout" timeout="15000">
       <test name="org.apache.tools.ant.taskdefs.optional.junit.Sleeper"/>
-      <classpath refid="test" />
+      <classpath refid="test"/>
     </junit>
   </target>
 
@@ -200,7 +200,7 @@
         }
     </echo>
     <echo file="${tmp.dir}/org/D.java">
-    	package org;
+        package org;
         import junit.framework.*;
         public class D extends TestCase {
             public D(String s) { super(s); }
@@ -210,7 +210,7 @@
     <javac srcdir="${tmp.dir}" destdir="${tmp.dir}"/>
   </target>
 
-  <target name="failureRecorder.internal">  
+  <target name="failureRecorder.internal">
     <property name="tmp.dir" value="${output}"/>
     <delete>
       <fileset dir="${tmp.dir}" includes="FailedTests*.class"/>
@@ -218,7 +218,7 @@
     <!-- compile the FailedTests class if present -->
     <javac srcdir="${tmp.dir}" destdir="${tmp.dir}"/>
     <available file="${tmp.dir}/FailedTests.class" property="hasFailingTests"/>
-    
+
     <property name="ant.junit.failureCollector" value="${tmp.dir}/FailedTests"/>
     <junit haltonerror="false" haltonfailure="false">
       <classpath>
@@ -232,22 +232,21 @@
         <formatter type="plain" usefile="false"/>
       </batchtest>
       <test name="FailedTests" if="hasFailingTests" todir="${tmp.dir}">
-      	<!-- update the FailingTests.java -->
+        <!-- update the FailingTests.java -->
         <formatter type="failure"/>
         <!-- again, I want to see something -->
         <formatter type="plain" usefile="false"/>
       </test>
     </junit>
   </target>
-  
+
   <target name="failureRecorder.runtest">
     <ant target="failureRecorder.internal"
-         antfile="junit.xml" 
+         antfile="junit.xml"
          inheritAll="false"
-         inheritRefs="false" 
-    />
+         inheritRefs="false"/>
   </target>
-  
+
   <target name="failureRecorder.fixing">
     <property name="tmp.dir" value="${output}"/>
     <echo file="${tmp.dir}/A.java">
@@ -260,7 +259,7 @@
         }
     </echo>
   </target>
-  
+
   <!-- Bugzilla Issue 45411 -->
   <target name="testMultilineAssertsNoFork">
     <junit>
@@ -281,14 +280,14 @@
   <target name="testSkippableTests">
     <mkdir dir="${output}"/>
     <junit>
-            <formatter type="xml"/>
-            <classpath refid="test"/>
-            <batchtest todir="${output}">
-                <fileset dir="../../../../tests/junit">
-                    <include name="org/example/junit/JUnit4Skippable.java"/>
-                    <!-- tests remove out-dir on tearDown -->
-                </fileset>
-            </batchtest>
+      <formatter type="xml"/>
+      <classpath refid="test"/>
+      <batchtest todir="${output}">
+        <fileset dir="../../../../tests/junit">
+          <include name="org/example/junit/JUnit4Skippable.java"/>
+          <!-- tests remove out-dir on tearDown -->
+        </fileset>
+      </batchtest>
     </junit>
   </target>
 
@@ -296,15 +295,15 @@
   <!-- Skipping classes that are not tests -->
   <target name="testNonTests">
     <mkdir dir="${output}"/>
-        <junit>
-            <formatter type="xml"/>
-            <classpath refid="test"/>
-            <batchtest todir="${output}" skipNonTests="true">
-                <fileset dir="../../../../tests/junit">
-                    <include name="org/example/junit/*Missed.java"/>
-                    <!-- tests remove out-dir on tearDown -->
-                </fileset>
-            </batchtest>
+    <junit>
+      <formatter type="xml"/>
+      <classpath refid="test"/>
+      <batchtest todir="${output}" skipNonTests="true">
+        <fileset dir="../../../../tests/junit">
+          <include name="org/example/junit/*Missed.java"/>
+          <!-- tests remove out-dir on tearDown -->
+        </fileset>
+      </batchtest>
     </junit>
   </target>
 
@@ -323,7 +322,7 @@
         </junit>
     </target>
 
-  <target name="testTestMethods" >
+  <target name="testTestMethods">
     <property name="tmp.dir" value="${output}"/>
     <echo file="${tmp.dir}/T1.java">public class T1 extends
       junit.framework.TestCase {
@@ -346,25 +345,25 @@
     </javac>
     <junit fork="false" printsummary="true" haltonerror="true">
       <classpath>
-        <pathelement location="${tmp.dir}" />
-        <path refid="test" />
+        <pathelement location="${tmp.dir}"/>
+        <path refid="test"/>
       </classpath>
-      <test name="T1" methods="testOK" />
-      <test name="T2" methods="ok" />
+      <test name="T1" methods="testOK"/>
+      <test name="T2" methods="ok"/>
     </junit>
   </target>
 
   <target name="testCheckForkedPath">
-    <property name="includeantruntime" value="yes" />
+    <property name="includeantruntime" value="yes"/>
     <!-- duplicate the Ant classes into a jar -->
-    <jar destfile="${output}/ant.jar" basedir="${antclasses}" />
+    <jar destfile="${output}/ant.jar" basedir="${antclasses}"/>
     <junit fork="yes" haltonerror="true" haltonfailure="true"
              showoutput="${showoutput}" includeantruntime="${includeantruntime}">
-      <test name="org.example.junit.Output" />
+      <test name="org.example.junit.Output"/>
       <classpath>
-        <pathelement location="../../../../../build/testcases" />
-        <pathelement location="${junitjar}" />
-        <pathelement location="${output}/ant.jar" />
+        <pathelement location="../../../../../build/testcases"/>
+        <pathelement location="${junitjar}"/>
+        <pathelement location="${output}/ant.jar"/>
       </classpath>
     </junit>
   </target>
diff --git a/src/etc/testcases/taskdefs/optional/junit/teardownlistener.xml b/src/etc/testcases/taskdefs/optional/junit/teardownlistener.xml
index abb6a4107..0b9b7a1bb 100644
--- a/src/etc/testcases/taskdefs/optional/junit/teardownlistener.xml
+++ b/src/etc/testcases/taskdefs/optional/junit/teardownlistener.xml
@@ -18,8 +18,8 @@
 <project>
 
   <path id="test">
-    <pathelement path="${java.class.path}" />
-    <pathelement location="../../../../../../build/testcases" />
+    <pathelement path="${java.class.path}"/>
+    <pathelement location="../../../../../../build/testcases"/>
   </path>
 
   <target name="testNoTeardown">
diff --git a/src/etc/testcases/taskdefs/optional/junitlauncher.xml b/src/etc/testcases/taskdefs/optional/junitlauncher.xml
index ccae7ae66..d0b19b35f 100644
--- a/src/etc/testcases/taskdefs/optional/junitlauncher.xml
+++ b/src/etc/testcases/taskdefs/optional/junitlauncher.xml
@@ -110,4 +110,3 @@
         </junitlauncher>
     </target>
 </project>
-
diff --git a/src/etc/testcases/taskdefs/optional/junitreport.xml b/src/etc/testcases/taskdefs/optional/junitreport.xml
index 608066256..05f8066bd 100644
--- a/src/etc/testcases/taskdefs/optional/junitreport.xml
+++ b/src/etc/testcases/taskdefs/optional/junitreport.xml
@@ -21,7 +21,7 @@
   <import file="../../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
   </target>
 
 
@@ -182,8 +182,7 @@
         </junitreport>
         <concat>
             <fileset file="${output}/html/index.html"/>
-        </concat>        
+        </concat>
     </target>
 
 </project>
-        
diff --git a/src/etc/testcases/taskdefs/optional/native2ascii/build.xml b/src/etc/testcases/taskdefs/optional/native2ascii/build.xml
index 27b40313d..49b8dcb86 100644
--- a/src/etc/testcases/taskdefs/optional/native2ascii/build.xml
+++ b/src/etc/testcases/taskdefs/optional/native2ascii/build.xml
@@ -35,4 +35,3 @@
                   src="${in}" includes="iso8859-1.*"/>
   </target>
 </project>
-    
\ No newline at end of file
diff --git a/src/etc/testcases/taskdefs/optional/net/ftp.xml b/src/etc/testcases/taskdefs/optional/net/ftp.xml
index aaf4b8e65..3a25e4ba0 100644
--- a/src/etc/testcases/taskdefs/optional/net/ftp.xml
+++ b/src/etc/testcases/taskdefs/optional/net/ftp.xml
@@ -21,8 +21,8 @@
     <property file="${env.HOME}/ant-ftp.properties"/>
     <property name="ftp.user" value="${user.name}"/>
     <property name="ftp.host" value="localhost"/>
-    <property name="ftp.port" value="21" />
-    <property name="ftp.password" value="sunshine" />
+    <property name="ftp.port" value="21"/>
+    <property name="ftp.password" value="sunshine"/>
     <property name="ftp.filesep" value="/"/>
     <property name="tmp.dir" location="tmp"/>
     <property name="tmp.get.dir" location="tmp.get"/>
@@ -36,7 +36,7 @@
 
     <fileset dir="${tmp.get.dir}" id="fileset-destination-with-selector">
         <include name="alpha/**"/>
-        <filename name="**/alpha.xml" />
+        <filename name="**/alpha.xml"/>
     </fileset>
     <fileset dir="${tmp.dir}" id="fileset-source-without-selector">
         <include name="alpha/**"/>
@@ -69,11 +69,11 @@
 
     <target name="ftp-get-with-selector">
         <ftp action="get"
-            server="${ftp.host}"
-            userid="${ftp.user}"
-            password="${ftp.password}"
-            separator="${ftp.filesep}"
-            remotedir="${tmp.dir}">
+             server="${ftp.host}"
+             userid="${ftp.user}"
+             password="${ftp.password}"
+             separator="${ftp.filesep}"
+             remotedir="${tmp.dir}">
             <fileset refid="fileset-destination-with-selector"/>
         </ftp>
     </target>
@@ -93,23 +93,21 @@
     </target>
     <target name="ftp-get-directory-symbolic-link" depends="symlink-setup">
         <ftp action="get"
-            server="${ftp.host}"
-            userid="${ftp.user}"
-            password="${ftp.password}"
-            separator="${ftp.filesep}"
-            remotedir="${tmp.dir}"
-            >
+             server="${ftp.host}"
+             userid="${ftp.user}"
+             password="${ftp.password}"
+             separator="${ftp.filesep}"
+             remotedir="${tmp.dir}">
             <fileset refid="fileset-destination-followsymlinks"/>
         </ftp>
     </target>
     <target name="ftp-get-directory-no-symbolic-link" depends="symlink-setup">
         <ftp action="get"
-            server="${ftp.host}"
-            userid="${ftp.user}"
-            password="${ftp.password}"
-            separator="${ftp.filesep}"
-            remotedir="${tmp.dir}"
-            >
+             server="${ftp.host}"
+             userid="${ftp.user}"
+             password="${ftp.password}"
+             separator="${ftp.filesep}"
+             remotedir="${tmp.dir}">
             <fileset refid="fileset-destination-nofollowsymlinks"/>
         </ftp>
     </target>
@@ -132,27 +130,26 @@
             </fileset>
         </ftp>
         <ftp action="rmdir"
-            server="${ftp.host}"
-            userid="${ftp.user}"
-            password="${ftp.password}"
-            remotedir="${tmp.dir}">
+             server="${ftp.host}"
+             userid="${ftp.user}"
+             password="${ftp.password}"
+             remotedir="${tmp.dir}">
             <fileset dir="${tmp.get.dir}">
                 <include name="**"/>
             </fileset>
         </ftp>
-    </target>   
+    </target>
 
     <target name="timed.test.setup">
         <touch>
             <filelist refid="timed-files"/>
-        </touch>    
+        </touch>
         <ftp action="put"
-            server="${ftp.host}"
-            userid="${ftp.user}"
-            password="${ftp.password}"
-            separator="${ftp.filesep}"
-            remotedir="${tmp.remote}"
-            >
+             server="${ftp.host}"
+             userid="${ftp.user}"
+             password="${ftp.password}"
+             separator="${ftp.filesep}"
+             remotedir="${tmp.remote}">
             <fileset dir="${tmp.local}">
                 <patternset refid="timed-test-files"/>
             </fileset>
@@ -170,14 +167,13 @@
             </fileset>
         </touch>
         <ftp action="put"
-            server="${ftp.host}"
-            userid="${ftp.user}"
-            password="${ftp.password}"
-            separator="${ftp.filesep}"
-            remotedir="${tmp.remote}"
-            newer="true"
-            serverTimeZoneConfig="${ftp.server.timezone}"
-            >
+             server="${ftp.host}"
+             userid="${ftp.user}"
+             password="${ftp.password}"
+             separator="${ftp.filesep}"
+             remotedir="${tmp.remote}"
+             newer="true"
+             serverTimeZoneConfig="${ftp.server.timezone}">
             <fileset dir="${tmp.local}">
                 <patternset refid="timed-test-files"/>
             </fileset>
@@ -196,121 +192,112 @@
             </fileset>
         </touch>
         <ftp action="get"
-            server="${ftp.host}"
-            userid="${ftp.user}"
-            password="${ftp.password}"
-            separator="${ftp.filesep}"
-            remotedir="${tmp.remote}"
-            preservelastmodified="true"
-            newer="true"
-            serverTimeZoneConfig="${ftp.server.timezone}"
-            >
+             server="${ftp.host}"
+             userid="${ftp.user}"
+             password="${ftp.password}"
+             separator="${ftp.filesep}"
+             remotedir="${tmp.remote}"
+             preservelastmodified="true"
+             newer="true"
+             serverTimeZoneConfig="${ftp.server.timezone}">
             <fileset dir="${tmp.local}">
                 <patternset refid="timed-test-files"/>
             </fileset>
         </ftp>
     </target>
-    
+
     <target name="configuration.1">
         <ftp action="list"
-            server="${ftp.host}"
-            userid="${ftp.user}"
-            password="${ftp.password}"
-            separator="${ftp.filesep}"
-            remotedir="${tmp.remote}"
-            serverTimeZoneConfig="${ftp.server.timezone}"
-            listing="${ftp.listing.file}"
-            >
-             <fileset dir="${tmp.local}"/>
-         </ftp>
+             server="${ftp.host}"
+             userid="${ftp.user}"
+             password="${ftp.password}"
+             separator="${ftp.filesep}"
+             remotedir="${tmp.remote}"
+             serverTimeZoneConfig="${ftp.server.timezone}"
+             listing="${ftp.listing.file}">
+            <fileset dir="${tmp.local}"/>
+        </ftp>
     </target>
     <target name="configuration.2">
         <ftp action="list"
-            server="${ftp.host}"
-            userid="${ftp.user}"
-            password="${ftp.password}"
-            separator="${ftp.filesep}"
-            remotedir="${tmp.remote}"
-            serverTimeZoneConfig="${ftp.server.timezone}"
-            listing="${ftp.listing.file}"
-            systemTypeKey="WINDOWS"
-            >
-             <fileset dir="${tmp.local}"/>
-         </ftp>
+             server="${ftp.host}"
+             userid="${ftp.user}"
+             password="${ftp.password}"
+             separator="${ftp.filesep}"
+             remotedir="${tmp.remote}"
+             serverTimeZoneConfig="${ftp.server.timezone}"
+             listing="${ftp.listing.file}"
+             systemTypeKey="WINDOWS">
+            <fileset dir="${tmp.local}"/>
+        </ftp>
     </target>
     <target name="configuration.3">
         <ftp action="list"
-            server="${ftp.host}"
-            userid="${ftp.user}"
-            password="${ftp.password}"
-            separator="${ftp.filesep}"
-            remotedir="${tmp.remote}"
-            defaultDateFormatConfig="yyyy/MM/dd HH:mm"
-            listing="${ftp.listing.file}"
-            systemTypeKey="UNIX"
-            >
-             <fileset dir="${tmp.local}"/>
-         </ftp>
+             server="${ftp.host}"
+             userid="${ftp.user}"
+             password="${ftp.password}"
+             separator="${ftp.filesep}"
+             remotedir="${tmp.remote}"
+             defaultDateFormatConfig="yyyy/MM/dd HH:mm"
+             listing="${ftp.listing.file}"
+             systemTypeKey="UNIX">
+            <fileset dir="${tmp.local}"/>
+        </ftp>
     </target>
     <target name="configuration.lang.good">
         <ftp action="list"
-            server="${ftp.host}"
-            userid="${ftp.user}"
-            password="${ftp.password}"
-            separator="${ftp.filesep}"
-            remotedir="${tmp.remote}"
-            serverLanguageCodeConfig="de"
-            listing="${ftp.listing.file}"
-            >
-             <fileset dir="${tmp.local}"/>
-         </ftp>
-    </target>    
+             server="${ftp.host}"
+             userid="${ftp.user}"
+             password="${ftp.password}"
+             separator="${ftp.filesep}"
+             remotedir="${tmp.remote}"
+             serverLanguageCodeConfig="de"
+             listing="${ftp.listing.file}">
+            <fileset dir="${tmp.local}"/>
+        </ftp>
+    </target>
     <target name="configuration.lang.bad">
         <ftp action="list"
-            server="${ftp.host}"
-            userid="${ftp.user}"
-            password="${ftp.password}"
-            separator="${ftp.filesep}"
-            remotedir="${tmp.remote}"
-            serverLanguageCodeConfig="QQ"
-            listing="${ftp.listing.file}"
-            >
-             <fileset dir="${tmp.local}"/>
-         </ftp>
-    </target>    
+             server="${ftp.host}"
+             userid="${ftp.user}"
+             password="${ftp.password}"
+             separator="${ftp.filesep}"
+             remotedir="${tmp.remote}"
+             serverLanguageCodeConfig="QQ"
+             listing="${ftp.listing.file}">
+            <fileset dir="${tmp.local}"/>
+        </ftp>
+    </target>
     <target name="configuration.none">
         <ftp action="list"
-            server="${ftp.host}"
-            userid="${ftp.user}"
-            password="${ftp.password}"
-            separator="${ftp.filesep}"
-            remotedir="${tmp.remote}"
-            listing="${ftp.listing.file}"
-            >
-             <fileset dir="${tmp.local}"/>
-         </ftp>
+             server="${ftp.host}"
+             userid="${ftp.user}"
+             password="${ftp.password}"
+             separator="${ftp.filesep}"
+             remotedir="${tmp.remote}"
+             listing="${ftp.listing.file}">
+            <fileset dir="${tmp.local}"/>
+        </ftp>
     </target>
     <target name="ftp-get-with-selector-retryable">
         <ftp action="get"
-            server="${ftp.host}"
-            userid="${ftp.user}"
-            password="${ftp.password}"
-            separator="${ftp.filesep}"
-            remotedir="${tmp.dir}"
-            retriesAllowed="${ftp.retries}"
-            >
+             server="${ftp.host}"
+             userid="${ftp.user}"
+             password="${ftp.password}"
+             separator="${ftp.filesep}"
+             remotedir="${tmp.dir}"
+             retriesAllowed="${ftp.retries}">
             <fileset refid="fileset-destination-with-selector"/>
         </ftp>
     </target>
     <target name="test-initial-command">
         <ftp action="put"
-            server="${ftp.host}"
-            userid="${ftp.user}"
-            password="${ftp.password}"
-            separator="${ftp.filesep}"
-            remotedir="${tmp.remote}"
-            initialSiteCommand="umask 222"
-            >
+             server="${ftp.host}"
+             userid="${ftp.user}"
+             password="${ftp.password}"
+             separator="${ftp.filesep}"
+             remotedir="${tmp.remote}"
+             initialSiteCommand="umask 222">
             <fileset dir="${tmp.local}">
                 <patternset refid="timed-test-files"/>
             </fileset>
@@ -319,13 +306,12 @@
 
     <target name="test-site-action">
         <ftp action="site"
-            server="${ftp.host}"
-            userid="${ftp.user}"
-            password="${ftp.password}"
-            separator="${ftp.filesep}"
-            remotedir="${tmp.remote}"
-            siteCommand="umask 222"
-            >
+             server="${ftp.host}"
+             userid="${ftp.user}"
+             password="${ftp.password}"
+             separator="${ftp.filesep}"
+             remotedir="${tmp.remote}"
+             siteCommand="umask 222">
         </ftp>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/etc/testcases/taskdefs/optional/propertyfile.xml b/src/etc/testcases/taskdefs/optional/propertyfile.xml
index 20a17271b..11f8490d7 100644
--- a/src/etc/testcases/taskdefs/optional/propertyfile.xml
+++ b/src/etc/testcases/taskdefs/optional/propertyfile.xml
@@ -21,7 +21,7 @@
   <import file="../../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
   </target>
 
   <property file="${output}/propertyfile.build.properties"/>
@@ -36,13 +36,13 @@
    <target name="update-existing-properties">
       <propertyfile
           file="${output}/${test.propertyfile}"
-          comment="unit test for the property file task..." >
-        <entry  key="firstname" value="${firstname}" />
-        <entry  key="lastname"  value="${lastname}" />
-        <entry  key="email"     value="${email}" />
-        <entry  key="phone"     default="${phone}" />
-        <entry  key="age"       default="${age}" type="int"/>
-        <entry  key="date"      default="${date}" type="date"/>
+          comment="unit test for the property file task...">
+        <entry key="firstname" value="${firstname}"/>
+        <entry key="lastname"  value="${lastname}"/>
+        <entry key="email"     value="${email}"/>
+        <entry key="phone"     default="${phone}"/>
+        <entry key="age"       default="${age}" type="int"/>
+        <entry key="date"      default="${date}" type="date"/>
       </propertyfile>
    </target>
 
@@ -50,8 +50,8 @@
     <echoproperties/>
       <propertyfile
           file="${output}/${test.propertyfile}"
-          comment="unit test for the property file task..." >
-        <entry  key="firstname" operation="del" />
+          comment="unit test for the property file task...">
+        <entry key="firstname" operation="del"/>
       </propertyfile>
    </target>
 
@@ -99,15 +99,15 @@
      </propertyfile>
      <property file="${output}/${test.propertyfile}"/>
    </target>
-   
+
     <target name="createfile">
        <echo file="${output}/${overwrite.test.propertyfile}">
  foo=3
        </echo>
     </target>
-    
+
     <target name="bugDemo1" depends="createfile,bugDemoInit"/>
-    
+
     <target name="bugDemo2" depends="bugDemoInit">
         <property file="${output}/${overwrite.test.propertyfile}"/>
     </target>
@@ -119,5 +119,3 @@
     </target>
 
 </project>
-
-
diff --git a/src/etc/testcases/taskdefs/optional/pvcs.xml b/src/etc/testcases/taskdefs/optional/pvcs.xml
index 99bfcff41..6f372596d 100644
--- a/src/etc/testcases/taskdefs/optional/pvcs.xml
+++ b/src/etc/testcases/taskdefs/optional/pvcs.xml
@@ -37,12 +37,12 @@
   </target>
 
   <target name="test5" description="Get the latest from PVCS">
-    <pvcs pvcsbin="/home/cvs/pvcsant/src/etc/testcases/taskdefs" 
+    <pvcs pvcsbin="/home/cvs/pvcsant/src/etc/testcases/taskdefs"
 			 repository="//ct4serv2/pvcs/monitor"/>
   </target>
 
   <target name="test6" description="No pcli to be found">
-    <pvcs pvcsbin="/never/heard/of/a/directory/structure/like/this" 
+    <pvcs pvcsbin="/never/heard/of/a/directory/structure/like/this"
 			 repository="//ct4serv2/pvcs/monitor"/>
   </target>
 
diff --git a/src/etc/testcases/taskdefs/optional/replaceregexp.xml b/src/etc/testcases/taskdefs/optional/replaceregexp.xml
index 58fdc59cd..8480d2df7 100644
--- a/src/etc/testcases/taskdefs/optional/replaceregexp.xml
+++ b/src/etc/testcases/taskdefs/optional/replaceregexp.xml
@@ -21,8 +21,8 @@
   <property name="root" location="../../../../.."/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
-    <copy file="replaceregexp.properties" tofile="${output}/test.properties" />
+    <mkdir dir="${output}"/>
+    <copy file="replaceregexp.properties" tofile="${output}/test.properties"/>
   </target>
 
   <target name="def">
@@ -30,39 +30,39 @@
   </target>
 
   <target name="setUp-nl">
-    <mkdir dir="${output}" />
-    <copy file="replaceregexp2.properties" tofile="${output}/test.properties" />
+    <mkdir dir="${output}"/>
+    <copy file="replaceregexp2.properties" tofile="${output}/test.properties"/>
   </target>
 
   <target name="testReplace" depends="setUp">
     <replaceregexp file="${output}/test.properties" byline="true">
-      <regexp pattern="Old(.*)=(.*)" />
-      <substitution expression="NewProp=\1\2" />
+      <regexp pattern="Old(.*)=(.*)"/>
+      <substitution expression="NewProp=\1\2"/>
     </replaceregexp>
   </target>
   <!-- use in conjunction with testDirectoryDateDoesNotChange to make sure something will happen -->
   <target name="touchDirectory">
-    <copy file="replaceregexp.properties" tofile="${output}/test.properties" />
+    <copy file="replaceregexp.properties" tofile="${output}/test.properties"/>
 
   </target>
   <target name="testDirectoryDateDoesNotChange">
     <replaceregexp file="${output}/test.properties" byline="true">
-      <regexp pattern="foo" />
+      <regexp pattern="foo"/>
         <substitution expression="bar"/>
       </replaceregexp>
   </target>
 
   <target name="testDontAddNewline1" depends="setUp-nl">
     <replaceregexp file="${output}/test.properties" byline="false">
-      <regexp pattern="Old(.*)=(.*)" />
-      <substitution expression="NewProp=\1\2" />
+      <regexp pattern="Old(.*)=(.*)"/>
+      <substitution expression="NewProp=\1\2"/>
     </replaceregexp>
   </target>
 
   <target name="testDontAddNewline2" depends="setUp-nl">
     <replaceregexp file="${output}/test.properties" byline="true">
-      <regexp pattern="Old(.*)=(.*)" />
-      <substitution expression="NewProp=\1\2" />
+      <regexp pattern="Old(.*)=(.*)"/>
+      <substitution expression="NewProp=\1\2"/>
     </replaceregexp>
   </target>
 
@@ -80,4 +80,3 @@
   </target>
 
 </project>
-
diff --git a/src/etc/testcases/taskdefs/optional/schemavalidate.xml b/src/etc/testcases/taskdefs/optional/schemavalidate.xml
index f43201e71..0e5050bae 100644
--- a/src/etc/testcases/taskdefs/optional/schemavalidate.xml
+++ b/src/etc/testcases/taskdefs/optional/schemavalidate.xml
@@ -20,9 +20,9 @@
 
   <property name="doc.xsd" location="xml/doc.xsd"/>
   <property name="doc-in-ns.xsd" location="xml/doc-in-ns.xsd"/>
-  <property name="namespace" value="http://apache.org/ant/doc/" />
-  
-  <property name="endpiece-ns-no-location.xml" 
+  <property name="namespace" value="http://apache.org/ant/doc/"/>
+
+  <property name="endpiece-ns-no-location.xml"
     location="xml/endpiece-ns-no-location.xml"/>
 
   <target name="testNoNamespace">
@@ -35,33 +35,33 @@
   <target name="testNSMapping">
     <schemavalidate
       file="${endpiece-ns-no-location.xml}">
-      <schema namespace="${namespace}" file="${doc-in-ns.xsd}" />
-      <schema namespace="http://apache.org/ant/2" 
-        url="http://ant.apache.org/" />
+      <schema namespace="${namespace}" file="${doc-in-ns.xsd}"/>
+      <schema namespace="http://apache.org/ant/2"
+        url="http://ant.apache.org/"/>
     </schemavalidate>
   </target>
 
   <target name="testNoEmptySchemaNamespace">
     <schemavalidate
       file="${endpiece-ns-no-location.xml}">
-      <schema namespace="" file="${doc-in-ns.xsd}" />
+      <schema namespace="" file="${doc-in-ns.xsd}"/>
     </schemavalidate>
   </target>
 
   <target name="testNoEmptySchemaLocation">
     <schemavalidate
       file="${endpiece-ns-no-location.xml}">
-      <schema namespace="${namespace}" />
+      <schema namespace="${namespace}"/>
     </schemavalidate>
   </target>
-  
+
   <target name="testNoFile">
     <schemavalidate
       file="${endpiece-ns-no-location.xml}">
-      <schema namespace="${namespace}" file="${namespace}" />
+      <schema namespace="${namespace}" file="${namespace}"/>
     </schemavalidate>
-  </target>  
-  
+  </target>
+
   <target name="testNoDoubleSchemaLocation">
     <schemavalidate
       file="${endpiece-ns-no-location.xml}">
@@ -72,29 +72,28 @@
   <target name="testNoDuplicateSchema">
     <schemavalidate
       file="${endpiece-ns-no-location.xml}">
-      <schema namespace="${namespace}" file="${doc-in-ns.xsd}" />
-      <schema namespace="${namespace}" 
-        url="http://ant.apache.org/" />
+      <schema namespace="${namespace}" file="${doc-in-ns.xsd}"/>
+      <schema namespace="${namespace}"
+        url="http://ant.apache.org/"/>
     </schemavalidate>
-  </target>  
+  </target>
 
   <target name="testEqualsSchemasOK">
     <schemavalidate
       file="${endpiece-ns-no-location.xml}">
-      <schema namespace="${namespace}" file="${doc-in-ns.xsd}" />
-      <schema namespace="${namespace}" file="${doc-in-ns.xsd}" />
+      <schema namespace="${namespace}" file="${doc-in-ns.xsd}"/>
+      <schema namespace="${namespace}" file="${doc-in-ns.xsd}"/>
     </schemavalidate>
-  </target>  
-  
+  </target>
+
   <target name="testFileset">
-    <schemavalidate noNamespaceFile="${doc.xsd}"
-      >
-      <schema namespace="${namespace}" file="${doc-in-ns.xsd}" />
-      <fileset dir="xml" 
-        includes="endpiece.xml, endpiece-ns-no-location.xml, endpiece-no-schema.xml" />
+    <schemavalidate noNamespaceFile="${doc.xsd}">
+      <schema namespace="${namespace}" file="${doc-in-ns.xsd}"/>
+      <fileset dir="xml"
+        includes="endpiece.xml, endpiece-ns-no-location.xml, endpiece-no-schema.xml"/>
     </schemavalidate>
-  </target>  
-  
-  
-  <target name="default" depends="testNoNamespace,testNSMapping" />
-</project>
\ No newline at end of file
+  </target>
+
+
+  <target name="default" depends="testNoNamespace,testNSMapping"/>
+</project>
diff --git a/src/etc/testcases/taskdefs/optional/script.xml b/src/etc/testcases/taskdefs/optional/script.xml
index c098289bc..fef465fec 100644
--- a/src/etc/testcases/taskdefs/optional/script.xml
+++ b/src/etc/testcases/taskdefs/optional/script.xml
@@ -48,21 +48,21 @@
   </target>
 
   <target name="useSrcAndEncoding">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
     <property name="useSrcAndEncoding.encoding" value="UTF-8"/>
     <property name="useSrcAndEncoding.reader.encoding" value="${useSrcAndEncoding.encoding}"
-      description="Set a different encoding to raise a failure (ex. ISO-8859-1)" />
+      description="Set a different encoding to raise a failure (ex. ISO-8859-1)"/>
     <property name="useSrcAndEncoding.file" location="${output}/script.useSrcAndEncoding.js"/>
-    <property name="useSrcAndEncoding.expectedProp" value="eacute [&#233;]" />
+    <property name="useSrcAndEncoding.expectedProp" value="eacute [&#233;]"/>
 
     <echo file="${useSrcAndEncoding.file}" encoding="${useSrcAndEncoding.encoding}"
       message="project.setNewProperty('useSrcAndEncoding.prop', '${useSrcAndEncoding.expectedProp}');"/>
 
     <script language="javascript" src="${useSrcAndEncoding.file}" encoding="${useSrcAndEncoding.reader.encoding}"/>
-    <condition property="useSrcAndEncoding.testOK" >
-      <equals arg1="${useSrcAndEncoding.expectedProp}" arg2="${useSrcAndEncoding.prop}" />
+    <condition property="useSrcAndEncoding.testOK">
+      <equals arg1="${useSrcAndEncoding.expectedProp}" arg2="${useSrcAndEncoding.prop}"/>
     </condition>
-    <fail message="expected &lt;${useSrcAndEncoding.expectedProp}&gt; but was &lt;${useSrcAndEncoding.prop}&gt;" unless="useSrcAndEncoding.testOK" />
+    <fail message="expected &lt;${useSrcAndEncoding.expectedProp}&gt; but was &lt;${useSrcAndEncoding.prop}&gt;" unless="useSrcAndEncoding.testOK"/>
   </target>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/src/etc/testcases/taskdefs/optional/script/scriptdef.xml b/src/etc/testcases/taskdefs/optional/script/scriptdef.xml
index 3b54e3e48..8aa804525 100644
--- a/src/etc/testcases/taskdefs/optional/script/scriptdef.xml
+++ b/src/etc/testcases/taskdefs/optional/script/scriptdef.xml
@@ -30,14 +30,14 @@
       <attribute name="attr1"/>
       <element name="fileset" type="fileset"/>
       <![CDATA[
-        
+
         project.log("Attribute attr1 = " + attributes.get("attr1"));
         project.log("Fileset basedir = "
           + elements.get("fileset").get(0).getDir(project));
-        
+
       ]]>
     </scriptdef>
-    
+
     <fileset id="testfileset" dir="."/>
     <scripttest attr1="test">
       <fileset refid="testfileset"/>
@@ -65,20 +65,20 @@
       <attribute name="attr1"/>
       <element name="fileset" classname="org.apache.tools.ant.types.FileSet"/>
       <![CDATA[
-        
+
         project.log("Attribute attr1 = " + attributes.get("attr1"));
         project.log("Fileset basedir = "
           + elements.get("fileset").get(0).getDir(project));
-        
+
       ]]>
     </scriptdef>
-    
+
     <fileset id="testfileset" dir="."/>
     <scripttest attr1="test">
       <fileset refid="testfileset"/>
     </scripttest>
   </target>
-  
+
   <target name="noelement">
     <scriptdef name="scripttest" language="javascript">
       <attribute name="attr1"/>
@@ -87,7 +87,7 @@
         java.lang.System.out.println("Attribute attr1 = " + attributes.get("attr1"));
       ]]>
     </scriptdef>
-    
+
     <scripttest attr1="test">
     </scripttest>
   </target>
@@ -97,18 +97,18 @@
       <attribute name="attr1"/>
       <element name="fileset" classname="org.apache.tools.ant.types.FileSet"/>
       <![CDATA[
-        
+
         java.lang.System.out.println("Attribute attr1 = " + attributes.get("attr1"));
         java.lang.System.out.println("Fileset basedir = "
           + elements.get("fileset").get(0).getDir(project));
-        
+
       ]]>
     </scriptdef>
-    
+
     <scripttest attr1="test">
     </scripttest>
   </target>
-  
+
   <target name="doubledef">
     <scriptdef name="task1" language="javascript">
       <![CDATA[
@@ -123,24 +123,24 @@
     <task1/>
     <task2/>
   </target>
-  
+
   <target name="doubleAttributeDef">
     <scriptdef name="scripttest" language="javascript">
       <attribute name="attr1"/>
       <attribute name="attr1"/>
     </scriptdef>
   </target>
-  
+
   <target name="property">
     <scriptdef name="scripttest" language="javascript">
       <attribute name="attr1"/>
       <![CDATA[
-        
+
         project.log("Attribute value = " + attributes.get("attr1"));
       ]]>
     </scriptdef>
 
-    <property name="testproperty" value="test"/>    
+    <property name="testproperty" value="test"/>
     <scripttest attr1="${testproperty}">
     </scripttest>
   </target>
@@ -152,12 +152,12 @@
   </target>
 
   <target name="useSrcAndEncoding">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
     <property name="useSrcAndEncoding.encoding" value="UTF-8"/>
     <property name="useSrcAndEncoding.reader.encoding" value="${useSrcAndEncoding.encoding}"
-      description="Set a different encoding to raise a failure (ex. ISO-8859-1)" />
+      description="Set a different encoding to raise a failure (ex. ISO-8859-1)"/>
     <property name="useSrcAndEncoding.file" location="${output}/script.useSrcAndEncoding.js"/>
-    <property name="useSrcAndEncoding.expectedProp" value="eacute [&#233;]" />
+    <property name="useSrcAndEncoding.expectedProp" value="eacute [&#233;]"/>
 
     <echo file="${useSrcAndEncoding.file}" encoding="${useSrcAndEncoding.encoding}"
       message="project.setNewProperty('useSrcAndEncoding.prop', '${useSrcAndEncoding.expectedProp}');"/>
@@ -165,64 +165,64 @@
     <scriptdef name="useSrcAndEncoding" language="javascript" src="${useSrcAndEncoding.file}" encoding="${useSrcAndEncoding.reader.encoding}"/>
     <useSrcAndEncoding/>
 
-    <condition property="useSrcAndEncoding.testOK" >
-      <equals arg1="${useSrcAndEncoding.expectedProp}" arg2="${useSrcAndEncoding.prop}" />
+    <condition property="useSrcAndEncoding.testOK">
+      <equals arg1="${useSrcAndEncoding.expectedProp}" arg2="${useSrcAndEncoding.prop}"/>
     </condition>
-    <fail message="expected &lt;${useSrcAndEncoding.expectedProp}&gt; but was &lt;${useSrcAndEncoding.prop}&gt;" unless="useSrcAndEncoding.testOK" />
+    <fail message="expected &lt;${useSrcAndEncoding.expectedProp}&gt; but was &lt;${useSrcAndEncoding.prop}&gt;" unless="useSrcAndEncoding.testOK"/>
   </target>
 
   <target name="useCompiled">
 
     <!-- Test with 'javax' manager, 'bsf' manager already compiles the script. -->
-    <scriptdef manager="javax" name="heavyscript" language="javascript" src="heavy-script.js" encoding="UTF-8" compiled="true" />
-
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
-    <heavyscript />
+    <scriptdef manager="javax" name="heavyscript" language="javascript" src="heavy-script.js" encoding="UTF-8" compiled="true"/>
+
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
+    <heavyscript/>
 
   </target>
 
   <target name="useNotCompiled">
 
-    <scriptdef manager="javax" name="heavyscriptNotCompiled" language="javascript" src="heavy-script.js" encoding="UTF-8" compiled="false" />
-
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
-    <heavyscriptNotCompiled />
+    <scriptdef manager="javax" name="heavyscriptNotCompiled" language="javascript" src="heavy-script.js" encoding="UTF-8" compiled="false"/>
+
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
+    <heavyscriptNotCompiled/>
 
   </target>
 
diff --git a/src/etc/testcases/taskdefs/optional/unix/symlink.xml b/src/etc/testcases/taskdefs/optional/unix/symlink.xml
index 134f29f18..68c1304cc 100644
--- a/src/etc/testcases/taskdefs/optional/unix/symlink.xml
+++ b/src/etc/testcases/taskdefs/optional/unix/symlink.xml
@@ -33,44 +33,44 @@
 
 <project name="symlink-test" basedir="." default="all">
 
-  <!-- 
+  <!--
        Since the symlink task and some of these targets rely on
-       calls to exec, it may be possible for the JVM to outrun the 
+       calls to exec, it may be possible for the JVM to outrun the
        execution of the command line  system calls, so this value is
        the number of seconds we give the operating system to
-       catch up before executing a task that depends on the 
+       catch up before executing a task that depends on the
        completion of previous tasks. This delay is also added to
        the end of each target so junit doesn't go testing things
        before they have finnished (hopefully). Tweak if needed.
   -->
 
   <property name="delay" value="0"/>
- 
+
   <import file="../../../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
   </target>
 
 
   <target name="all"
               depends="setUp, test-single, test-delete, test-record, test-recreate, tearDown"/>
-        
+
   <!-- test for action = single -->
-  <!-- 
+  <!--
     Creates:
          File: ${output}/symlink.test
          Link: ${output}/singletest
   -->
   <target name="test-single">
     <touch file="${output}/symlink.test"/>
-    <symlink resource="${output}/symlink.test" 
-             link="${output}/singletest" 
+    <symlink resource="${output}/symlink.test"
+             link="${output}/singletest"
              failonerror="yes"/>
     <sleep seconds="${delay}"/> <!-- make sure OS has time to catch up -->
-    <available file="${output}/symlink.test" 
+    <available file="${output}/symlink.test"
                property="test.single.file.created"/>
-    <available file="${output}/singletest" 
+    <available file="${output}/singletest"
                property="test.single.link.created"/>
   </target>
 
@@ -78,7 +78,7 @@
 
   <!-- test for action = delete  (no calls to command line so no sleep) -->
 
-  <!-- 
+  <!--
     Creates:
          (none)
     Deletes:
@@ -87,8 +87,8 @@
 
   <target name="test-delete">
     <touch file="${output}/symlink.test"/>
-    <symlink resource="${output}/symlink.test" 
-             link="${output}/singletest" 
+    <symlink resource="${output}/symlink.test"
+             link="${output}/singletest"
              failonerror="yes"/>
     <sleep seconds="${delay}"/> <!-- make sure OS has time to catch up -->
 
@@ -96,19 +96,19 @@
     <symlink action="delete" link="${output}/symlink.test" failonerror="no"/>
     <sleep seconds="${delay}"/> <!-- make sure OS has time to catch up -->
 
-    <available file="${output}/symlink.test" 
+    <available file="${output}/symlink.test"
                property="test.delete.file.still.there"/>
-    <available file="${output}/singletest" 
+    <available file="${output}/singletest"
                property="test.delete.link.still.there"
                value="ERROR: link deletion failed"/>
-    
+
   </target>
 
 
 
   <!-- test for action = record -->
 
-  <!-- 
+  <!--
     Creates:
          Dir:  ${output}/symtest1
          Dir:  ${output}/symtest1/symtest2
@@ -143,22 +143,22 @@
     <touch file="${output}/symtest1/symtest3/fileB"/>
     <touch file="${output}/symtest1/symtest3/fileC"/>
 
-    <symlink resource="${output}/symtest1/file1" 
-             link="${output}/symtest1/link1" 
-             failonerror="no" />
-    <symlink resource="${output}/symtest1/symtest2/file2" 
-             link="${output}/symtest1/link2" 
-             failonerror="no" />
-    <symlink resource="${output}/symtest1/symtest2/file2" 
-             link="${output}/symtest1/symtest2/link3" 
-             failonerror="no" />
+    <symlink resource="${output}/symtest1/file1"
+             link="${output}/symtest1/link1"
+             failonerror="no"/>
+    <symlink resource="${output}/symtest1/symtest2/file2"
+             link="${output}/symtest1/link2"
+             failonerror="no"/>
+    <symlink resource="${output}/symtest1/symtest2/file2"
+             link="${output}/symtest1/symtest2/link3"
+             failonerror="no"/>
     <symlink resource="${output}/symtest1/symtest3"
              link="${output}/symtest1/dirlink"
-             failonerror="no" />
-    <symlink resource="${output}/symtest1/symtest3" 
+             failonerror="no"/>
+    <symlink resource="${output}/symtest1/symtest3"
              link="${output}/symtest1/dirlink2"
              failonerror="no"/>
-    <symlink resource="${output}/symtest1/symtest3" 
+    <symlink resource="${output}/symtest1/symtest3"
              link="${output}/symtest1/dirlink3"
              failonerror="no"/>
 
@@ -217,7 +217,7 @@
 
     <!-- this is redundant for this test, but used in the recreate test -->
 
-    <available file="${output}/symtest1/dirlink2" 
+    <available file="${output}/symtest1/dirlink2"
                property="test.record.dirlink2.created"/>
 
     <!-- Test to see if the linkfiles were created -->
@@ -239,7 +239,7 @@
 
   <!-- test for action = recreate -->
 
-  <!-- 
+  <!--
     Deletes:
          Link: ${output}/symtest1/link1==>${output}/symtest1/file1
          Link: ${output}/symtest1/link2==>${output}/symtest1/symtest2/file2
@@ -278,7 +278,7 @@
 
     <sleep seconds="${delay}"/>  <!-- make sure OS has time to catch up -->
 
-    <symlink resource="${output}/symtest1/symtest2" 
+    <symlink resource="${output}/symtest1/symtest2"
              link="${output}/symtest1/dirlink3"
              failonerror="no"/>
 
@@ -321,7 +321,7 @@
                property="test.recreate.dirlink.recreated"/>
 
     <!-- this should not get set -->
-    <available file="${output}/symtest1/symtest3/symtest3" 
+    <available file="${output}/symtest1/symtest3/symtest3"
                property="test.recreate.dirlink2.recreated.twice"
                value="ERROR: dirlink2 was created a second time (bug 25181)"/>
 
@@ -329,7 +329,7 @@
 
     <sleep seconds="${delay}"/>  <!-- make sure OS has time to do the execs -->
 
-    <available file="${output}/symtest1/symtest3/WhereAmI" 
+    <available file="${output}/symtest1/symtest3/WhereAmI"
                property="test.recreate.dirlink3.was.altered"/>
   </target>
 
diff --git a/src/etc/testcases/taskdefs/optional/xalan-redirect-in.xsl b/src/etc/testcases/taskdefs/optional/xalan-redirect-in.xsl
index b9d079499..4cd1345c3 100644
--- a/src/etc/testcases/taskdefs/optional/xalan-redirect-in.xsl
+++ b/src/etc/testcases/taskdefs/optional/xalan-redirect-in.xsl
@@ -25,7 +25,7 @@ for a xsl...the behavior might be dependent on Xalan1
 and Xalan2...this will be a problem to erase the files :(
 Can take as a systemid the base for the xsl document or
 the base or the JVM working dir just like: new File("xalan-redirect-out.tmp")
--->	
+-->
 <xsl:param name="xalan-version" select="'x'"/>
 
 <xsl:template match="/">
diff --git a/src/etc/testcases/taskdefs/optional/xml/about.xml b/src/etc/testcases/taskdefs/optional/xml/about.xml
index f6a9dab5d..3811ce59e 100644
--- a/src/etc/testcases/taskdefs/optional/xml/about.xml
+++ b/src/etc/testcases/taskdefs/optional/xml/about.xml
@@ -17,8 +17,7 @@
 -->
 <!DOCTYPE doc PUBLIC
   "-//stevo//DTD doc 1.0//EN"
-  "http://chemical/brothers"
-  >
+  "http://chemical/brothers">
 <doc>
   <section title="About">
   in the absence of technology, there is only marketing
diff --git a/src/etc/testcases/taskdefs/optional/xml/apache.xsl b/src/etc/testcases/taskdefs/optional/xml/apache.xsl
index 120addf87..215898ec2 100644
--- a/src/etc/testcases/taskdefs/optional/xml/apache.xsl
+++ b/src/etc/testcases/taskdefs/optional/xml/apache.xsl
@@ -31,5 +31,5 @@
         <xsl:value-of select="@name"/>
       </xsl:attribute>
     </author>
-  </xsl:template> 
+  </xsl:template>
 </xsl:stylesheet>
diff --git a/src/etc/testcases/taskdefs/optional/xml/doc-in-ns.xsd b/src/etc/testcases/taskdefs/optional/xml/doc-in-ns.xsd
index b34147c44..7fe2378ba 100644
--- a/src/etc/testcases/taskdefs/optional/xml/doc-in-ns.xsd
+++ b/src/etc/testcases/taskdefs/optional/xml/doc-in-ns.xsd
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	targetNamespace="http://apache.org/ant/doc/"
 	xmlns:tns="http://apache.org/ant/doc/"
 	elementFormDefault="qualified">
diff --git a/src/etc/testcases/taskdefs/optional/xml/doc.dtd b/src/etc/testcases/taskdefs/optional/xml/doc.dtd
index 51629d584..baa5cab43 100644
--- a/src/etc/testcases/taskdefs/optional/xml/doc.dtd
+++ b/src/etc/testcases/taskdefs/optional/xml/doc.dtd
@@ -17,8 +17,3 @@
 <!ELEMENT doc (section) >
 <!ELEMENT section (#PCDATA)>
 <!ATTLIST section title CDATA #IMPLIED>
-
-
-
-
-
diff --git a/src/etc/testcases/taskdefs/optional/xml/doc.xsd b/src/etc/testcases/taskdefs/optional/xml/doc.xsd
index eeedbcafe..56aef0a30 100644
--- a/src/etc/testcases/taskdefs/optional/xml/doc.xsd
+++ b/src/etc/testcases/taskdefs/optional/xml/doc.xsd
@@ -15,8 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xs:schema 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+<xs:schema
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
   elementFormDefault="qualified">
   <xs:element name="doc">
     <xs:complexType>
diff --git a/src/etc/testcases/taskdefs/optional/xml/doc.xsl b/src/etc/testcases/taskdefs/optional/xml/doc.xsl
index 3d9c2a4e7..4edb8479b 100644
--- a/src/etc/testcases/taskdefs/optional/xml/doc.xsl
+++ b/src/etc/testcases/taskdefs/optional/xml/doc.xsl
@@ -15,12 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsl:stylesheet 
+<xsl:stylesheet
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:template="struts template" 
+    xmlns:template="struts template"
     version="1.0">
 <xsl:output method="text"/>
 <xsl:template match="/">
 <xsl:value-of select="/doc/section"/>
-</xsl:template> 
+</xsl:template>
 </xsl:stylesheet>
diff --git a/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema-invalid.xml b/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema-invalid.xml
index ec5808549..588ac2b8f 100644
--- a/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema-invalid.xml
+++ b/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema-invalid.xml
@@ -16,15 +16,15 @@
   limitations under the License.
 -->
 
-<!-- 
-    Invalid test XML file without any schema refeferences 
+<!--
+    Invalid test XML file without any schema refeferences
 -->
 <doc>
     <section title="endpiece">
-        With a little luck, the network will pick me up. 
+        With a little luck, the network will pick me up.
         This is Ripley - last survivor of The Nostromo - signing off.
     </section>
-    
+
     <invalidelement/>
-    
+
 </doc>
diff --git a/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema.xml b/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema.xml
index 7ae559d90..ecca43d97 100644
--- a/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema.xml
+++ b/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema.xml
@@ -16,13 +16,13 @@
   limitations under the License.
 -->
 
-<!-- 
-    Test XML file without any schema refeferences 
+<!--
+    Test XML file without any schema refeferences
 -->
 <doc>
     <section title="endpiece">
-        With a little luck, the network will pick me up. 
+        With a little luck, the network will pick me up.
         This is Ripley - last survivor of The Nostromo - signing off.
     </section>
-    
+
 </doc>
diff --git a/src/etc/testcases/taskdefs/optional/xml/endpiece-ns-no-location.xml b/src/etc/testcases/taskdefs/optional/xml/endpiece-ns-no-location.xml
index 3fe93c7c4..471af9634 100644
--- a/src/etc/testcases/taskdefs/optional/xml/endpiece-ns-no-location.xml
+++ b/src/etc/testcases/taskdefs/optional/xml/endpiece-ns-no-location.xml
@@ -17,7 +17,7 @@
 -->
 <doc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="doc-in-ns.xsd" xmlns="http://apache.org/ant/doc/">
 	<section title="endpiece">
- With a little luck, the network will pick me up. 
+ With a little luck, the network will pick me up.
  This is Ripley - last survivor of The Nostromo - signing off.
   </section>
 </doc>
diff --git a/src/etc/testcases/taskdefs/optional/xml/endpiece.xml b/src/etc/testcases/taskdefs/optional/xml/endpiece.xml
index 3fe93c7c4..471af9634 100644
--- a/src/etc/testcases/taskdefs/optional/xml/endpiece.xml
+++ b/src/etc/testcases/taskdefs/optional/xml/endpiece.xml
@@ -17,7 +17,7 @@
 -->
 <doc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="doc-in-ns.xsd" xmlns="http://apache.org/ant/doc/">
 	<section title="endpiece">
- With a little luck, the network will pick me up. 
+ With a little luck, the network will pick me up.
  This is Ripley - last survivor of The Nostromo - signing off.
   </section>
 </doc>
diff --git a/src/etc/testcases/taskdefs/optional/xml/endpiece2.xml b/src/etc/testcases/taskdefs/optional/xml/endpiece2.xml
index eec49f6fd..a7f107aa2 100644
--- a/src/etc/testcases/taskdefs/optional/xml/endpiece2.xml
+++ b/src/etc/testcases/taskdefs/optional/xml/endpiece2.xml
@@ -15,11 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<doc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<doc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="doc.xsd"
     xmlns="http://Massive/Attack+Mezzanine">
   <section title="endpiece">
- With a little luck, the network will pick me up. 
+ With a little luck, the network will pick me up.
  This is Ripley - last survivor of The Nostromo - signing off.
  <illegal-element/>
   </section>
diff --git a/src/etc/testcases/taskdefs/optional/xml/stylesheet_include.xsl b/src/etc/testcases/taskdefs/optional/xml/stylesheet_include.xsl
index 9c1ffad76..6ab86d951 100644
--- a/src/etc/testcases/taskdefs/optional/xml/stylesheet_include.xsl
+++ b/src/etc/testcases/taskdefs/optional/xml/stylesheet_include.xsl
@@ -24,5 +24,5 @@
         <xsl:value-of select="@name"/>
       </xsl:attribute>
     </author>
-  </xsl:template> 
+  </xsl:template>
 </xsl:stylesheet>
diff --git a/src/etc/testcases/taskdefs/optional/xml/test.xml b/src/etc/testcases/taskdefs/optional/xml/test.xml
index 7f2abe005..f4ed857e2 100644
--- a/src/etc/testcases/taskdefs/optional/xml/test.xml
+++ b/src/etc/testcases/taskdefs/optional/xml/test.xml
@@ -22,4 +22,3 @@
     <c>indented</c>
   </b>
 </root>
-  
\ No newline at end of file
diff --git a/src/etc/testcases/taskdefs/optional/xml/test.xsl b/src/etc/testcases/taskdefs/optional/xml/test.xsl
index 8d28eb3f6..41510393d 100644
--- a/src/etc/testcases/taskdefs/optional/xml/test.xsl
+++ b/src/etc/testcases/taskdefs/optional/xml/test.xsl
@@ -21,5 +21,5 @@
     <xsl:copy>
       <xsl:apply-templates select="@*|node()"/>
     </xsl:copy>
-  </xsl:template>  
-</xsl:stylesheet>
\ No newline at end of file
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/src/etc/testcases/taskdefs/optional/xml/validate.xml b/src/etc/testcases/taskdefs/optional/xml/validate.xml
index cade722a8..a7a766709 100644
--- a/src/etc/testcases/taskdefs/optional/xml/validate.xml
+++ b/src/etc/testcases/taskdefs/optional/xml/validate.xml
@@ -19,10 +19,10 @@
 
  <target name="testValidate">
     <xmlvalidate warn="false">
-      <fileset dir="." includes="about.xml"/>  
+      <fileset dir="." includes="about.xml"/>
        <dtd publicID="-//stevo//DTD doc 1.0//EN"
          location="doc.dtd"/>
     </xmlvalidate>
   </target>
-  
+
 </project>
diff --git a/src/etc/testcases/taskdefs/optional/xmlvalidate.xml b/src/etc/testcases/taskdefs/optional/xmlvalidate.xml
index cd7cc45e9..38a4d74f5 100644
--- a/src/etc/testcases/taskdefs/optional/xmlvalidate.xml
+++ b/src/etc/testcases/taskdefs/optional/xmlvalidate.xml
@@ -19,16 +19,16 @@
 
   <target name="testValidate">
     <xmlvalidate warn="false">
-      <fileset dir="xml" includes="**/about.xml"/>  
+      <fileset dir="xml" includes="**/about.xml"/>
        <dtd publicID="-//stevo//DTD doc 1.0//EN"
-         location="xml/doc.dtd"/>
+            location="xml/doc.dtd"/>
     </xmlvalidate>
   </target>
-  
+
   <target name="testDeepValidate">
-    <ant dir="xml" 
-      antfile="validate.xml"
-      target="testValidate"/>
+    <ant dir="xml"
+         antfile="validate.xml"
+         target="testValidate"/>
   </target>
 
   <target name="xmlcatalog">
@@ -55,8 +55,8 @@
     <xmlvalidate warn="false">
       <fileset dir="xml" includes="**/about.xml"/>
       <xmlcatalog classpath="xml">
-        <entity publicID = "bogusImage"
-                 location = "/i/dont/exist.jpg"/>
+        <entity publicID="bogusImage"
+                location="/i/dont/exist.jpg"/>
         <xmlcatalog>
           <dtd publicID="-//stevo//DTD doc 1.0//EN"
                location="doc.dtd"/>
@@ -78,7 +78,7 @@
       </xmlcatalog>
     </xmlvalidate>
   </target>
- 
+
   <target name="xmlcatalogpath-override">
     <xmlvalidate warn="false">
       <fileset dir="xml" includes="**/about.xml"/>
@@ -87,11 +87,11 @@
           <pathelement location="xml/catalog"/>
         </catalogpath>
         <dtd publicID="-//stevo//DTD doc 1.0//EN"
-          location="doc.dtd"/>
+             location="doc.dtd"/>
       </xmlcatalog>
     </xmlvalidate>
   </target>
- 
+
   <target name="xmlcatalogfiles">
     <xmlvalidate warn="false">
       <fileset dir="xml" includes="**/about.xml"/>
@@ -102,7 +102,7 @@
       </xmlcatalog>
     </xmlvalidate>
   </target>
- 
+
   <target name="xmlcatalogpath">
     <xmlvalidate warn="false">
       <fileset dir="xml" includes="**/about.xml"/>
@@ -115,13 +115,13 @@
   </target>
 
   <target name="testSchemaGood">
-    <xmlvalidate warn="false" lenient="no" >
+    <xmlvalidate warn="false" lenient="no">
       <fileset dir="xml" includes="endpiece.xml"/>
 
-        <attribute name="http://xml.org/sax/features/validation"
-                   value="false"/>
-        <attribute name="http://apache.org/xml/features/validation/schema"
-                   value="false"/>
+      <attribute name="http://xml.org/sax/features/validation"
+                 value="false"/>
+      <attribute name="http://apache.org/xml/features/validation/schema"
+                 value="false"/>
 
     </xmlvalidate>
   </target>
@@ -129,14 +129,14 @@
   <target name="testSchemaBad">
     <xmlvalidate warn="false">
       <fileset dir="xml" includes="endpiece2.xml"/>
-      
-        <attribute name="http://xml.org/sax/features/validation"
-                   value="true"/>
-        <attribute name="http://apache.org/xml/features/validation/schema"
-                   value="true"/>
+
+      <attribute name="http://xml.org/sax/features/validation"
+                 value="true"/>
+      <attribute name="http://apache.org/xml/features/validation/schema"
+                 value="true"/>
     </xmlvalidate>
   </target>
-    
+
   <target name="testIso2022Jp">
     <xmlvalidate warn="false" file="xml/iso-2022-jp.xml"/>
   </target>
@@ -151,20 +151,20 @@
 
     <!-- Converts path to URL format -->
     <pathconvert dirsep="/" property="xsd.file">
-    <path>
-    <pathelement location="xml/doc.xsd"/>
-    </path>
+      <path>
+        <pathelement location="xml/doc.xsd"/>
+      </path>
     </pathconvert>
 
     <xmlvalidate file="xml/endpiece-noSchema.xml" lenient="false"
-        failonerror="true" warn="true">
+                 failonerror="true" warn="true">
 
-        <attribute name="http://apache.org/xml/features/validation/schema"
-            value="true"/>
+      <attribute name="http://apache.org/xml/features/validation/schema"
+                 value="true"/>
 
-        <property
-        name="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"
-        value="${xsd.file}"/>
+      <property
+          name="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"
+          value="${xsd.file}"/>
     </xmlvalidate>
   </target>
 
@@ -172,37 +172,36 @@
   <!-- Tests property element with XML file that fails schema validation -->
   <target name="testProperty.invalidXML">
 
-      <!-- Converts path to URL format -->
-      <pathconvert dirsep="/" property="xsd.file">
-          <path>
-              <pathelement location="xml/doc.xsd"/>
-          </path>
-      </pathconvert>
+    <!-- Converts path to URL format -->
+    <pathconvert dirsep="/" property="xsd.file">
+      <path>
+        <pathelement location="xml/doc.xsd"/>
+      </path>
+    </pathconvert>
 
-      <xmlvalidate file="xml/endpiece-noSchema-invalid.xml" lenient="false"
-        failonerror="true" warn="true">
+    <xmlvalidate file="xml/endpiece-noSchema-invalid.xml" lenient="false"
+                 failonerror="true" warn="true">
 
-        <attribute name="http://apache.org/xml/features/validation/schema"
-                   value="true"/>
+      <attribute name="http://apache.org/xml/features/validation/schema"
+                 value="true"/>
 
-        <property
-            name="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"
-            value="${xsd.file}"/>
-      </xmlvalidate>
+      <property
+          name="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"
+          value="${xsd.file}"/>
+    </xmlvalidate>
   </target>
 
   <target name="testSchemaWithXSD">
-    <xmlvalidate warn="false" lenient="false" 
-        file="xml/endpiece-noSchema.xml">
-      
-        <attribute name="http://apache.org/xml/features/validation/schema"
-                   value="true"/>
-        <property
-            name="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"
-            value="${xsd.file}"/>
-
-       </xmlvalidate>
-  </target>
-  
-</project>
+    <xmlvalidate warn="false" lenient="false"
+                 file="xml/endpiece-noSchema.xml">
+
+      <attribute name="http://apache.org/xml/features/validation/schema"
+                 value="true"/>
+      <property
+          name="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"
+          value="${xsd.file}"/>
 
+    </xmlvalidate>
+  </target>
+
+</project>
diff --git a/src/etc/testcases/taskdefs/optional/xslt.xml b/src/etc/testcases/taskdefs/optional/xslt.xml
index d872ea8c3..15c522f7a 100644
--- a/src/etc/testcases/taskdefs/optional/xslt.xml
+++ b/src/etc/testcases/taskdefs/optional/xslt.xml
@@ -21,7 +21,7 @@
   <import file="../../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
   </target>
 
   <target name="initNonAscii" depends="setUp">
@@ -42,12 +42,12 @@
            style="xml/doc.xsl">
      </xslt>
   </target>
-  
+
   <xmlcatalog id="xdocs.catalog">
    <dtd publicID="-//stevo//DTD doc 1.0//EN"
      location="xml/doc.dtd"/>
-  </xmlcatalog>  
-  
+  </xmlcatalog>
+
   <target name="testCatalog" depends="setUp">
     <xslt destdir="${output}"
            includes="about.xml"
@@ -67,8 +67,8 @@
       <outputproperty name="indent" value="yes"/>
     </xslt>
   </target>
-  
-  
+
+
   <target name="testFactory" depends="setUp">
     <xslt in="xml/test.xml"
            out="${output}/test-out.xml"
diff --git a/src/etc/testcases/taskdefs/parallel.xml b/src/etc/testcases/taskdefs/parallel.xml
index 9a3434c1d..250416c2a 100644
--- a/src/etc/testcases/taskdefs/parallel.xml
+++ b/src/etc/testcases/taskdefs/parallel.xml
@@ -129,7 +129,7 @@
       </sequential>
     </parallel>
     <echo>|</echo>
-    
+
   </target>
 
   <target name="testDemux">
@@ -141,7 +141,7 @@
       <demuxtest/>
     </parallel>
   </target>
-  
+
   <target name="testSingleExit">
     <parallel>
       <echo message="all is well"/>
@@ -157,7 +157,7 @@
   </target>
 
   <target name="help">
-    <echo>Test build file for the &lt;parallel&gt; task.</echo> 
+    <echo>Test build file for the &lt;parallel&gt; task.</echo>
     <echo>Use the various targets to run the tests.</echo>
   </target>
 </project>
diff --git a/src/etc/testcases/taskdefs/pathconvert.xml b/src/etc/testcases/taskdefs/pathconvert.xml
index 5a1cdf74b..4c5448642 100644
--- a/src/etc/testcases/taskdefs/pathconvert.xml
+++ b/src/etc/testcases/taskdefs/pathconvert.xml
@@ -20,25 +20,25 @@
     <import file="../buildfiletest-base.xml"/>
 
     <path id="testpath">
-        <pathelement path="${ant.file}" />
+        <pathelement path="${ant.file}"/>
     </path>
 
     <target name="testmap">
         <pathconvert property="result" dirsep="#">
-            <path refid="testpath" />
-            <map from="${basedir}" to="test" />
+            <path refid="testpath"/>
+            <map from="${basedir}" to="test"/>
         </pathconvert>
     </target>
 
     <target name="testmapper">
         <pathconvert property="result" dirsep="#">
-            <path refid="testpath" />
-            <mapper type="glob" from="${basedir}*" to="test*" />
+            <path refid="testpath"/>
+            <mapper type="glob" from="${basedir}*" to="test*"/>
         </pathconvert>
     </target>
 
     <target name="testnotargetos">
-        <pathconvert property="result" refid="testpath" />
+        <pathconvert property="result" refid="testpath"/>
     </target>
 
     <target name="test-nonmatching-mapper" description="test for bug fix bz-62076">
diff --git a/src/etc/testcases/taskdefs/presetdef.xml b/src/etc/testcases/taskdefs/presetdef.xml
index 695747eb7..9fd1341dc 100644
--- a/src/etc/testcases/taskdefs/presetdef.xml
+++ b/src/etc/testcases/taskdefs/presetdef.xml
@@ -17,10 +17,10 @@
 -->
 <project>
   <path id="test-classes">
-    <pathelement location="../../../../build/testcases" />
-    <pathelement path="${java.class.path}" />
+    <pathelement location="../../../../build/testcases"/>
+    <pathelement path="${java.class.path}"/>
   </path>
-  
+
   <target name="simple">
     <presetdef name="my.echo">
       <echo message="Hello world"/>
@@ -75,7 +75,7 @@
         <include name="**/*.java"/>
       </fileset>
     </presetdef>
-    
+
     <anttypetest>
       <fileset ant-type="java.fileset" dir="."/>
       <configured ant-type="java.fileset" dir="."/>
diff --git a/src/etc/testcases/taskdefs/property.xml b/src/etc/testcases/taskdefs/property.xml
index 2e0c8353e..19c5b57e4 100644
--- a/src/etc/testcases/taskdefs/property.xml
+++ b/src/etc/testcases/taskdefs/property.xml
@@ -21,7 +21,7 @@
   <import file="../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
   </target>
 
   <available property="java5+" classname="java.lang.Iterable"/>
@@ -41,13 +41,13 @@
   </target>
 
   <target name="test4">
-    <property name="http.port" value="999" />
+    <property name="http.port" value="999"/>
     <property file="property3.properties"/>
     <echo message="http.url is ${http.url}"/>
   </target>
 
   <target name="test5">
-    <property name="http.port" value="999" />
+    <property name="http.port" value="999"/>
     <property url="${test5.url}"/>
     <echo message="http.url is ${http.url}"/>
   </target>
@@ -81,13 +81,13 @@
     &lt;entry key=&quot;xml.one&quot;&gt;ONE&lt;/entry&gt;
     &lt;entry key=&quot;xml.two&quot;&gt;TWO&lt;/entry&gt;
 &lt;/properties&gt;
-    </echo>  
-  </target>      
+    </echo>
+  </target>
 
   <target name="testXmlProperty.internal" depends="genXmlPropFile" if="java5+">
       <property file="${output}/props.xml"/>
-  </target>    
-  <target name="testXmlProperty" depends="testXmlProperty.internal"/>  
+  </target>
+  <target name="testXmlProperty" depends="testXmlProperty.internal"/>
 
   <target name="testRuntime">
     <property runtime="testruntime"/>
diff --git a/src/etc/testcases/taskdefs/recorder2.xml b/src/etc/testcases/taskdefs/recorder2.xml
index e093cf519..094782a4f 100644
--- a/src/etc/testcases/taskdefs/recorder2.xml
+++ b/src/etc/testcases/taskdefs/recorder2.xml
@@ -18,12 +18,12 @@
 <project name="recorder-test" default="test6" basedir=".">
 
     <target name="test6">
-        <record name="${output}/rectest6.log" action="start" />
+        <record name="${output}/rectest6.log" action="start"/>
         <echo message="some message6"/>
-        <record name="${output}/rectest5.log" action="stop" />
+        <record name="${output}/rectest5.log" action="stop"/>
         <echo message="some message7"/>
-        <record name="${output}/rectest5.log" action="start" />
+        <record name="${output}/rectest5.log" action="start"/>
         <echo message="some message8"/>
-        <record name="${output}/rectest6.log" action="stop" />
+        <record name="${output}/rectest6.log" action="stop"/>
     </target>
 </project>
diff --git a/src/etc/testcases/taskdefs/rename.xml b/src/etc/testcases/taskdefs/rename.xml
index a23a81e1b..49b776c33 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>
 
diff --git a/src/etc/testcases/taskdefs/replace.xml b/src/etc/testcases/taskdefs/replace.xml
index a4039e536..b4ba9aed3 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">
diff --git a/src/etc/testcases/taskdefs/rmic/rmic.xml b/src/etc/testcases/taskdefs/rmic/rmic.xml
index 1ef900da5..badae32b8 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">
@@ -235,37 +234,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/>
@@ -278,71 +277,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">
@@ -367,10 +358,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}"
@@ -381,30 +371,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">
@@ -413,19 +399,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>
 
diff --git a/src/etc/testcases/taskdefs/signjar.xml b/src/etc/testcases/taskdefs/signjar.xml
index 38a13592c..7c55e589a 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>
diff --git a/src/etc/testcases/taskdefs/sleep.xml b/src/etc/testcases/taskdefs/sleep.xml
index e16132274..34314be26 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>
diff --git a/src/etc/testcases/taskdefs/style/build.xml b/src/etc/testcases/taskdefs/style/build.xml
index c91d10f69..82b3847fa 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>
diff --git a/src/etc/testcases/taskdefs/sync.xml b/src/etc/testcases/taskdefs/sync.xml
index d2eb126e7..bc2836239 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>
diff --git a/src/etc/testcases/taskdefs/tar.xml b/src/etc/testcases/taskdefs/tar.xml
index 2eda0b544..f979d8be5 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">
diff --git a/src/etc/testcases/taskdefs/taskdef.xml b/src/etc/testcases/taskdefs/taskdef.xml
index 4b0658e40..6b654494e 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>
diff --git a/src/etc/testcases/taskdefs/test.antlib.xml b/src/etc/testcases/taskdefs/test.antlib.xml
index 37ff7f8ec..81123ad40 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>
diff --git a/src/etc/testcases/taskdefs/test2.antlib.xml b/src/etc/testcases/taskdefs/test2.antlib.xml
index 9a2509ec6..3c4ce2ab3 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>
diff --git a/src/etc/testcases/taskdefs/touch.xml b/src/etc/testcases/taskdefs/touch.xml
index 3b426d908..8aab42ed8 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>
diff --git a/src/etc/testcases/taskdefs/typeadapter.xml b/src/etc/testcases/taskdefs/typeadapter.xml
index c2aa70e1c..09bb6eb67 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">
diff --git a/src/etc/testcases/taskdefs/typedef.xml b/src/etc/testcases/taskdefs/typedef.xml
index 1c7922b99..a63f28dba 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"/>
   </target>
-  
+
   <target name="noresourcefail">
   	<typedef resource="somenotpresentfile.properties" onerror="fail"/>
   </target>
-  
+
   <target name="noresourcenotfail">
-  	<typedef resource="somenotpresentfile.properties" />
+  	<typedef resource="somenotpresentfile.properties"/>
   </target>
 </project>
diff --git a/src/etc/testcases/taskdefs/untar.xml b/src/etc/testcases/taskdefs/untar.xml
index 04d44b37f..0990d6605 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>
diff --git a/src/etc/testcases/taskdefs/unzip.xml b/src/etc/testcases/taskdefs/unzip.xml
index ee96ee1f0..1ca5c8120 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>
 
diff --git a/src/etc/testcases/taskdefs/war.xml b/src/etc/testcases/taskdefs/war.xml
index b000ecf5b..de4803910 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>
diff --git a/src/etc/testcases/taskdefs/xmlns.xml b/src/etc/testcases/taskdefs/xmlns.xml
index e69916610..19ab9cc75 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>
diff --git a/src/etc/testcases/taskdefs/xmlproperty/inputs/original.xml b/src/etc/testcases/taskdefs/xmlproperty/inputs/original.xml
index ef2603cc7..dcda6bbd3 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>
-
diff --git a/src/etc/testcases/taskdefs/xmlproperty_data.dtd b/src/etc/testcases/taskdefs/xmlproperty_data.dtd
index 5d75d6e51..11d6581ec 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)>
-
diff --git a/src/etc/testcases/taskdefs/zip.xml b/src/etc/testcases/taskdefs/zip.xml
index 61a54a337..4a84106c3 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>
diff --git a/src/etc/testcases/types/addtype.xml b/src/etc/testcases/types/addtype.xml
index cc8ff24c8..84247ed70 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/>
diff --git a/src/etc/testcases/types/assertions.xml b/src/etc/testcases/types/assertions.xml
index a849a0b94..0ba1f1966 100644
--- a/src/etc/testcases/types/assertions.xml
+++ b/src/etc/testcases/types/assertions.xml
@@ -27,61 +27,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
@@ -90,14 +89,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 -->
@@ -105,38 +104,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">
@@ -144,58 +143,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>
diff --git a/src/etc/testcases/types/filterset.xml b/src/etc/testcases/types/filterset.xml
index bf291e7d7..acb4a0dfb 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>
 
diff --git a/src/etc/testcases/types/flexinteger.xml b/src/etc/testcases/types/flexinteger.xml
index aa10aa07a..35ad96017 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>
diff --git a/src/etc/testcases/types/mapper.xml b/src/etc/testcases/types/mapper.xml
index a96f10cb3..5affffcd5 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"/>
diff --git a/src/etc/testcases/types/mappers/define.mapperresult.xml b/src/etc/testcases/types/mappers/define.mapperresult.xml
index d9152a1ca..a14ba164f 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="&lt;NULL&gt;" />           
+  <!-- this is what you get with no result -->
+  <property name="no-results" value="&lt;NULL&gt;"/>
 </project>
diff --git a/src/etc/testcases/types/mappers/globmapper.xml b/src/etc/testcases/types/mappers/globmapper.xml
index 1666d8102..1c4f29c49 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"/>
diff --git a/src/etc/testcases/types/mappers/scriptmapper.xml b/src/etc/testcases/types/mappers/scriptmapper.xml
index d3e7a8d08..27acfedaf 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>
diff --git a/src/etc/testcases/types/poly.xml b/src/etc/testcases/types/poly.xml
index cabf9ece6..adf2bca60 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">
diff --git a/src/etc/testcases/types/quote1.xml b/src/etc/testcases/types/quote1.xml
index 8e77122cc..cef576d29 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>
diff --git a/src/etc/testcases/types/quote2.xml b/src/etc/testcases/types/quote2.xml
index ef9a3c3ed..8859d83be 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>
-
diff --git a/src/etc/testcases/types/redirector.xml b/src/etc/testcases/types/redirector.xml
index 4784e9f01..077bd42e6 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>
diff --git a/src/etc/testcases/types/resources/tarentry.xml b/src/etc/testcases/types/resources/tarentry.xml
index c0fa379c2..c4d60a705 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>
diff --git a/src/etc/testcases/types/selectors.xml b/src/etc/testcases/types/selectors.xml
index 5a80d04a0..dcd65ee0e 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>
diff --git a/src/etc/testcases/types/selectors/scriptselector.xml b/src/etc/testcases/types/selectors/scriptselector.xml
index 80afe3093..2405e3384 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>
diff --git a/src/etc/testcases/types/selectors/signedselector.xml b/src/etc/testcases/types/selectors/signedselector.xml
index 60fe94089..ea611e878 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">
diff --git a/src/etc/testcases/types/xmlcatalog.xml b/src/etc/testcases/types/xmlcatalog.xml
index 63269f77a..0c536661f 100644
--- a/src/etc/testcases/types/xmlcatalog.xml
+++ b/src/etc/testcases/types/xmlcatalog.xml
@@ -26,125 +26,120 @@
     buildfile is called by
     org.apache.tools.ant.types.XMLCatalogBuildFileTest.java
     Alternatively, you may try it out by hand by first removing the
-    comment symbols around the echo statements and then calling 
+    comment symbols around the echo statements and then calling
     ant -buildfile xmlcatalog.xml
   </description>
 
-  <property name="transformer" value = "xmlcatalog.xsl"/>
+  <property name="transformer" value="xmlcatalog.xsl"/>
 
-  <target 
-    name    = "all" 
-    depends = "testentitynocatalog, testentitywithcatalog, 
-    testdocumentnocatalog, testdocumentwithcatalog"/>
+  <target
+    name="all"
+    depends="testentitynocatalog, testentitywithcatalog, testdocumentnocatalog, testdocumentwithcatalog"/>
 
-  <target 
-    name        = "testentitynocatalog"
-    description = "Test external entity resolver for simple XML
-document without using XMLCatalog">
+  <target
+    name="testentitynocatalog"
+    description="Test external entity resolver for simple XML document without using XMLCatalog">
     <delete
-      quiet = "yes"
-      file  = "result.out"/>
+      quiet="yes"
+      file="result.out"/>
     <xslt
-      basedir   = "${basedir}"
-      destdir   = "${basedir}"
-      extension = ".text"
-      style     = "${transformer}"
-      in        = "xmlcatalog1.xml"
-      out       = "result.out">
+      basedir="${basedir}"
+      destdir="${basedir}"
+      extension=".text"
+      style="${transformer}"
+      in="xmlcatalog1.xml"
+      out="result.out">
       <param
-        name       = "outprop"
-        expression = "val1"/>
+        name="outprop"
+        expression="val1"/>
     </xslt>
-    <property file = "result.out"/>
-    <!-- <echo message = "${val1}"/> -->
+    <property file="result.out"/>
+    <!-- <echo message="${val1}"/> -->
     <delete
-      quiet = "yes"
-      file  = "result.out"/>
+      quiet="yes"
+      file="result.out"/>
   </target>
 
-  <target 
-    name        = "testentitywithcatalog"
-    description = "Test external entity resolver for simple
-XML document using XMLCatalog">
+  <target
+    name="testentitywithcatalog"
+    description="Test external entity resolver for simple XML document using XMLCatalog">
     <delete
-      quiet = "yes"
-      file  = "result.out"/>
+      quiet="yes"
+      file="result.out"/>
     <xslt
-      basedir   = "${basedir}"
-      destdir   = "${basedir}"
-      extension = ".text"
-      style     = "${transformer}"
-      in        = "xmlcatalog1.xml"
-      out       = "result.out">
+      basedir="${basedir}"
+      destdir="${basedir}"
+      extension=".text"
+      style="${transformer}"
+      in="xmlcatalog1.xml"
+      out="result.out">
       <param
-        name       = "outprop"
-        expression = "val2"/>
+        name="outprop"
+        expression="val2"/>
       <xmlcatalog>
-        <entity 
-          publicId = "myquote"
-          location = "quote2.xml"/>
+        <entity
+          publicId="myquote"
+          location="quote2.xml"/>
       </xmlcatalog>
     </xslt>
-    <property file = "result.out"/>
-    <!-- <echo message = "${val2}"/> -->
+    <property file="result.out"/>
+    <!-- <echo message="${val2}"/> -->
     <delete
-      quiet = "yes"
-      file  = "result.out"/>
+      quiet="yes"
+      file="result.out"/>
   </target>
 
-  <target 
-    name        = "testdocumentnocatalog"
-    description = "Test entity resolution in XML document called
-from XSLT document() function without using XMLCatalog">
+  <target
+    name="testdocumentnocatalog"
+    description="Test entity resolution in XML document called from XSLT document() function without using XMLCatalog">
     <delete
-      quiet = "yes"
-      file  = "result.out"/>
+      quiet="yes"
+      file="result.out"/>
     <xslt
-      basedir   = "${basedir}"
-      destdir   = "${basedir}"
-      extension = ".text"
-      style     = "${transformer}"
-      in        = "xmlcatalog2.xml"
-      out       = "result.out">
+      basedir="${basedir}"
+      destdir="${basedir}"
+      extension=".text"
+      style="${transformer}"
+      in="xmlcatalog2.xml"
+      out="result.out">
       <param
-        name       = "outprop"
-        expression = "val3"/>
+        name="outprop"
+        expression="val3"/>
     </xslt>
-    <property file = "result.out"/>
-    <!-- <echo message = "${val3}"/> -->
+    <property file="result.out"/>
+    <!-- <echo message="${val3}"/> -->
     <delete
-      quiet = "yes"
-      file  = "result.out"/>
+      quiet="yes"
+      file="result.out"/>
   </target>
 
-  <target 
-    name        = "testdocumentwithcatalog" 
-    description = "Test entity resolution in XML document called
-from XSLT document() function using XMLCatalog">
+  <target
+    name="testdocumentwithcatalog"
+    description="Test entity resolution in XML document called from XSLT document() function using XMLCatalog">
     <delete
-      quiet = "yes"
-      file  = "result.out"/>
+      quiet="yes"
+      file="result.out"/>
     <xslt
-      basedir   = "${basedir}"
-      destdir   = "${basedir}"
-      extension = ".text"
-      style     = "${transformer}"
-      in        = "xmlcatalog2.xml"
-      out       = "result.out">
+      basedir="${basedir}"
+      destdir="${basedir}"
+      extension=".text"
+      style="${transformer}"
+      in="xmlcatalog2.xml"
+      out="result.out">
       <param
-        name       = "outprop"
-        expression = "val4"/>
+        name="outprop"
+        expression="val4"/>
       <xmlcatalog>
-        <entity 
-          publicId = "myquote"
-          location = "quote2.xml"/>
+        <entity
+          publicId="myquote"
+          location="quote2.xml"/>
       </xmlcatalog>
     </xslt>
-    <property file = "result.out"/>
-    <!-- <echo message = "${val4}"/> -->
+    <property file="result.out"/>
+    <!-- <echo message="${val4}"/> -->
     <delete
-      quiet = "yes"
-      file  = "result.out"/>
+      quiet="yes"
+      file="result.out"/>
   </target>
 
 </project>
diff --git a/src/etc/testcases/types/xmlcatalog.xsl b/src/etc/testcases/types/xmlcatalog.xsl
index a2c839cad..62621eb9a 100644
--- a/src/etc/testcases/types/xmlcatalog.xsl
+++ b/src/etc/testcases/types/xmlcatalog.xsl
@@ -15,12 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsl:stylesheet 
+<xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   version="1.0">
 
   <!-- I belong to:
-       org.apache.tools.ant.types.XMLCatalogBuildFileTest.java 
+       org.apache.tools.ant.types.XMLCatalogBuildFileTest.java
        -->
 
   <xsl:output method="text"/>
diff --git a/src/etc/testcases/types/xmlcatalog1.xml b/src/etc/testcases/types/xmlcatalog1.xml
index d4b5461fb..e4d66e98d 100644
--- a/src/etc/testcases/types/xmlcatalog1.xml
+++ b/src/etc/testcases/types/xmlcatalog1.xml
@@ -20,7 +20,7 @@
 ]>
 
   <!-- I belong to:
-       org.apache.tools.ant.types.XMLCatalogBuildFileTest.java 
+       org.apache.tools.ant.types.XMLCatalogBuildFileTest.java
        -->
 
 <fragment>
diff --git a/src/etc/testcases/types/xmlcatalog2.xml b/src/etc/testcases/types/xmlcatalog2.xml
index 9d2bed03a..edf5d2dfa 100644
--- a/src/etc/testcases/types/xmlcatalog2.xml
+++ b/src/etc/testcases/types/xmlcatalog2.xml
@@ -17,7 +17,7 @@
 -->
 
   <!-- I belong to:
-       org.apache.tools.ant.types.XMLCatalogBuildFileTest.java 
+       org.apache.tools.ant.types.XMLCatalogBuildFileTest.java
        -->
 
 <fragment>
diff --git a/src/main/org/apache/tools/ant/antlib.xml b/src/main/org/apache/tools/ant/antlib.xml
index 8ec6714e4..f9f219b6d 100644
--- a/src/main/org/apache/tools/ant/antlib.xml
+++ b/src/main/org/apache/tools/ant/antlib.xml
@@ -90,52 +90,52 @@
 
   <!-- selectors -->
   <componentdef name="and" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.selectors.And" />
+    classname="org.apache.tools.ant.types.resources.selectors.And"/>
   <componentdef name="compare" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.selectors.Compare" />
+    classname="org.apache.tools.ant.types.resources.selectors.Compare"/>
   <componentdef name="contains" onerror="ignore"
-    classname="org.apache.tools.ant.types.selectors.ContainsSelector" />
+    classname="org.apache.tools.ant.types.selectors.ContainsSelector"/>
   <componentdef name="containsregexp" onerror="ignore"
-    classname="org.apache.tools.ant.types.selectors.ContainsRegexpSelector" />
+    classname="org.apache.tools.ant.types.selectors.ContainsRegexpSelector"/>
   <componentdef name="date" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.selectors.Date" />
+    classname="org.apache.tools.ant.types.resources.selectors.Date"/>
   <componentdef name="exists" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.selectors.Exists" />
+    classname="org.apache.tools.ant.types.resources.selectors.Exists"/>
   <componentdef name="instanceof" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.selectors.InstanceOf" />
+    classname="org.apache.tools.ant.types.resources.selectors.InstanceOf"/>
   <componentdef name="majority" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.selectors.Majority" />
+    classname="org.apache.tools.ant.types.resources.selectors.Majority"/>
   <componentdef name="modified" onerror="ignore"
-    classname="org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector" />
+    classname="org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector"/>
   <componentdef name="name" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.selectors.Name" />
+    classname="org.apache.tools.ant.types.resources.selectors.Name"/>
   <componentdef name="none" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.selectors.None" />
+    classname="org.apache.tools.ant.types.resources.selectors.None"/>
   <componentdef name="not" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.selectors.Not" />
+    classname="org.apache.tools.ant.types.resources.selectors.Not"/>
   <componentdef name="or" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.selectors.Or" />
+    classname="org.apache.tools.ant.types.resources.selectors.Or"/>
   <componentdef name="size" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.selectors.Size" />
+    classname="org.apache.tools.ant.types.resources.selectors.Size"/>
   <componentdef name="type" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.selectors.Type" />
+    classname="org.apache.tools.ant.types.resources.selectors.Type"/>
 
 
   <!-- comparators -->
   <componentdef name="name" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.comparators.Name" />
+    classname="org.apache.tools.ant.types.resources.comparators.Name"/>
   <componentdef name="size" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.comparators.Size" />
+    classname="org.apache.tools.ant.types.resources.comparators.Size"/>
   <componentdef name="date" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.comparators.Date" />
+    classname="org.apache.tools.ant.types.resources.comparators.Date"/>
   <componentdef name="exists" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.comparators.Exists" />
+    classname="org.apache.tools.ant.types.resources.comparators.Exists"/>
   <componentdef name="type" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.comparators.Type" />
+    classname="org.apache.tools.ant.types.resources.comparators.Type"/>
   <componentdef name="content" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.comparators.Content" />
+    classname="org.apache.tools.ant.types.resources.comparators.Content"/>
   <componentdef name="reverse" onerror="ignore"
-    classname="org.apache.tools.ant.types.resources.comparators.Reverse" />
+    classname="org.apache.tools.ant.types.resources.comparators.Reverse"/>
 
   <!-- filters -->
   <componentdef name="sortfilter" onerror="ignore"
diff --git a/src/main/org/apache/tools/ant/types/conditions/antlib.xml b/src/main/org/apache/tools/ant/types/conditions/antlib.xml
index 5643a2ed0..2bc6f68f6 100644
--- a/src/main/org/apache/tools/ant/types/conditions/antlib.xml
+++ b/src/main/org/apache/tools/ant/types/conditions/antlib.xml
@@ -64,7 +64,7 @@
            classname="org.apache.tools.ant.taskdefs.condition.IsSet"/>
   <typedef name="issigned" onerror="ignore"
            classname="org.apache.tools.ant.taskdefs.condition.IsSigned"/>
-  <typedef name="istrue"  onerror="ignore"
+  <typedef name="istrue" onerror="ignore"
            classname="org.apache.tools.ant.taskdefs.condition.IsTrue"/>
   <typedef name="javaversion" onerror="ignore"
            classname="org.apache.tools.ant.taskdefs.condition.JavaVersion"/>
diff --git a/src/resources/org/apache/tools/ant/types/resources/comparators/antlib.xml b/src/resources/org/apache/tools/ant/types/resources/comparators/antlib.xml
index ae61b9dc1..fd496af51 100644
--- a/src/resources/org/apache/tools/ant/types/resources/comparators/antlib.xml
+++ b/src/resources/org/apache/tools/ant/types/resources/comparators/antlib.xml
@@ -17,17 +17,17 @@
 -->
 <antlib>
   <typedef name="name"
-    classname="org.apache.tools.ant.types.resources.comparators.Name" />
+    classname="org.apache.tools.ant.types.resources.comparators.Name"/>
   <typedef name="size"
-    classname="org.apache.tools.ant.types.resources.comparators.Size" />
+    classname="org.apache.tools.ant.types.resources.comparators.Size"/>
   <typedef name="date"
-    classname="org.apache.tools.ant.types.resources.comparators.Date" />
+    classname="org.apache.tools.ant.types.resources.comparators.Date"/>
   <typedef name="exists"
-    classname="org.apache.tools.ant.types.resources.comparators.Exists" />
+    classname="org.apache.tools.ant.types.resources.comparators.Exists"/>
   <typedef name="type"
-    classname="org.apache.tools.ant.types.resources.comparators.Type" />
+    classname="org.apache.tools.ant.types.resources.comparators.Type"/>
   <typedef name="content"
-    classname="org.apache.tools.ant.types.resources.comparators.Content" />
+    classname="org.apache.tools.ant.types.resources.comparators.Content"/>
   <typedef name="reverse"
-    classname="org.apache.tools.ant.types.resources.comparators.Reverse" />
+    classname="org.apache.tools.ant.types.resources.comparators.Reverse"/>
 </antlib>
diff --git a/src/resources/org/apache/tools/ant/types/resources/selectors/antlib.xml b/src/resources/org/apache/tools/ant/types/resources/selectors/antlib.xml
index 0d0e50248..45cd0f463 100644
--- a/src/resources/org/apache/tools/ant/types/resources/selectors/antlib.xml
+++ b/src/resources/org/apache/tools/ant/types/resources/selectors/antlib.xml
@@ -17,37 +17,37 @@
 -->
 <antlib>
   <typedef name="and"
-    classname="org.apache.tools.ant.types.resources.selectors.And" />
+    classname="org.apache.tools.ant.types.resources.selectors.And"/>
   <typedef name="compare"
-    classname="org.apache.tools.ant.types.resources.selectors.Compare" />
+    classname="org.apache.tools.ant.types.resources.selectors.Compare"/>
   <typedef name="contains"
-    classname="org.apache.tools.ant.types.selectors.ContainsSelector" />
+    classname="org.apache.tools.ant.types.selectors.ContainsSelector"/>
   <typedef name="containsregexp"
-    classname="org.apache.tools.ant.types.selectors.ContainsRegexpSelector" />
+    classname="org.apache.tools.ant.types.selectors.ContainsRegexpSelector"/>
   <typedef name="date"
-    classname="org.apache.tools.ant.types.resources.selectors.Date" />
+    classname="org.apache.tools.ant.types.resources.selectors.Date"/>
   <typedef name="exists"
-    classname="org.apache.tools.ant.types.resources.selectors.Exists" />
+    classname="org.apache.tools.ant.types.resources.selectors.Exists"/>
   <typedef name="instanceof"
-    classname="org.apache.tools.ant.types.resources.selectors.InstanceOf" />
+    classname="org.apache.tools.ant.types.resources.selectors.InstanceOf"/>
   <typedef name="majority"
-    classname="org.apache.tools.ant.types.resources.selectors.Majority" />
+    classname="org.apache.tools.ant.types.resources.selectors.Majority"/>
   <typedef name="modified"
-    classname="org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector" />
+    classname="org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector"/>
   <typedef name="name"
-    classname="org.apache.tools.ant.types.resources.selectors.Name" />
+    classname="org.apache.tools.ant.types.resources.selectors.Name"/>
   <typedef name="none"
-    classname="org.apache.tools.ant.types.resources.selectors.None" />
+    classname="org.apache.tools.ant.types.resources.selectors.None"/>
   <typedef name="not"
-    classname="org.apache.tools.ant.types.resources.selectors.Not" />
+    classname="org.apache.tools.ant.types.resources.selectors.Not"/>
   <typedef name="or"
-    classname="org.apache.tools.ant.types.resources.selectors.Or" />
+    classname="org.apache.tools.ant.types.resources.selectors.Or"/>
   <typedef name="readable"
-    classname="org.apache.tools.ant.types.selectors.ReadableSelector" />
+    classname="org.apache.tools.ant.types.selectors.ReadableSelector"/>
   <typedef name="size"
-    classname="org.apache.tools.ant.types.resources.selectors.Size" />
+    classname="org.apache.tools.ant.types.resources.selectors.Size"/>
   <typedef name="type"
-    classname="org.apache.tools.ant.types.resources.selectors.Type" />
+    classname="org.apache.tools.ant.types.resources.selectors.Type"/>
   <typedef name="writable"
-    classname="org.apache.tools.ant.types.selectors.WritableSelector" />
+    classname="org.apache.tools.ant.types.selectors.WritableSelector"/>
 </antlib>
diff --git a/src/tests/antunit/antunit-base.xml b/src/tests/antunit/antunit-base.xml
index 30bb0ea2b..b51e1057c 100644
--- a/src/tests/antunit/antunit-base.xml
+++ b/src/tests/antunit/antunit-base.xml
@@ -49,8 +49,8 @@
 
   <target name="antunit">
     <antunit xmlns="antlib:org.apache.ant.antunit">
-      <plainlistener />
-      <file file="${ant.file}" xmlns="antlib:org.apache.tools.ant" />
+      <plainlistener/>
+      <file file="${ant.file}" xmlns="antlib:org.apache.tools.ant"/>
     </antunit>
   </target>
 
diff --git a/src/tests/antunit/bugfixes/br50866/br50866-test.xml b/src/tests/antunit/bugfixes/br50866/br50866-test.xml
index 9e2d20375..3e9ac95dc 100644
--- a/src/tests/antunit/bugfixes/br50866/br50866-test.xml
+++ b/src/tests/antunit/bugfixes/br50866/br50866-test.xml
@@ -1,8 +1,8 @@
 <project name="br50866" default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
 
-    <import file="../../antunit-base.xml" />
+    <import file="../../antunit-base.xml"/>
 
-    <include file="middle.xml" />
+    <include file="middle.xml"/>
 
     <target name="testinclude" depends="middle.common,middle.middle">
         <au:assertPropertyEquals name="prop-common-init" value="br50866"/>
@@ -10,4 +10,4 @@
         <au:assertPropertyEquals name="prop-middle" value="br50866"/>
     </target>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/src/tests/antunit/bugfixes/br50866/common.xml b/src/tests/antunit/bugfixes/br50866/common.xml
index 7417c0de9..c322db104 100644
--- a/src/tests/antunit/bugfixes/br50866/common.xml
+++ b/src/tests/antunit/bugfixes/br50866/common.xml
@@ -1,8 +1,8 @@
 <project name="common" default="default">
     <target name="common-init">
-        <property name="prop-common-init" value="br50866" />
+        <property name="prop-common-init" value="br50866"/>
     </target>
     <target name="common" depends="common-init">
-        <property name="prop-common" value="br50866" />
+        <property name="prop-common" value="br50866"/>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/tests/antunit/bugfixes/br50866/middle.xml b/src/tests/antunit/bugfixes/br50866/middle.xml
index b387f9315..12400500a 100644
--- a/src/tests/antunit/bugfixes/br50866/middle.xml
+++ b/src/tests/antunit/bugfixes/br50866/middle.xml
@@ -1,7 +1,7 @@
 <project name="middle" default="default">
-    <import file="common.xml" optional="true" />
+    <import file="common.xml" optional="true"/>
 
     <target name="middle" depends="common-init">
-        <property name="prop-middle" value="br50866" />
+        <property name="prop-middle" value="br50866"/>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/tests/antunit/bugfixes/bugzilla-43324-stackoverflow-test.xml b/src/tests/antunit/bugfixes/bugzilla-43324-stackoverflow-test.xml
index d706b8fc1..97d0ec6ce 100644
--- a/src/tests/antunit/bugfixes/bugzilla-43324-stackoverflow-test.xml
+++ b/src/tests/antunit/bugfixes/bugzilla-43324-stackoverflow-test.xml
@@ -18,40 +18,40 @@
 <project name="length-test" default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="testnested">
     <macrodef name="root-macro">
-      <element name="sub-tasks" optional="false" />
+      <element name="sub-tasks" optional="false"/>
 
       <sequential>
         <!-- do stuff -->
-        <sub-tasks />
+        <sub-tasks/>
       </sequential>
     </macrodef>
 
     <macrodef name="used-macro-a">
-      <element name="a-sub-tasks" optional="false" implicit="true" />
+      <element name="a-sub-tasks" optional="false" implicit="true"/>
 
       <sequential>
         <root-macro>
           <sub-tasks>
             <!-- do stuff -->
-            <a-sub-tasks />
+            <a-sub-tasks/>
           </sub-tasks>
         </root-macro>
       </sequential>
     </macrodef>
 
     <macrodef name="used-macro-b">
-      <element name="b-sub-tasks" optional="false" implicit="true" />
+      <element name="b-sub-tasks" optional="false" implicit="true"/>
 
       <sequential>
         <used-macro-a>
           <root-macro>
             <sub-tasks>
               <!-- do stuff -->
-              <b-sub-tasks />
+              <b-sub-tasks/>
             </sub-tasks>
           </root-macro>
         </used-macro-a>
@@ -59,7 +59,7 @@
     </macrodef>
 
     <used-macro-b>
-      <echo message="Test B" />
+      <echo message="Test B"/>
     </used-macro-b>
 
     <au:assertLogContains text="Test B"/>
diff --git a/src/tests/antunit/core/ant-attribute-test.xml b/src/tests/antunit/core/ant-attribute-test.xml
index 6f6dc51dd..d77e61091 100644
--- a/src/tests/antunit/core/ant-attribute-test.xml
+++ b/src/tests/antunit/core/ant-attribute-test.xml
@@ -18,10 +18,9 @@
 <project name="ant-attribute-test" default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit"
          xmlns:if="ant:if"
-         xmlns:unless="ant:unless"
-         >
+         xmlns:unless="ant:unless">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="test-if-set">
     <echo message="message1" if:set="not-set"/>
@@ -67,7 +66,7 @@
         <echo>hi</echo>
       </sequential>
     </macrodef>
-    <sayhi if:set="verbose" />
+    <sayhi if:set="verbose"/>
     <au:assertLogContains text="hi"/>
   </target>
 
diff --git a/src/tests/antunit/core/bindtargets-test.xml b/src/tests/antunit/core/bindtargets-test.xml
index 0279a2cc0..7f57e02f8 100644
--- a/src/tests/antunit/core/bindtargets-test.xml
+++ b/src/tests/antunit/core/bindtargets-test.xml
@@ -20,16 +20,16 @@
   <import file="../antunit-base.xml"/>
 
   <target name="bound">
-    <property name="test-bound" value="ok" />
+    <property name="test-bound" value="ok"/>
   </target>
 
   <target name="bound2">
-    <property name="test-bound2" value="ok" />
+    <property name="test-bound2" value="ok"/>
   </target>
 
-  <extension-point name="extension" />
+  <extension-point name="extension"/>
 
-  <bindtargets targets="bound,bound2" extensionPoint="extension" />
+  <bindtargets targets="bound,bound2" extensionPoint="extension"/>
 
   <target name="testBind" depends="extension">
     <au:assertPropertyEquals name="test-bound" value="ok"/>
diff --git a/src/tests/antunit/core/dirscanner-symlinks-test.xml b/src/tests/antunit/core/dirscanner-symlinks-test.xml
index 0645946af..a9ae66e61 100644
--- a/src/tests/antunit/core/dirscanner-symlinks-test.xml
+++ b/src/tests/antunit/core/dirscanner-symlinks-test.xml
@@ -185,7 +185,7 @@
     <mkdir dir="${input}/realdir"/>
     <touch file="${input}/realdir/file.txt"/>
     <symlink link="${base}" resource="${input}/realdir"/>
-  </target>    
+  </target>
 
   <target name="-link-to-parent" if="unix">
     <mkdir dir="${input}/B"/>
diff --git a/src/tests/antunit/core/extension-point-test.xml b/src/tests/antunit/core/extension-point-test.xml
index 95bac8b71..3449e5788 100644
--- a/src/tests/antunit/core/extension-point-test.xml
+++ b/src/tests/antunit/core/extension-point-test.xml
@@ -182,7 +182,7 @@
 </project>]]></echo>
     <ant dir="${output}" target="bar"/>
     <au:assertLogContains level="warning"
-        text="can't add target bar to extension-point foo because the extension-point is unknown" />
+        text="can't add target bar to extension-point foo because the extension-point is unknown"/>
   </target>
 
   <target name="testMissingExtensionPointIgnoredWhenConfigured">
@@ -193,7 +193,7 @@
 </project>]]></echo>
     <ant dir="${output}" target="bar"/>
     <au:assertLogDoesntContain level="warning"
-        text="can't add target bar to extension-point foo because the extension-point is unknown" />
+        text="can't add target bar to extension-point foo because the extension-point is unknown"/>
   </target>
 
   <target name="testOnlyAllowsExtensionPointMissingAttributeWhenExtensionOfPresent">
diff --git a/src/tests/antunit/core/extension/include-test.xml b/src/tests/antunit/core/extension/include-test.xml
index 4d3b67483..57cec99ac 100644
--- a/src/tests/antunit/core/extension/include-test.xml
+++ b/src/tests/antunit/core/extension/include-test.xml
@@ -17,18 +17,18 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-    <import file="../../antunit-base.xml" />
+    <import file="../../antunit-base.xml"/>
 
     <!-- declare a target that depends on the extension point -->
-    <target name="compile" depends="all.compile" />
+    <target name="compile" depends="all.compile"/>
 
     <!-- declare our extension point -->
-    <extension-point name="all.compile" />
+    <extension-point name="all.compile"/>
 
     <!-- import all our modules -->
-    <import file="module1.xml" as="module1" />
+    <import file="module1.xml" as="module1"/>
 
     <target name="testImport" depends="compile">
-        <au:assertLogContains text="In module1 compile. Yay!" />
+        <au:assertLogContains text="In module1 compile. Yay!"/>
     </target>
 </project>
diff --git a/src/tests/antunit/core/location/location.xml b/src/tests/antunit/core/location/location.xml
index bf37d9f16..4be52d4e3 100644
--- a/src/tests/antunit/core/location/location.xml
+++ b/src/tests/antunit/core/location/location.xml
@@ -17,36 +17,36 @@
 -->
 <project name="location-test" basedir="." default="all"
        xmlns:au="antlib:org.apache.ant.antunit">
-       
+
   <property name="ant.build.dir" location="../../../../../build"/>
   <property name="working.dir"
             location="${ant.build.dir}/antunit/location-dir"/>
   <property name="classes.dir" location="${working.dir}/classes"/>
-  
+
   <target name="all">
     <au:antunit>
       <fileset file="${ant.file}"/>
       <au:plainlistener/>
     </au:antunit>
   </target>
-  
+
   <target name="setUp">
     <mkdir dir="${classes.dir}"/>
     <javac srcdir="src" destdir="${classes.dir}" debug="yes"/>
     <taskdef name="echo-location" classname="task.EchoLocation"
              classpath="${classes.dir}"/>
   </target>
-  
+
   <target name="define">
     <taskdef name="echoloc"
       classname="task.EchoLocation">
       <classpath>
-        <pathelement location="${classes.dir}" />
+        <pathelement location="${classes.dir}"/>
         <pathelement path="${java.class.path}"/>
       </classpath>
     </taskdef>
   </target>
-  
+
   <target name="macrodef" depends="define">
     <macrodef name="echoloc2" backtrace="false">
       <sequential>
@@ -54,40 +54,40 @@
       </sequential>
     </macrodef>
   </target>
-  
+
   <target name="presetdef" depends="define">
     <presetdef name="echoloc3">
       <echoloc/>
     </presetdef>
   </target>
-  
+
   <target name="tearDown">
     <delete dir="${working.dir}"/>
   </target>
-  
+
   <target name="test-plain-task">
     <echo id="echo">Hello</echo>
     <au:assertLogContains text="Hello"/>
   </target>
-  
+
   <target name="test-standalone-type">
     <!-- TODO -->
   </target>
-  
+
   <target name="test-condition-task">
     <!-- TODO -->
   </target>
-  
+
   <target name="test-macrodef-wrapped-task" depends="macrodef">
     <echo id="echo3">Hello</echo>
     <echoloc2/>
     <au:assertLogContains text="Line: "/>
   </target>
-  
+
   <target name="test-presetdef-wrapped-task" depends="presetdef">
     <echo id="echo4">Hello</echo>
     <echoloc3/>
     <au:assertLogContains text="Line: "/>
   </target>
-  
+
 </project>
diff --git a/src/tests/antunit/core/magic-names-test.xml b/src/tests/antunit/core/magic-names-test.xml
index 54662dae3..461adfe7a 100644
--- a/src/tests/antunit/core/magic-names-test.xml
+++ b/src/tests/antunit/core/magic-names-test.xml
@@ -19,7 +19,7 @@
          name="magicnames-test"
          default="antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="default target"/>
 
diff --git a/src/tests/antunit/core/nested-elements-test.xml b/src/tests/antunit/core/nested-elements-test.xml
index e031c41b4..982d64626 100644
--- a/src/tests/antunit/core/nested-elements-test.xml
+++ b/src/tests/antunit/core/nested-elements-test.xml
@@ -35,7 +35,7 @@ public class ConditionRun extends ConditionBase implements TaskContainer {
     }
 
     public void execute() {
-        for (Iterator iter = tasks.iterator(); iter.hasNext(); ) {
+        for (Iterator iter = tasks.iterator(); iter.hasNext();) {
             Task t = (Task) iter.next();
             t.perform();
         }
@@ -67,7 +67,7 @@ public class Dynamic implements TaskContainer, DynamicElement {
     }
 
     public void execute() {
-        for (Iterator iter = tasks.iterator(); iter.hasNext(); ) {
+        for (Iterator iter = tasks.iterator(); iter.hasNext();) {
             Task t = (Task) iter.next();
             t.perform();
         }
@@ -102,7 +102,7 @@ public class Dynamic implements TaskContainer, DynamicElementNS {
     }
 
     public void execute() {
-        for (Iterator iter = tasks.iterator(); iter.hasNext(); ) {
+        for (Iterator iter = tasks.iterator(); iter.hasNext();) {
             Task t = (Task) iter.next();
             t.perform();
         }
diff --git a/src/tests/antunit/core/nested-text-test.xml b/src/tests/antunit/core/nested-text-test.xml
index 05fb4c853..5d7e5663a 100644
--- a/src/tests/antunit/core/nested-text-test.xml
+++ b/src/tests/antunit/core/nested-text-test.xml
@@ -24,7 +24,7 @@
   </target>
 
   <target name="testRejectNested">
-    <typedef name="object" classname="java.lang.Object" />
+    <typedef name="object" classname="java.lang.Object"/>
     <au:expectfailure expectedMessage="The &lt;object&gt; type doesn't support nested text data (&quot;foo&quot;).">
       <object>foo</object>
     </au:expectfailure>
diff --git a/src/tests/antunit/core/projecthelpers-test.xml b/src/tests/antunit/core/projecthelpers-test.xml
index 9e9000dda..fde19c548 100644
--- a/src/tests/antunit/core/projecthelpers-test.xml
+++ b/src/tests/antunit/core/projecthelpers-test.xml
@@ -72,15 +72,15 @@
   </target>
 
   <target name="testCrossTargets" depends="defineHelpers">
-    <ant antfile="projecthelpers/build-cross-targets.xml" />
+    <ant antfile="projecthelpers/build-cross-targets.xml"/>
   </target>
 
   <target name="testManyImport" depends="defineHelpers">
-    <ant antfile="projecthelpers/build-many-import.xml" />
+    <ant antfile="projecthelpers/build-many-import.xml"/>
   </target>
 
   <target name="testCrossExtension" depends="defineHelpers">
-    <ant antfile="projecthelpers/build-cross-extension.xml" />
+    <ant antfile="projecthelpers/build-cross-extension.xml"/>
   </target>
 
 </project>
diff --git a/src/tests/antunit/core/projecthelpers/build-cross-extension-ref.xml b/src/tests/antunit/core/projecthelpers/build-cross-extension-ref.xml
index 67837a045..64dd18bf4 100644
--- a/src/tests/antunit/core/projecthelpers/build-cross-extension-ref.xml
+++ b/src/tests/antunit/core/projecthelpers/build-cross-extension-ref.xml
@@ -16,11 +16,11 @@
   limitations under the License.
 -->
 <project>
-    <extension-point name="extension-ref" />
+    <extension-point name="extension-ref"/>
     <target name="setbar" extensionOf="extension">
-        <property name="bar" value="hello" />
+        <property name="bar" value="hello"/>
     </target>
     <target name="setfoo" depends="init,extension-ref">
-        <property name="foo" value="hello" />
+        <property name="foo" value="hello"/>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/tests/antunit/core/projecthelpers/build-cross-extension.xml b/src/tests/antunit/core/projecthelpers/build-cross-extension.xml
index f8f1220be..77b4c77f4 100644
--- a/src/tests/antunit/core/projecthelpers/build-cross-extension.xml
+++ b/src/tests/antunit/core/projecthelpers/build-cross-extension.xml
@@ -16,21 +16,21 @@
   limitations under the License.
 -->
 <project default="end" xmlns:au="antlib:org.apache.ant.antunit">
-    <import file="build-cross-extension-ref.xmlref" />
+    <import file="build-cross-extension-ref.xmlref"/>
     <target name="init">
-        <property name="start" value="true" />
+        <property name="start" value="true"/>
     </target>
 
     <target name="setprop" extensionOf="extension-ref">
-        <property name="prop" value="ok" />
+        <property name="prop" value="ok"/>
     </target>
 
-    <extension-point name="extension" />
+    <extension-point name="extension"/>
 
     <target name="end" depends="setfoo,extension">
-        <au:assertPropertyEquals name="start" value="true" />
-        <au:assertPropertyEquals name="foo" value="hello" />
-        <au:assertPropertyEquals name="bar" value="hello" />
-        <au:assertPropertyEquals name="prop" value="ok" />
+        <au:assertPropertyEquals name="start" value="true"/>
+        <au:assertPropertyEquals name="foo" value="hello"/>
+        <au:assertPropertyEquals name="bar" value="hello"/>
+        <au:assertPropertyEquals name="prop" value="ok"/>
     </target>
 </project>
diff --git a/src/tests/antunit/core/projecthelpers/build-cross-targets-ref.xml b/src/tests/antunit/core/projecthelpers/build-cross-targets-ref.xml
index c16d989d2..ba7b849d6 100644
--- a/src/tests/antunit/core/projecthelpers/build-cross-targets-ref.xml
+++ b/src/tests/antunit/core/projecthelpers/build-cross-targets-ref.xml
@@ -17,6 +17,6 @@
 -->
 <project>
     <target name="setfoo" depends="init">
-        <property name="foo" value="hello" />
+        <property name="foo" value="hello"/>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/tests/antunit/core/projecthelpers/build-cross-targets.xml b/src/tests/antunit/core/projecthelpers/build-cross-targets.xml
index c4c7ca76e..ad87c7a97 100644
--- a/src/tests/antunit/core/projecthelpers/build-cross-targets.xml
+++ b/src/tests/antunit/core/projecthelpers/build-cross-targets.xml
@@ -16,12 +16,12 @@
   limitations under the License.
 -->
 <project default="end" xmlns:au="antlib:org.apache.ant.antunit">
-    <import file="build-cross-targets-ref.xmlref" />
+    <import file="build-cross-targets-ref.xmlref"/>
     <target name="init">
-        <property name="start" value="true" />
+        <property name="start" value="true"/>
     </target>
     <target name="end" depends="setfoo">
-        <au:assertPropertyEquals name="start" value="true" />
-        <au:assertPropertyEquals name="foo" value="hello" />
+        <au:assertPropertyEquals name="start" value="true"/>
+        <au:assertPropertyEquals name="foo" value="hello"/>
     </target>
 </project>
diff --git a/src/tests/antunit/core/projecthelpers/build-many-import-common.xml b/src/tests/antunit/core/projecthelpers/build-many-import-common.xml
index 243de8cce..1acbce0fe 100644
--- a/src/tests/antunit/core/projecthelpers/build-many-import-common.xml
+++ b/src/tests/antunit/core/projecthelpers/build-many-import-common.xml
@@ -18,6 +18,6 @@
 <project>
     <!-- build file imported by every other build -->
     <target name="common" depends="init">
-        <property name="common" value="ok" />
+        <property name="common" value="ok"/>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/tests/antunit/core/projecthelpers/build-many-import-commonref.xml b/src/tests/antunit/core/projecthelpers/build-many-import-commonref.xml
index 38b50ada9..0808884a2 100644
--- a/src/tests/antunit/core/projecthelpers/build-many-import-commonref.xml
+++ b/src/tests/antunit/core/projecthelpers/build-many-import-commonref.xml
@@ -18,6 +18,6 @@
 <project>
     <!-- build file imported by bot referenced build -->
     <target name="commonref" depends="init">
-        <property name="commonref" value="ok" />
+        <property name="commonref" value="ok"/>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/tests/antunit/core/projecthelpers/build-many-import-ref.xml b/src/tests/antunit/core/projecthelpers/build-many-import-ref.xml
index c9c02fe8f..666066358 100644
--- a/src/tests/antunit/core/projecthelpers/build-many-import-ref.xml
+++ b/src/tests/antunit/core/projecthelpers/build-many-import-ref.xml
@@ -16,9 +16,9 @@
   limitations under the License.
 -->
 <project>
-    <import file="build-many-import-common.xml" />
-    <import file="build-many-import-commonref.xml" />
+    <import file="build-many-import-common.xml"/>
+    <import file="build-many-import-commonref.xml"/>
     <target name="setfoo" depends="init">
-        <property name="foo" value="hello" />
+        <property name="foo" value="hello"/>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/tests/antunit/core/projecthelpers/build-many-import.xml b/src/tests/antunit/core/projecthelpers/build-many-import.xml
index 792fb56ea..0dc7d22f1 100644
--- a/src/tests/antunit/core/projecthelpers/build-many-import.xml
+++ b/src/tests/antunit/core/projecthelpers/build-many-import.xml
@@ -16,17 +16,17 @@
   limitations under the License.
 -->
 <project default="end" xmlns:au="antlib:org.apache.ant.antunit">
-    <import file="build-many-import-ref.xmlref" />
-    <import file="build-many-import2-ref.xmlref" />
-    <import file="build-many-import-common.xml" />
+    <import file="build-many-import-ref.xmlref"/>
+    <import file="build-many-import2-ref.xmlref"/>
+    <import file="build-many-import-common.xml"/>
     <target name="init">
-        <property name="start" value="true" />
+        <property name="start" value="true"/>
     </target>
     <target name="end" depends="setfoo,setbar,common,commonref">
-        <au:assertPropertyEquals name="start" value="true" />
-        <au:assertPropertyEquals name="foo" value="hello" />
-        <au:assertPropertyEquals name="bar" value="hello" />
-        <au:assertPropertyEquals name="common" value="ok" />
-        <au:assertPropertyEquals name="commonref" value="ok" />
+        <au:assertPropertyEquals name="start" value="true"/>
+        <au:assertPropertyEquals name="foo" value="hello"/>
+        <au:assertPropertyEquals name="bar" value="hello"/>
+        <au:assertPropertyEquals name="common" value="ok"/>
+        <au:assertPropertyEquals name="commonref" value="ok"/>
     </target>
 </project>
diff --git a/src/tests/antunit/core/projecthelpers/build-many-import2-ref.xml b/src/tests/antunit/core/projecthelpers/build-many-import2-ref.xml
index d32cf17ab..ac3e8e9e0 100644
--- a/src/tests/antunit/core/projecthelpers/build-many-import2-ref.xml
+++ b/src/tests/antunit/core/projecthelpers/build-many-import2-ref.xml
@@ -16,10 +16,10 @@
   limitations under the License.
 -->
 <project>
-    <import file="build-many-import-ref.xmlref" />
-    <import file="build-many-import-common.xml" />
-    <import file="build-many-import-commonref.xml" />
+    <import file="build-many-import-ref.xmlref"/>
+    <import file="build-many-import-common.xml"/>
+    <import file="build-many-import-commonref.xml"/>
     <target name="setbar" depends="init,common">
-        <property name="bar" value="hello" />
+        <property name="bar" value="hello"/>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/tests/antunit/core/ref-psyntax-hint-test.xml b/src/tests/antunit/core/ref-psyntax-hint-test.xml
index de3241133..25a4a4740 100644
--- a/src/tests/antunit/core/ref-psyntax-hint-test.xml
+++ b/src/tests/antunit/core/ref-psyntax-hint-test.xml
@@ -20,9 +20,9 @@
 
   <target name="testIt">
     <au:expectfailure>
-      <pathconvert refid="${foo}" />
+      <pathconvert refid="${foo}"/>
     </au:expectfailure>
     <au:assertLogContains level="warning"
-      text="Unresolvable reference $${foo} might be a misuse of property expansion syntax." />
+      text="Unresolvable reference $${foo} might be a misuse of property expansion syntax."/>
   </target>
 </project>
diff --git a/src/tests/antunit/filters/expandproperties-test.xml b/src/tests/antunit/filters/expandproperties-test.xml
index 5dff8320c..6dcad871f 100644
--- a/src/tests/antunit/filters/expandproperties-test.xml
+++ b/src/tests/antunit/filters/expandproperties-test.xml
@@ -16,20 +16,20 @@
    limitations under the License.
   -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
-  <property name="foo" value="FOO" />
-  <property name="bar" value="BAR" />
-  <property name="baz" value="BAZ" />
+  <property name="foo" value="FOO"/>
+  <property name="bar" value="BAR"/>
+  <property name="baz" value="BAZ"/>
 
   <target name="testClassic">
     <au:assertTrue>
       <resourcesmatch>
-        <string value="FOO BAR BAZ" />
+        <string value="FOO BAR BAZ"/>
         <concat>
-          <string value="$${foo} $${bar} $${baz}" />
+          <string value="$${foo} $${bar} $${baz}"/>
           <filterchain>
-            <expandproperties />
+            <expandproperties/>
           </filterchain>
         </concat>
       </resourcesmatch>
@@ -39,14 +39,14 @@
   <target name="testSubset">
     <au:assertTrue>
       <resourcesmatch>
-        <string value="FOO $${bar} BAZ" />
+        <string value="FOO $${bar} BAZ"/>
         <concat>
-          <string value="$${foo} $${bar} $${baz}" />
+          <string value="$${foo} $${bar} $${baz}"/>
           <filterchain>
             <expandproperties>
               <propertyset>
-                <propertyref name="foo" />
-                <propertyref name="baz" />
+                <propertyref name="foo"/>
+                <propertyref name="baz"/>
               </propertyset>
             </expandproperties>
           </filterchain>
@@ -58,14 +58,14 @@
   <target name="testMappedPropertySet">
     <au:assertTrue>
       <resourcesmatch>
-        <string value="FOO BAR BAZ" />
+        <string value="FOO BAR BAZ"/>
         <concat>
-          <string value="$${food} $${bard} $${bazd}" />
+          <string value="$${food} $${bard} $${bazd}"/>
           <filterchain>
             <expandproperties>
               <propertyset>
-                <propertyref builtin="all" />
-                <globmapper from="*" to="*d" />
+                <propertyref builtin="all"/>
+                <globmapper from="*" to="*d"/>
               </propertyset>
             </expandproperties>
           </filterchain>
@@ -78,11 +78,11 @@
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=53626">
     <au:assertTrue>
       <resourcesmatch>
-        <string value="" />
+        <string value=""/>
         <concat>
-          <string value="" />
+          <string value=""/>
           <filterchain>
-            <expandproperties />
+            <expandproperties/>
           </filterchain>
         </concat>
       </resourcesmatch>
diff --git a/src/tests/antunit/filters/native2ascii-test.xml b/src/tests/antunit/filters/native2ascii-test.xml
index 26fa0c786..0aee14403 100644
--- a/src/tests/antunit/filters/native2ascii-test.xml
+++ b/src/tests/antunit/filters/native2ascii-test.xml
@@ -16,7 +16,7 @@
    limitations under the License.
   -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="testForward">
     <au:assertTrue>
diff --git a/src/tests/antunit/filters/replacetokens-test.xml b/src/tests/antunit/filters/replacetokens-test.xml
index c1f98ab63..17075424a 100644
--- a/src/tests/antunit/filters/replacetokens-test.xml
+++ b/src/tests/antunit/filters/replacetokens-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <import file="../propertyhelpers.xml" as="ph"/>
 
diff --git a/src/tests/antunit/filters/sort-test.xml b/src/tests/antunit/filters/sort-test.xml
index 8c2a88b51..dbd147a82 100644
--- a/src/tests/antunit/filters/sort-test.xml
+++ b/src/tests/antunit/filters/sort-test.xml
@@ -16,7 +16,7 @@
    limitations under the License.
   -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${output}"/>
diff --git a/src/tests/antunit/filters/striplinecomments-test.xml b/src/tests/antunit/filters/striplinecomments-test.xml
index 2af0f0138..d184c3724 100644
--- a/src/tests/antunit/filters/striplinecomments-test.xml
+++ b/src/tests/antunit/filters/striplinecomments-test.xml
@@ -16,9 +16,9 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
-  <property name="br" value="${line.separator}" />
+  <property name="br" value="${line.separator}"/>
 
   <string id="input">foo
 #pound
@@ -29,19 +29,19 @@ REMark
 </string>
 
   <macrodef name="test">
-    <attribute name="lines" />
-    <element name="comments" implicit="true" />
+    <attribute name="lines"/>
+    <element name="comments" implicit="true"/>
     <sequential>
       <au:assertTrue>
         <resourcecount count="@{lines}">
           <tokens>
             <concat>
-              <resource refid="input" />
+              <resource refid="input"/>
               <filterchain>
                 <striplinecomments>
-                  <comments />
+                  <comments/>
                 </striplinecomments>
-                <ignoreblank />
+                <ignoreblank/>
               </filterchain>
             </concat>
           </tokens>
@@ -52,15 +52,15 @@ REMark
 
   <target name="testBasic">
     <test lines="5">
-      <comment value="#" />
+      <comment value="#"/>
     </test>
   </target>
 
   <target name="testMultiple">
     <test lines="3">
-      <comment value="#" />
-      <comment value="//" />
-      <comment value="REM" />
+      <comment value="#"/>
+      <comment value="//"/>
+      <comment value="REM"/>
     </test>
   </target>
 
diff --git a/src/tests/antunit/filters/suffix-test.xml b/src/tests/antunit/filters/suffix-test.xml
index a0a9403cd..266e4c6ec 100644
--- a/src/tests/antunit/filters/suffix-test.xml
+++ b/src/tests/antunit/filters/suffix-test.xml
@@ -16,7 +16,7 @@
    limitations under the License.
   -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${input}"/>
diff --git a/src/tests/antunit/filters/uniq-test.xml b/src/tests/antunit/filters/uniq-test.xml
index 832ec944d..12c259009 100644
--- a/src/tests/antunit/filters/uniq-test.xml
+++ b/src/tests/antunit/filters/uniq-test.xml
@@ -16,7 +16,7 @@
    limitations under the License.
   -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${output}"/>
diff --git a/src/tests/antunit/junit-noframes.xsl b/src/tests/antunit/junit-noframes.xsl
index 255046a8c..272c8c999 100644
--- a/src/tests/antunit/junit-noframes.xsl
+++ b/src/tests/antunit/junit-noframes.xsl
@@ -3,8 +3,8 @@
         xmlns:lxslt="http://xml.apache.org/xslt"
         xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils">
 <xsl:output method="html" indent="yes" encoding="US-ASCII"
-  doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
+  doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/>
+<xsl:decimal-format decimal-separator="." grouping-separator=","/>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/src/tests/antunit/taskdefs/ant-test.xml b/src/tests/antunit/taskdefs/ant-test.xml
index c3ee56b7f..908a7380f 100644
--- a/src/tests/antunit/taskdefs/ant-test.xml
+++ b/src/tests/antunit/taskdefs/ant-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="testLastPropertyWins">
     <ant antfile="antcall-test.xml" target="checkB">
diff --git a/src/tests/antunit/taskdefs/antcall-test.xml b/src/tests/antunit/taskdefs/antcall-test.xml
index 9767185d8..6eef71b17 100644
--- a/src/tests/antunit/taskdefs/antcall-test.xml
+++ b/src/tests/antunit/taskdefs/antcall-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="checkB">
     <au:assertPropertyEquals name="b" value="${expected}"/>
diff --git a/src/tests/antunit/taskdefs/augment-test.xml b/src/tests/antunit/taskdefs/augment-test.xml
index 2e6f3354f..656dbc237 100644
--- a/src/tests/antunit/taskdefs/augment-test.xml
+++ b/src/tests/antunit/taskdefs/augment-test.xml
@@ -19,54 +19,54 @@
   <import file="../antunit-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${input}" />
+    <mkdir dir="${input}"/>
     <touch>
-      <filelist id="filelist" dir="${input}" files="foo,bar,baz" />
+      <filelist id="filelist" dir="${input}" files="foo,bar,baz"/>
     </touch>
-    <fileset id="input-fs" dir="${input}" />
+    <fileset id="input-fs" dir="${input}"/>
     <au:assertTrue>
-      <resourcecount refid="input-fs" count="3" />
+      <resourcecount refid="input-fs" count="3"/>
     </au:assertTrue>
   </target>
 
   <target name="test-augment-attribute" depends="setUp">
-    <augment id="input-fs" excludes="foo" />
+    <augment id="input-fs" excludes="foo"/>
     <au:assertTrue>
-      <resourcecount refid="input-fs" count="2" />
+      <resourcecount refid="input-fs" count="2"/>
     </au:assertTrue>
   </target>
 
   <target name="test-augment-element" depends="setUp">
     <augment id="input-fs">
-      <filename name="bar" />
+      <filename name="bar"/>
     </augment>
     <au:assertTrue>
-      <resourcecount refid="input-fs" count="1" />
+      <resourcecount refid="input-fs" count="1"/>
     </au:assertTrue>
   </target>
 
   <target name="test-noref">
     <au:expectfailure expectedMessage="Unknown reference &quot;nosuchreference&quot;">
-      <augment id="nosuchreference" />
+      <augment id="nosuchreference"/>
     </au:expectfailure>
   </target>
 
   <target name="test-id-not-set">
     <au:expectfailure expectedMessage="augment attribute 'id' unset">
-      <augment foo="bar" />
+      <augment foo="bar"/>
     </au:expectfailure>
   </target>
 
   <target name="test-illegal-attribute" depends="setUp">
     <au:expectfailure expectedMessage="augmented reference &quot;input-fs&quot; doesn't support the &quot;filesetwillmostlikelyneversupportthisattribute&quot; attribute">
-      <augment id="input-fs" filesetwillmostlikelyneversupportthisattribute="blah" />
+      <augment id="input-fs" filesetwillmostlikelyneversupportthisattribute="blah"/>
     </au:expectfailure>
   </target>
 
   <target name="test-illegal-element" depends="setUp">
     <au:expectfailure expectedMessage="augmented reference &quot;input-fs&quot; doesn't support the nested &quot;filesetwillmostlikelyneversupportthiselement&quot; element">
       <augment id="input-fs">
-        <filesetwillmostlikelyneversupportthiselement />
+        <filesetwillmostlikelyneversupportthiselement/>
       </augment>
     </au:expectfailure>
   </target>
diff --git a/src/tests/antunit/taskdefs/bunzip2-test.xml b/src/tests/antunit/taskdefs/bunzip2-test.xml
index fcf05d964..21306c9a6 100644
--- a/src/tests/antunit/taskdefs/bunzip2-test.xml
+++ b/src/tests/antunit/taskdefs/bunzip2-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setup">
     <mkdir dir="${output}"/>
diff --git a/src/tests/antunit/taskdefs/checksum-test.xml b/src/tests/antunit/taskdefs/checksum-test.xml
index 8341f4253..229aa1d4e 100644
--- a/src/tests/antunit/taskdefs/checksum-test.xml
+++ b/src/tests/antunit/taskdefs/checksum-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="testChecksumConditionWithFileSet">
     <mkdir dir="${output}"/>
diff --git a/src/tests/antunit/taskdefs/commandlauncher/commandlauncher-test.xml b/src/tests/antunit/taskdefs/commandlauncher/commandlauncher-test.xml
index 49519bd81..c53ad24e2 100644
--- a/src/tests/antunit/taskdefs/commandlauncher/commandlauncher-test.xml
+++ b/src/tests/antunit/taskdefs/commandlauncher/commandlauncher-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
-   <import file="../../antunit-base.xml" />
+   <import file="../../antunit-base.xml"/>
 
   <target name="testCommandLauncherTask">
    <echo message="${input}"/>
@@ -61,7 +61,7 @@ public class MyJavaExecutable {
            srcdir="${input}"/>
     <typedef
        name="my-command-launcher"
-       classname="MyCommandLauncher" classpath="${output}"/> 
+       classname="MyCommandLauncher" classpath="${output}"/>
 
     <commandlauncher vmlauncher="true">
         <my-command-launcher/>
@@ -83,5 +83,5 @@ public class MyJavaExecutable {
     <au:assertLogContains text="Hello World From CommandLauncher"/>
   </target>
 
- 
+
 </project>
diff --git a/src/tests/antunit/taskdefs/concat-test.xml b/src/tests/antunit/taskdefs/concat-test.xml
index 4b285e389..18c5fd9f3 100644
--- a/src/tests/antunit/taskdefs/concat-test.xml
+++ b/src/tests/antunit/taskdefs/concat-test.xml
@@ -16,53 +16,53 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="tearDown" depends="antunit-base.tearDown">
-    <delete file="concat.resources" />
+    <delete file="concat.resources"/>
   </target>
 
-  <property name="encodeStringDest" location="${output}/encodeStringDest" />
+  <property name="encodeStringDest" location="${output}/encodeStringDest"/>
 
   <target name="testBinaryAppend">
-    <property name="binaryAppendDest" location="${output}/binaryAppendDest" />
-    <mkdir dir="${output}" />
+    <property name="binaryAppendDest" location="${output}/binaryAppendDest"/>
+    <mkdir dir="${output}"/>
     <au:assertTrue message="prerequisite conditions unmet">
       <length length="0">
         <!-- allow for nonexistent OR zero-length: -->
-        <fileset file="${binaryAppendDest}" />
+        <fileset file="${binaryAppendDest}"/>
       </length>
     </au:assertTrue>
     <echo file="${binaryAppendDest}">x</echo>
     <au:assertTrue message="destfile setup failed">
-      <length length="1" file="${binaryAppendDest}" />
+      <length length="1" file="${binaryAppendDest}"/>
     </au:assertTrue>
     <concat append="true" destfile="${binaryAppendDest}" binary="true">
-      <string value="x" />
+      <string value="x"/>
     </concat>
     <au:assertTrue message="expected length 2">
-      <length file="${binaryAppendDest}" length="2" />
+      <length file="${binaryAppendDest}" length="2"/>
     </au:assertTrue>
   </target>
 
   <target name="testStringEncoding" if="os.unix">
-    <property name="br" value="${line.separator}" />
+    <property name="br" value="${line.separator}"/>
     <concat destfile="${encodeStringDest}" outputEncoding="utf-16">foo${br}bar${br}baz${br}</concat>
     <au:assertTrue>
       <resourcesmatch astext="true">
-        <file file="utf-16.expected" />
-        <file file="${encodeStringDest}" />
+        <file file="utf-16.expected"/>
+        <file file="${encodeStringDest}"/>
       </resourcesmatch>
     </au:assertTrue>
   </target>
 
   <target name="testStringEncodingWindows" if="os.windows">
-    <property name="br" value="${line.separator}" />
+    <property name="br" value="${line.separator}"/>
     <concat destfile="${encodeStringDest}" outputEncoding="utf-16">foo${br}bar${br}baz${br}</concat>
     <au:assertTrue>
       <resourcesmatch astext="true">
-        <file file="utf-16.expected.windows" />
-        <file file="${encodeStringDest}" />
+        <file file="utf-16.expected.windows"/>
+        <file file="${encodeStringDest}"/>
       </resourcesmatch>
     </au:assertTrue>
   </target>
@@ -119,45 +119,45 @@
   </target>
 
   <target name="testIgnoreEmptyFalseFileIsCreated">
-    <mkdir dir="${input}" />
-    <mkdir dir="${output}" />
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}"/>
     <concat destfile="${output}/TESTDEST" append="true" ignoreEmpty="false">
-      <filelist dir="${input}" files="thisfiledoesnotexist" />
+      <filelist dir="${input}" files="thisfiledoesnotexist"/>
     </concat>
-    <au:assertFileExists file="${output}/TESTDEST" />
+    <au:assertFileExists file="${output}/TESTDEST"/>
   </target>
 
   <target name="testIgnoreEmptyTrueFileIsNotCreated">
-    <mkdir dir="${input}" />
-    <mkdir dir="${output}" />
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}"/>
     <concat destfile="${output}/TESTDEST" append="true" ignoreEmpty="true">
-      <filelist dir="${input}" files="thisfiledoesnotexist" />
+      <filelist dir="${input}" files="thisfiledoesnotexist"/>
     </concat>
-    <au:assertFileDoesntExist file="${output}/TESTDEST" />
+    <au:assertFileDoesntExist file="${output}/TESTDEST"/>
   </target>
 
   <target name="testIgnoreEmptyFalseFileIsCreatedIncludesHeader">
-    <mkdir dir="${input}" />
-    <mkdir dir="${output}" />
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}"/>
     <concat destfile="${output}/TESTDEST" ignoreEmpty="false">
-      <filelist dir="${input}" files="thisfiledoesnotexist" />
+      <filelist dir="${input}" files="thisfiledoesnotexist"/>
       <header filtering="false" trim="yes">
 	header
       </header>
     </concat>
-    <au:assertFileExists file="${output}/TESTDEST" />
-    <au:assertResourceContains resource="${output}/TESTDEST" value="header" />
+    <au:assertFileExists file="${output}/TESTDEST"/>
+    <au:assertResourceContains resource="${output}/TESTDEST" value="header"/>
   </target>
 
   <target name="testIgnoreEmptyFalseFileIsCreatedIncludesFooter">
-    <mkdir dir="${input}" />
-    <mkdir dir="${output}" />
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}"/>
     <concat destfile="${output}/TESTDEST" ignoreEmpty="false">
-      <filelist dir="${input}" files="thisfiledoesnotexist" />
+      <filelist dir="${input}" files="thisfiledoesnotexist"/>
       <footer filtering="no">footer</footer>
     </concat>
-    <au:assertFileExists file="${output}/TESTDEST" />
-    <au:assertResourceContains resource="${output}/TESTDEST" value="footer" />
+    <au:assertFileExists file="${output}/TESTDEST"/>
+    <au:assertResourceContains resource="${output}/TESTDEST" value="footer"/>
   </target>
 
   <target name="testResources">
@@ -165,24 +165,24 @@
     <string id="s2">Jumped Over The Lazy Dog.</string>
 
     <concat destfile="concat.resources" binary="true">
-      <resource refid="s1" />
-      <resource refid="s2" />
+      <resource refid="s1"/>
+      <resource refid="s2"/>
     </concat>
     <length property="expected">
       <resources>
-        <resource refid="s1" />
-        <resource refid="s2" />
+        <resource refid="s1"/>
+        <resource refid="s2"/>
       </resources>
     </length>
     <length property="actual">
-      <file file="concat.resources" />
+      <file file="concat.resources"/>
     </length>
     <fail>
       <condition>
         <or>
-          <equals arg1="${actual}" arg2="0" />
+          <equals arg1="${actual}" arg2="0"/>
           <not>
-            <equals arg1="${actual}" arg2="${expected}" />
+            <equals arg1="${actual}" arg2="${expected}"/>
           </not>
         </or>
       </condition>
@@ -191,11 +191,11 @@
 
   <target name="testBug48816">
     <concat>
-      <resources id="48816" />
-      <string value="x" />
+      <resources id="48816"/>
+      <string value="x"/>
     </concat>
     <au:assertTrue>
-      <resourcecount refid="48816" count="0" />
+      <resourcecount refid="48816" count="0"/>
     </au:assertTrue>
   </target>
 
diff --git a/src/tests/antunit/taskdefs/condition/antversion-test.xml b/src/tests/antunit/taskdefs/condition/antversion-test.xml
index 89c2d7ebc..8090c39ab 100644
--- a/src/tests/antunit/taskdefs/condition/antversion-test.xml
+++ b/src/tests/antunit/taskdefs/condition/antversion-test.xml
@@ -20,50 +20,50 @@
   <target name="test-atleast">
     <au:assertTrue message="Expected antversion of ${ant.version} to be at least 1.7.0">
       <!-- AntVersion was introduced like AntUnit in 1.7 - so this must be true -->
-      <antversion atleast="1.7.0" />
+      <antversion atleast="1.7.0"/>
     </au:assertTrue>
   </target>
 
   <target name="test-exactly">
-    <antversion property="ant.actual.version" />
+    <antversion property="ant.actual.version"/>
     <au:assertTrue message="Expected antversion of ${ant.actual.version}">
-      <antversion exactly="${ant.actual.version}" />
+      <antversion exactly="${ant.actual.version}"/>
     </au:assertTrue>
   </target>
 
   <target name="test-atleast-fail">
-    <property name="version" value="1.8.9" />
+    <property name="version" value="1.8.9"/>
     <au:assertFalse>
-      <antversion atleast="1.1000.0" />
+      <antversion atleast="1.1000.0"/>
     </au:assertFalse>
   </target>
 
   <target name="test-task">
-    <antversion property="antversion" />
-    <au:assertPropertySet name="antversion" message="Property 'antversion' should be set." />
+    <antversion property="antversion"/>
+    <au:assertPropertySet name="antversion" message="Property 'antversion' should be set."/>
     <echo>AntVersion=${antversion}</echo>
   </target>
 
   <target name="test-property-conditional1">
-    <antversion property="antversion" atleast="2.0.0" />
+    <antversion property="antversion" atleast="2.0.0"/>
     <au:assertTrue message="Property 'antversion' should not be set because this is not Ant 2.0.0+.">
       <not>
-        <isset property="antversion" />
+        <isset property="antversion"/>
       </not>
     </au:assertTrue>
   </target>
 
   <target name="test-property-conditional2">
-    <antversion property="antversion" atleast="1.7.0" />
+    <antversion property="antversion" atleast="1.7.0"/>
     <au:assertTrue message="Property 'antversion' should be set because we should have Ant 1.7.0+ (${ant.version}).">
-      <isset property="antversion" />
+      <isset property="antversion"/>
     </au:assertTrue>
   </target>
 
   <target name="all">
     <au:antunit>
-      <fileset file="${ant.file}" />
-      <au:plainlistener />
+      <fileset file="${ant.file}"/>
+      <au:plainlistener/>
     </au:antunit>
   </target>
 
diff --git a/src/tests/antunit/taskdefs/condition/equals-test.xml b/src/tests/antunit/taskdefs/condition/equals-test.xml
index 8888d3967..10bf3576a 100644
--- a/src/tests/antunit/taskdefs/condition/equals-test.xml
+++ b/src/tests/antunit/taskdefs/condition/equals-test.xml
@@ -18,62 +18,62 @@
 <project name="equals-test" xmlns:au="antlib:org.apache.ant.antunit"
          default="antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <target name="test-noforcestring">
-    <string id="s" value="foo" />
+    <string id="s" value="foo"/>
     <au:assertFalse>
-      <equals arg1="foo" arg2="${ant.refid:s}" />
+      <equals arg1="foo" arg2="${ant.refid:s}"/>
     </au:assertFalse>
   </target>
 
   <target name="test-forcestring">
-    <string id="s" value="foo" />
+    <string id="s" value="foo"/>
     <au:assertTrue>
-      <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" />
+      <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true"/>
     </au:assertTrue>
   </target>
 
   <target name="test-forcestring-notrim">
-    <string id="s" value=" foo " />
+    <string id="s" value=" foo "/>
     <au:assertFalse>
-      <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" />
+      <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true"/>
     </au:assertFalse>
   </target>
 
   <target name="test-forcestring-trim">
-    <string id="s" value=" foo " />
+    <string id="s" value=" foo "/>
     <au:assertTrue>
-      <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" trim="true" />
+      <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" trim="true"/>
     </au:assertTrue>
   </target>
 
   <target name="test-forcestring-cs">
-    <string id="s" value="Foo" />
+    <string id="s" value="Foo"/>
     <au:assertFalse>
-      <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" />
+      <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true"/>
     </au:assertFalse>
   </target>
 
   <target name="test-forcestring-nocs">
-    <string id="s" value="Foo" />
+    <string id="s" value="Foo"/>
     <au:assertTrue>
-      <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" casesensitive="false" />
+      <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" casesensitive="false"/>
     </au:assertTrue>
   </target>
 
   <target name="test-forcestring-trim-cs">
-    <string id="s" value=" Foo " />
+    <string id="s" value=" Foo "/>
     <au:assertFalse>
-      <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" trim="true" />
+      <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" trim="true"/>
     </au:assertFalse>
   </target>
 
   <target name="test-forcestring-trim-nocs">
-    <string id="s" value=" Foo " />
+    <string id="s" value=" Foo "/>
     <au:assertTrue>
       <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true"
-              trim="true" casesensitive="false" />
+              trim="true" casesensitive="false"/>
     </au:assertTrue>
   </target>
 
diff --git a/src/tests/antunit/taskdefs/condition/filesmatch-test.xml b/src/tests/antunit/taskdefs/condition/filesmatch-test.xml
index 67e7c00f6..ac6c8f9aa 100644
--- a/src/tests/antunit/taskdefs/condition/filesmatch-test.xml
+++ b/src/tests/antunit/taskdefs/condition/filesmatch-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${input}"/>
diff --git a/src/tests/antunit/taskdefs/condition/hasfreespace-test.xml b/src/tests/antunit/taskdefs/condition/hasfreespace-test.xml
index 01f18098e..a8ed4eb65 100644
--- a/src/tests/antunit/taskdefs/condition/hasfreespace-test.xml
+++ b/src/tests/antunit/taskdefs/condition/hasfreespace-test.xml
@@ -17,41 +17,41 @@
 -->
 <project name="hasfreespace-test" default="all" basedir="." xmlns:au="antlib:org.apache.ant.antunit">
 
-  <available property="jdk6.available" classname="java.util.ServiceLoader" />
+  <available property="jdk6.available" classname="java.util.ServiceLoader"/>
 
-  <property name="partition" value="${user.home}" />
+  <property name="partition" value="${user.home}"/>
 
 
   <target name="test-not-enough-space-human" if="jdk6.available">
     <au:assertFalse>
-      <hasfreespace partition="${partition}" needed="1P" />
+      <hasfreespace partition="${partition}" needed="1P"/>
     </au:assertFalse>
   </target>
 
   <target name="test-enough-space-human" if="jdk6.available">
     <au:assertTrue>
-      <hasfreespace partition="${partition}" needed="1K" />
+      <hasfreespace partition="${partition}" needed="1K"/>
     </au:assertTrue>
   </target>
 
   <target name="test-not-enough-space" if="jdk6.available">
-    <property name="long.max-value" value="9223372036854775807" />
+    <property name="long.max-value" value="9223372036854775807"/>
     <au:assertFalse>
-      <hasfreespace partition="${partition}" needed="${long.max-value}" />
+      <hasfreespace partition="${partition}" needed="${long.max-value}"/>
     </au:assertFalse>
   </target>
 
   <target name="test-enough-space" if="jdk6.available">
     <au:assertTrue>
-      <hasfreespace partition="${partition}" needed="1" />
+      <hasfreespace partition="${partition}" needed="1"/>
     </au:assertTrue>
   </target>
 
   <target name="all">
     <au:antunit>
-      <fileset file="${ant.file}" />
-      <au:plainlistener />
+      <fileset file="${ant.file}"/>
+      <au:plainlistener/>
     </au:antunit>
   </target>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/src/tests/antunit/taskdefs/condition/hasmethod-text.xml b/src/tests/antunit/taskdefs/condition/hasmethod-text.xml
index 9ae9b323b..cf6afd697 100644
--- a/src/tests/antunit/taskdefs/condition/hasmethod-text.xml
+++ b/src/tests/antunit/taskdefs/condition/hasmethod-text.xml
@@ -18,7 +18,7 @@
 <project name="equals-test" xmlns:au="antlib:org.apache.ant.antunit"
          default="antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <target name="test-missingclass">
     <au:expectfailure
diff --git a/src/tests/antunit/taskdefs/condition/javaversion-test.xml b/src/tests/antunit/taskdefs/condition/javaversion-test.xml
index 5f15a1e39..2a41612b2 100644
--- a/src/tests/antunit/taskdefs/condition/javaversion-test.xml
+++ b/src/tests/antunit/taskdefs/condition/javaversion-test.xml
@@ -16,24 +16,24 @@
   limitations under the License.
 -->
 <project name="javaversion-test" default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <target name="test-atleast">
     <au:assertTrue message="Expected javaversion of ${ant.version} to be at least 1.7.0">
       <!-- Ant 1.9.x requires Java5 at runtime - so this must be true -->
-      <javaversion atleast="1.5" />
+      <javaversion atleast="1.5"/>
     </au:assertTrue>
   </target>
 
   <target name="test-exactly">
     <au:assertTrue message="Expected javaversion of ${ant.java.version}">
-      <javaversion exactly="${ant.java.version}" />
+      <javaversion exactly="${ant.java.version}"/>
     </au:assertTrue>
   </target>
 
   <target name="test-atleast-fail">
     <au:assertFalse>
-      <javaversion atleast="1000.0" />
+      <javaversion atleast="1000.0"/>
     </au:assertFalse>
   </target>
 
diff --git a/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml b/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml
index 11c6a9ed4..0c946ea23 100644
--- a/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml
+++ b/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml
@@ -48,15 +48,15 @@
 
   <target name="testContainsEmptyString">
     <au:assertTrue message="Should have found the text in the resource">
-      <resourcecontains resource="${file}" substring="" />
+      <resourcecontains resource="${file}" substring=""/>
     </au:assertTrue>
   </target>
 
   <target name="testContainsEmptyProperty">
-    <property name="testContainsEmptyProperty" value="" />
+    <property name="testContainsEmptyProperty" value=""/>
     <au:assertTrue message="Should have found the text in the resource">
       <resourcecontains resource="${file}"
-                        substring="${testContainsEmptyProperty}" />
+                        substring="${testContainsEmptyProperty}"/>
     </au:assertTrue>
   </target>
 
@@ -81,7 +81,7 @@
   </target>
 
   <target name="testFileRefContains">
-    <file id="file" file="${file}" />
+    <file id="file" file="${file}"/>
     <au:assertTrue message="Should have found the text in the resource">
       <resourcecontains refid="file" substring="text"/>
     </au:assertTrue>
@@ -105,7 +105,7 @@
 
   <target name="testFileConcatRefContains">
     <resources id="concat">
-      <concat><file file="${file}" /></concat>
+      <concat><file file="${file}"/></concat>
     </resources>
     <au:assertTrue message="Should have found the text in the resource">
       <resourcecontains refid="concat" substring="text"/>
@@ -118,7 +118,7 @@
         <header>HEADER</header>
         <footer>FOOTER</footer>
         <string>foo</string>
-        <file file="${file}" />
+        <file file="${file}"/>
         <string>bar</string>
       </concat>
     </resources>
@@ -129,7 +129,7 @@
 
   <target name="testFirstRefContains">
     <first id="first">
-      <fileset dir="${basedir}" includes="*-test.xml" />
+      <fileset dir="${basedir}" includes="*-test.xml"/>
     </first>
     <au:assertTrue message="Should have found the text in the resource">
       <resourcecontains refid="first" substring="project"/>
diff --git a/src/tests/antunit/taskdefs/copy-test.xml b/src/tests/antunit/taskdefs/copy-test.xml
index d0fb49d87..69bcb01c0 100644
--- a/src/tests/antunit/taskdefs/copy-test.xml
+++ b/src/tests/antunit/taskdefs/copy-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="-fileResourceSetup">
     <mkdir dir="${input}"/>
@@ -194,8 +194,7 @@ public class NullByteStreamResource extends Resource {
   </target>
 
   <target name="testNotModifiedSelector"
-          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574"
-          >
+          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574">
     <mkdir dir="${input}/images"/>
     <mkdir dir="${input}/cache"/>
     <touch file="${input}/images/foo.jpg"/>
@@ -216,16 +215,16 @@ public class NullByteStreamResource extends Resource {
     <au:assertFileDoesntExist file="${input}/cache/cache.properties"/>
     <copy todir="${output}" overwrite="true">
       <fileset dir="${input}/images">
-        <include name="*.jpg" />
-        <selector refid="cache.selector" />
+        <include name="*.jpg"/>
+        <selector refid="cache.selector"/>
       </fileset>
     </copy>
     <au:assertFileExists file="${input}/cache/cache.properties"/>
     <au:assertFileDoesntExist file="${output}/foo.jpg"/>
     <copy todir="${output}" overwrite="true">
       <fileset dir="${input}/images">
-        <include name="*.jpg" />
-        <selector refid="cache.selector" />
+        <include name="*.jpg"/>
+        <selector refid="cache.selector"/>
       </fileset>
     </copy>
     <au:assertFileExists file="${output}/foo.jpg"/>
@@ -244,8 +243,8 @@ public class NullByteStreamResource extends Resource {
   <target name="testQuiet">
     <mkdir dir="${output}"/>
     <mkdir dir="${input}"/>
-    <copy file="${input}/not-there.txt" todir="${output}" failonerror="false" quiet="true" />
-  	<au:assertLogDoesntContain text="Could not find file" />
+    <copy file="${input}/not-there.txt" todir="${output}" failonerror="false" quiet="true"/>
+  	<au:assertLogDoesntContain text="Could not find file"/>
   </target>
 
   <target name="testMissingFilesetRoot">
@@ -408,8 +407,7 @@ public class NullByteStreamResource extends Resource {
   </target>
 
   <target name="testCopyWithResourceAndFile"
-          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=49756"
-          >
+          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=49756">
     <mkdir dir="${input}"/>
     <au:assertFileDoesntExist file="${input}/somefile"/>
     <copy tofile="${input}/somefile">
@@ -470,8 +468,8 @@ public class NullByteStreamResource extends Resource {
     <mkdir dir="${output}"/>
     <copy todir="${output}">
       <mappedresources>
-	<fileset dir="${input}" />
-	<globmapper from="a.*" to="*" />
+	<fileset dir="${input}"/>
+	<globmapper from="a.*" to="*"/>
       </mappedresources>
     </copy>
     <au:assertFileExists file="${output}/filea"/>
diff --git a/src/tests/antunit/taskdefs/cvs/cvs.xml b/src/tests/antunit/taskdefs/cvs/cvs.xml
index 564e5875a..e1101eac2 100644
--- a/src/tests/antunit/taskdefs/cvs/cvs.xml
+++ b/src/tests/antunit/taskdefs/cvs/cvs.xml
@@ -20,7 +20,7 @@
      requires a working CVS client. -->
 
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <property name="cvsrootloc" location="repository"/>
   <property name="cvsroot" value=":local:${cvsrootloc}"/>
diff --git a/src/tests/antunit/taskdefs/defaultexcludes-test.xml b/src/tests/antunit/taskdefs/defaultexcludes-test.xml
index cbea93c20..6e1c36cf4 100644
--- a/src/tests/antunit/taskdefs/defaultexcludes-test.xml
+++ b/src/tests/antunit/taskdefs/defaultexcludes-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${output}"/>
diff --git a/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml b/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml
index ac789940f..6d652cb7c 100644
--- a/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml
+++ b/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml
@@ -18,11 +18,11 @@
 
 <project name="delete-test" basedir="." default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
-  
-  <import file="../antunit-base.xml" />
+
+  <import file="../antunit-base.xml"/>
 
   <condition property="unix">
-    <os family="unix" />
+    <os family="unix"/>
   </condition>
 
   <target name="tearDown" depends="removelink, antunit-base.tearDown"/>
diff --git a/src/tests/antunit/taskdefs/delete-test.xml b/src/tests/antunit/taskdefs/delete-test.xml
index 554f08fec..73355cba4 100644
--- a/src/tests/antunit/taskdefs/delete-test.xml
+++ b/src/tests/antunit/taskdefs/delete-test.xml
@@ -18,8 +18,8 @@
 
 <project name="delete-test" basedir="." default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
-  
-  <import file="../antunit-base.xml" />
+
+  <import file="../antunit-base.xml"/>
 
   <property name="existing.dir" location="${output}/exists"/>
   <property name="nonexistent.dir" location="${output}/nonexists"/>
@@ -36,13 +36,13 @@
        <fileset dir="${nonexistent.dir}"/>
     </delete>
 
-    <au:assertFileExists file="${existing.dir}" />
-      
+    <au:assertFileExists file="${existing.dir}"/>
+
     <delete quiet="true" includeEmptyDirs="true">
        <fileset dir="${existing.dir}"/>
     </delete>
 
-    <au:assertFileDoesntExist file="${existing.dir}" />
+    <au:assertFileDoesntExist file="${existing.dir}"/>
 
 
     <mkdir dir="${existing.dir}"/>
@@ -53,7 +53,7 @@
     </delete>
 
 
-    <au:assertFileDoesntExist file="${existing.dir}" />
+    <au:assertFileDoesntExist file="${existing.dir}"/>
 
     <mkdir dir="${existing.dir}"/>
 
@@ -63,13 +63,13 @@
     </delete>
 
 
-    <au:assertFileDoesntExist file="${existing.dir}" />
+    <au:assertFileDoesntExist file="${existing.dir}"/>
 
   </target>
 
   <target name="checkOs">
     <condition property="unix">
-      <os family="unix" />
+      <os family="unix"/>
     </condition>
   </target>
 
@@ -79,7 +79,7 @@
              resource="${output}/foo"/>
     <delete file="${output}/foo"/>
     <delete dir="${existing.dir}"/>
-    <au:assertFileDoesntExist file="${existing.dir}" />
+    <au:assertFileDoesntExist file="${existing.dir}"/>
   </target>
 
   <target name="testDanglingSymlink" if="unix" depends="checkOs,init">
@@ -92,12 +92,11 @@
     <!-- since File.exists returns false for dangling links, recreate
          the file so that assertFileDoesntExist can actually work -->
     <touch file="${output}/foo"/>
-    <au:assertFileDoesntExist file="${output}/link" />
+    <au:assertFileDoesntExist file="${output}/link"/>
   </target>
 
   <target name="testNotModifiedSelector"
-          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574"
-          >
+          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574">
     <mkdir dir="${input}/images"/>
     <mkdir dir="${input}/cache"/>
     <touch file="${input}/images/foo.jpg"/>
@@ -117,16 +116,16 @@
     <au:assertFileDoesntExist file="${input}/cache/cache.properties"/>
     <delete>
       <fileset dir="${input}/images">
-        <include name="*.jpg" />
-        <selector refid="cache.selector" />
+        <include name="*.jpg"/>
+        <selector refid="cache.selector"/>
       </fileset>
     </delete>
     <au:assertFileExists file="${input}/cache/cache.properties"/>
     <au:assertFileExists file="${input}/images/foo.jpg"/>
     <delete>
       <fileset dir="${input}/images">
-        <include name="*.jpg" />
-        <selector refid="cache.selector" />
+        <include name="*.jpg"/>
+        <selector refid="cache.selector"/>
       </fileset>
     </delete>
     <au:assertFileDoesntExist file="${input}/images/foo.jpg"/>
diff --git a/src/tests/antunit/taskdefs/dependset-test.xml b/src/tests/antunit/taskdefs/dependset-test.xml
index 55252593c..83df403a1 100644
--- a/src/tests/antunit/taskdefs/dependset-test.xml
+++ b/src/tests/antunit/taskdefs/dependset-test.xml
@@ -18,23 +18,23 @@
 
 <project name="dependset-test" xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${input}" />
-    <mkdir dir="${output}" />
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}"/>
   </target>
 
   <target name="testNoSourcesOrTargets">
     <au:expectfailure expectedMessage="At least one set of source resources must be specified">
-      <dependset />
+      <dependset/>
     </au:expectfailure>
   </target>
 
   <target name="testNoTargets">
     <au:expectfailure expectedMessage="At least one set of target files must be specified">
       <dependset>
-        <srcfilelist dir="." files="test2.tmp" />
+        <srcfilelist dir="." files="test2.tmp"/>
       </dependset>
     </au:expectfailure>
   </target>
@@ -42,155 +42,155 @@
   <target name="testNoSources">
     <au:expectfailure expectedMessage="At least one set of source resources must be specified">
       <dependset>
-        <targetfileset dir="." includes="test3.tmp" />
+        <targetfileset dir="." includes="test3.tmp"/>
       </dependset>
     </au:expectfailure>
   </target>
 
   <target name="testMissingTargets" depends="setUp">
-    <touch file="${input}/test4.tmp" />
+    <touch file="${input}/test4.tmp"/>
     <dependset>
-      <srcfilelist dir="${input}" files="test4.tmp" />
-      <targetfileset id="targetfs" dir="${output}" includes="i-do-not-exist" />
+      <srcfilelist dir="${input}" files="test4.tmp"/>
+      <targetfileset id="targetfs" dir="${output}" includes="i-do-not-exist"/>
     </dependset>
-    <au:assertLogDoesntContain text="Deleting all target files." level="verbose" />
+    <au:assertLogDoesntContain text="Deleting all target files." level="verbose"/>
   </target>
 
   <target name="testMoreRecentSourceFile" depends="setUp">
-    <touch file="${output}/older.tmp" />
-    <sleep seconds="3" />
-    <touch file="${input}/newer.tmp" />
+    <touch file="${output}/older.tmp"/>
+    <sleep seconds="3"/>
+    <touch file="${input}/newer.tmp"/>
     <dependset>
-      <srcfilelist dir="${input}" files="newer.tmp" />
-      <targetfilelist dir="${output}" files="older.tmp" />
+      <srcfilelist dir="${input}" files="newer.tmp"/>
+      <targetfilelist dir="${output}" files="older.tmp"/>
     </dependset>
-    <au:assertLogContains text="older.tmp&quot; is oldest target file" level="verbose" />
-    <au:assertLogContains text="newer.tmp&quot; is newest source" level="verbose" />
-    <au:assertLogContains text="Deleting all target files." level="verbose" />
-    <au:assertLogDoesntContain text="Deleting" level="info" />
-    <au:assertFileDoesntExist file="${output}/older.tmp" />
+    <au:assertLogContains text="older.tmp&quot; is oldest target file" level="verbose"/>
+    <au:assertLogContains text="newer.tmp&quot; is newest source" level="verbose"/>
+    <au:assertLogContains text="Deleting all target files." level="verbose"/>
+    <au:assertLogDoesntContain text="Deleting" level="info"/>
+    <au:assertFileDoesntExist file="${output}/older.tmp"/>
   </target>
 
   <target name="testMoreRecentSourceFileVerbose" depends="setUp">
-    <touch file="${output}/older.tmp" />
-    <sleep seconds="3" />
-    <touch file="${input}/newer.tmp" />
+    <touch file="${output}/older.tmp"/>
+    <sleep seconds="3"/>
+    <touch file="${input}/newer.tmp"/>
     <dependset verbose="true">
-      <srcfilelist dir="${input}" files="newer.tmp" />
-      <targetfilelist dir="${output}" files="older.tmp" />
+      <srcfilelist dir="${input}" files="newer.tmp"/>
+      <targetfilelist dir="${output}" files="older.tmp"/>
     </dependset>
-    <au:assertLogContains text="older.tmp&quot; is oldest target file" level="info" />
-    <au:assertLogContains text="newer.tmp&quot; is newest source" level="info" />
-    <au:assertLogContains text="Deleting all target files." level="verbose" />
-    <au:assertLogContains text="Deleting" level="info" />
-    <au:assertFileDoesntExist file="${output}/older.tmp" />
+    <au:assertLogContains text="older.tmp&quot; is oldest target file" level="info"/>
+    <au:assertLogContains text="newer.tmp&quot; is newest source" level="info"/>
+    <au:assertLogContains text="Deleting all target files." level="verbose"/>
+    <au:assertLogContains text="Deleting" level="info"/>
+    <au:assertFileDoesntExist file="${output}/older.tmp"/>
   </target>
 
   <target name="testMultipleFiles" depends="setUp">
-    <touch file="${input}/sourceset_1.tmp" />
-    <touch file="${output}/targetset_1.tmp" />
-    <sleep seconds="3" />
-    <touch file="${input}/sourceset_2.tmp" />
-    <touch file="${output}/targetset_2.tmp" />
-    <sleep seconds="2" />
+    <touch file="${input}/sourceset_1.tmp"/>
+    <touch file="${output}/targetset_1.tmp"/>
+    <sleep seconds="3"/>
+    <touch file="${input}/sourceset_2.tmp"/>
+    <touch file="${output}/targetset_2.tmp"/>
+    <sleep seconds="2"/>
     <dependset>
       <sources>
-        <filelist dir="${input}" files="sourceset_1.tmp,sourceset_2.tmp" />
+        <filelist dir="${input}" files="sourceset_1.tmp,sourceset_2.tmp"/>
       </sources>
       <targets>
-        <filelist dir="${output}/" files="targetset_1.tmp,targetset_2.tmp" />
+        <filelist dir="${output}/" files="targetset_1.tmp,targetset_2.tmp"/>
       </targets>
     </dependset>
-    <au:assertLogContains text="targetset_1.tmp&quot; is oldest target file" level="verbose" />
-    <au:assertLogContains text="sourceset_2.tmp&quot; is newest source" level="verbose" />
-    <au:assertLogContains text="Deleting all target files." level="verbose" />
-    <au:assertLogDoesntContain text="Deleting" level="info" />
-    <au:assertFileDoesntExist file="${output}/targetset_1.tmp" />
-    <au:assertFileDoesntExist file="${output}/targetset_2.tmp" />
+    <au:assertLogContains text="targetset_1.tmp&quot; is oldest target file" level="verbose"/>
+    <au:assertLogContains text="sourceset_2.tmp&quot; is newest source" level="verbose"/>
+    <au:assertLogContains text="Deleting all target files." level="verbose"/>
+    <au:assertLogDoesntContain text="Deleting" level="info"/>
+    <au:assertFileDoesntExist file="${output}/targetset_1.tmp"/>
+    <au:assertFileDoesntExist file="${output}/targetset_2.tmp"/>
   </target>
 
   <target name="testMultipleFilesVerbose" depends="setUp">
-    <touch file="${input}/sourceset_1.tmp" />
-    <touch file="${output}/targetset_1.tmp" />
-    <sleep seconds="3" />
-    <touch file="${input}/sourceset_2.tmp" />
-    <touch file="${output}/targetset_2.tmp" />
-    <sleep seconds="2" />
+    <touch file="${input}/sourceset_1.tmp"/>
+    <touch file="${output}/targetset_1.tmp"/>
+    <sleep seconds="3"/>
+    <touch file="${input}/sourceset_2.tmp"/>
+    <touch file="${output}/targetset_2.tmp"/>
+    <sleep seconds="2"/>
     <dependset verbose="true">
       <sources>
-        <filelist dir="${input}" files="sourceset_1.tmp,sourceset_2.tmp" />
+        <filelist dir="${input}" files="sourceset_1.tmp,sourceset_2.tmp"/>
       </sources>
       <targets>
-        <filelist dir="${output}/" files="targetset_1.tmp,targetset_2.tmp" />
+        <filelist dir="${output}/" files="targetset_1.tmp,targetset_2.tmp"/>
       </targets>
     </dependset>
-    <au:assertLogContains text="targetset_1.tmp&quot; is oldest target file" level="info" />
-    <au:assertLogContains text="sourceset_2.tmp&quot; is newest source" level="info" />
-    <au:assertLogContains text="Deleting all target files." level="verbose" />
-    <au:assertLogContains text="Deleting" level="info" />
-    <au:assertFileDoesntExist file="${output}/targetset_1.tmp" />
-    <au:assertFileDoesntExist file="${output}/targetset_2.tmp" />
+    <au:assertLogContains text="targetset_1.tmp&quot; is oldest target file" level="info"/>
+    <au:assertLogContains text="sourceset_2.tmp&quot; is newest source" level="info"/>
+    <au:assertLogContains text="Deleting all target files." level="verbose"/>
+    <au:assertLogContains text="Deleting" level="info"/>
+    <au:assertFileDoesntExist file="${output}/targetset_1.tmp"/>
+    <au:assertFileDoesntExist file="${output}/targetset_2.tmp"/>
   </target>
 
   <target name="testMissingSourceResource" depends="setUp">
-    <touch file="${output}/older.tmp" />
+    <touch file="${output}/older.tmp"/>
     <dependset>
       <sources>
-        <propertyresource name="thereisnosuchproperty" />
+        <propertyresource name="thereisnosuchproperty"/>
       </sources>
       <targets>
-        <filelist dir="${output}" files="older.tmp" />
+        <filelist dir="${output}" files="older.tmp"/>
       </targets>
     </dependset>
-    <au:assertLogContains text="1 nonexistent sources" level="verbose" />
-    <au:assertLogContains text="Deleting all target files." level="verbose" />
-    <au:assertLogDoesntContain text="Deleting" level="info" />
-    <au:assertLogDoesntContain text="Expected source propertyresource &quot;null&quot; is missing." level="info" />
-    <au:assertFileDoesntExist file="${output}/older.tmp" />
+    <au:assertLogContains text="1 nonexistent sources" level="verbose"/>
+    <au:assertLogContains text="Deleting all target files." level="verbose"/>
+    <au:assertLogDoesntContain text="Deleting" level="info"/>
+    <au:assertLogDoesntContain text="Expected source propertyresource &quot;null&quot; is missing." level="info"/>
+    <au:assertFileDoesntExist file="${output}/older.tmp"/>
   </target>
 
   <target name="testMissingSourceResourceVerbose" depends="setUp">
-    <touch file="${output}/older.tmp" />
+    <touch file="${output}/older.tmp"/>
     <dependset verbose="true">
       <sources>
-        <propertyresource name="thereisnosuchproperty" />
+        <propertyresource name="thereisnosuchproperty"/>
       </sources>
       <targets>
-        <filelist dir="${output}" files="older.tmp" />
+        <filelist dir="${output}" files="older.tmp"/>
       </targets>
     </dependset>
-    <au:assertLogContains text="1 nonexistent sources" level="verbose" />
-    <au:assertLogContains text="Deleting all target files." level="verbose" />
-    <au:assertLogContains text="Deleting" level="info" />
-    <au:assertLogContains text="Expected source propertyresource &quot;null&quot; is missing." level="info" />
-    <au:assertFileDoesntExist file="${output}/older.tmp" />
+    <au:assertLogContains text="1 nonexistent sources" level="verbose"/>
+    <au:assertLogContains text="Deleting all target files." level="verbose"/>
+    <au:assertLogContains text="Deleting" level="info"/>
+    <au:assertLogContains text="Expected source propertyresource &quot;null&quot; is missing." level="info"/>
+    <au:assertFileDoesntExist file="${output}/older.tmp"/>
   </target>
 
   <target name="testExistingSourceResource" depends="setUp">
-    <touch file="${output}/older.tmp" />
-    <property name="foo" value="bar" />
+    <touch file="${output}/older.tmp"/>
+    <property name="foo" value="bar"/>
     <dependset>
       <sources>
-        <propertyresource name="foo" />
+        <propertyresource name="foo"/>
       </sources>
       <targets>
-        <filelist dir="${output}" files="older.tmp" />
+        <filelist dir="${output}" files="older.tmp"/>
       </targets>
     </dependset>
-    <au:assertLogDoesntContain text="Deleting all target files." level="verbose" />
-    <au:assertFileExists file="${output}/older.tmp" />
+    <au:assertLogDoesntContain text="Deleting all target files." level="verbose"/>
+    <au:assertFileExists file="${output}/older.tmp"/>
   </target>
 
   <target name="testMissingTargetDirectory" depends="setUp">
     <au:assertFalse>
-      <available file="${output}/test9dir" type="dir" />
+      <available file="${output}/test9dir" type="dir"/>
     </au:assertFalse>
-    <touch file="${input}/test9.tmp" />
+    <touch file="${input}/test9.tmp"/>
     <dependset>
-      <srcfileset dir="." includes="test9.tmp" />
-      <targetfileset dir="${output}/test9dir" />
+      <srcfileset dir="." includes="test9.tmp"/>
+      <targetfileset dir="${output}/test9dir"/>
     </dependset>
-    <au:assertLogDoesntContain text="Deleting all target files." level="verbose" />
+    <au:assertLogDoesntContain text="Deleting all target files." level="verbose"/>
   </target>
 
 </project>
diff --git a/src/tests/antunit/taskdefs/dirname-test.xml b/src/tests/antunit/taskdefs/dirname-test.xml
index 60caaf1ae..560cae266 100644
--- a/src/tests/antunit/taskdefs/dirname-test.xml
+++ b/src/tests/antunit/taskdefs/dirname-test.xml
@@ -47,10 +47,10 @@
 
   <target name="test4" depends="init-test4" if="valid.os">
     <dirname property="local.dir" file="/usr/local/foo.txt"/>
-    <au:assertPropertyEquals name="local.dir" 
+    <au:assertPropertyEquals name="local.dir"
       value="${file.separator}usr${file.separator}local"/>
   </target>
-  
+
   <target name="test5">
     <dirname property="base.dir" file="foo.txt"/>
     <au:assertPropertyEquals name="base.dir" value="${basedir}"/>
diff --git a/src/tests/antunit/taskdefs/ear-test.xml b/src/tests/antunit/taskdefs/ear-test.xml
index 239c501ac..c41925b0d 100644
--- a/src/tests/antunit/taskdefs/ear-test.xml
+++ b/src/tests/antunit/taskdefs/ear-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="testOnlyOneAppXml">
     <mkdir dir="${input}/META-INF"/>
diff --git a/src/tests/antunit/taskdefs/echo-test.xml b/src/tests/antunit/taskdefs/echo-test.xml
index bd1fc05ec..5ed3b0985 100644
--- a/src/tests/antunit/taskdefs/echo-test.xml
+++ b/src/tests/antunit/taskdefs/echo-test.xml
@@ -17,43 +17,43 @@
 -->
 
 <project name="echo-test" default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
   </target>
 
   <target name="test1">
     <echo/>
     <au:assertTrue>
       <length length="0">
-        <au:logcontent />
+        <au:logcontent/>
       </length>
     </au:assertTrue>
   </target>
 
   <target name="test2">
     <echo message="OUTPUT OF ECHO"/>
-    <au:assertLogContains text="OUTPUT OF ECHO" />
+    <au:assertLogContains text="OUTPUT OF ECHO"/>
   </target>
 
   <target name="test3">
     <echo>
-    This 
+    This
     is
-    a 
+    a
     multiline
     message
     </echo>
     <au:assertTrue>
       <resourcecount count="1">
         <restrict>
-          <au:logcontent />
-          <contains text="This" />
-          <contains text="is" />
-          <contains text="a" />
-          <contains text="multiline" />
-          <contains text="message" />
+          <au:logcontent/>
+          <contains text="This"/>
+          <contains text="is"/>
+          <contains text="a"/>
+          <contains text="multiline"/>
+          <contains text="message"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -64,8 +64,8 @@
     <au:assertTrue>
       <resourcecount count="1">
         <restrict>
-          <file file="${output}/echo.txt" />
-          <contains text="Simple text" />
+          <file file="${output}/echo.txt"/>
+          <contains text="Simple text"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -76,8 +76,8 @@
     <au:assertTrue>
       <resourcecount count="1">
         <restrict>
-          <file file="${output}/echo.txt" />
-          <contains text="Simple text" />
+          <file file="${output}/echo.txt"/>
+          <contains text="Simple text"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -87,14 +87,14 @@
     <echo file="${output}/echo.txt">Simple text</echo>
     <echo file="${output}/echo.txt" append="true">Appended</echo>
     <concat>
-      <file file="${output}/echo.txt" />
+      <file file="${output}/echo.txt"/>
     </concat>
     <au:assertTrue>
       <resourcecount count="1">
         <restrict>
-          <file file="${output}/echo.txt" />
-          <contains text="Simple text" />
-          <contains text="Appended" />
+          <file file="${output}/echo.txt"/>
+          <contains text="Simple text"/>
+          <contains text="Appended"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -105,15 +105,15 @@
     <au:assertTrue>
       <resourcecount count="1">
         <restrict>
-          <file file="${output}/echo.txt" />
-          <contains text="Simple text" />
+          <file file="${output}/echo.txt"/>
+          <contains text="Simple text"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
   </target>
 
   <target name="testUTF16Encoding">
-    <property name="char" value="&#169;" />
+    <property name="char" value="&#169;"/>
     <echo file="${output}/echo16.txt" encoding="UTF-16">${char}</echo>
     <loadfile property="out.16" srcfile="${output}/echo16.txt"
               encoding="UTF-16"/>
@@ -121,7 +121,7 @@
   </target>
 
   <target name="testUTF8Encoding">
-    <property name="char" value="&#169;" />
+    <property name="char" value="&#169;"/>
     <echo file="${output}/echo8.txt" encoding="UTF8">${char}</echo>
     <au:assertTrue>
       <resourcecount count="1">
diff --git a/src/tests/antunit/taskdefs/echoxml-test.xml b/src/tests/antunit/taskdefs/echoxml-test.xml
index d461d3d83..e6b9e1570 100644
--- a/src/tests/antunit/taskdefs/echoxml-test.xml
+++ b/src/tests/antunit/taskdefs/echoxml-test.xml
@@ -25,34 +25,34 @@
     <mkdir dir="${output}"/>
     <echoxml file="${file}">
       <project>
-        <property name="foo" value="bar" />
+        <property name="foo" value="bar"/>
         <fail message="$$$${foo}=$${foo}">
           <condition>
-            <istrue value="${mustfail}" />
+            <istrue value="${mustfail}"/>
           </condition>
         </fail>
       </project>
     </echoxml>
   </target>
-  
+
   <target name="testPass">
     <ant antfile="${file}"/>
   </target>
-  
+
   <target name="testFail">
     <au:expectfailure expectedmessage="${foo}=bar" message="Should have thrown an exception">
       <ant antfile="${file}">
-        <property name="mustfail" value="true" />
+        <property name="mustfail" value="true"/>
       </ant>
     </au:expectfailure>
   </target>
-  
+
   <target name="testEmpty">
     <au:expectfailure expectedmessage="No nested XML specified" message="Should have thrown an exception">
-      <echoxml />
+      <echoxml/>
     </au:expectfailure>
   </target>
-  
+
  <!-- comment this and the next targets if you don't have the svn
       trunk of antunit -->
   <target name="test-ns-all">
diff --git a/src/tests/antunit/taskdefs/exec/apply-test.xml b/src/tests/antunit/taskdefs/exec/apply-test.xml
index 1b5a661a3..33ab2f32f 100644
--- a/src/tests/antunit/taskdefs/exec/apply-test.xml
+++ b/src/tests/antunit/taskdefs/exec/apply-test.xml
@@ -17,69 +17,69 @@
 -->
 <project name="apply-test" default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
-  <property environment="env" />
+  <property environment="env"/>
   <!-- UNIX -->
-  <available file="sh" filepath="${env.PATH}" property="sh.executable" />
+  <available file="sh" filepath="${env.PATH}" property="sh.executable"/>
   <!-- CYGWIN -->
-  <available file="sh.exe" filepath="${env.PATH}" property="sh.exe.executable" />
+  <available file="sh.exe" filepath="${env.PATH}" property="sh.exe.executable"/>
   <condition property="test.can.run">
     <or>
-      <isset property="sh.executable" />
-      <isset property="sh.exe.executable" />
+      <isset property="sh.executable"/>
+      <isset property="sh.exe.executable"/>
     </or>
   </condition>
   <!-- UNIX -->
-  <available file="sed" filepath="${env.PATH}" property="sed.executable" />
+  <available file="sed" filepath="${env.PATH}" property="sed.executable"/>
   <!-- CYGWIN -->
-  <available file="sed.exe" filepath="${env.PATH}" property="sed.exe.executable" />
+  <available file="sed.exe" filepath="${env.PATH}" property="sed.exe.executable"/>
   <condition property="sed.can.run">
     <or>
-      <isset property="sed.executable" />
-      <isset property="sed.exe.executable" />
+      <isset property="sed.executable"/>
+      <isset property="sed.exe.executable"/>
     </or>
   </condition>
   <!-- UNIX -->
-  <available file="echo" filepath="${env.PATH}" property="echo.executable" />
+  <available file="echo" filepath="${env.PATH}" property="echo.executable"/>
   <!-- CYGWIN -->
-  <available file="echo.exe" filepath="${env.PATH}" property="echo.exe.executable" />
+  <available file="echo.exe" filepath="${env.PATH}" property="echo.exe.executable"/>
   <condition property="echo.can.run">
     <or>
-      <isset property="echo.executable" />
-      <isset property="echo.exe.executable" />
+      <isset property="echo.executable"/>
+      <isset property="echo.exe.executable"/>
     </or>
   </condition>
 
   <!-- UNIX -->
-  <available file="ls" filepath="${env.PATH}" property="ls.executable" />
+  <available file="ls" filepath="${env.PATH}" property="ls.executable"/>
   <!-- CYGWIN -->
-  <available file="ls.exe" filepath="${env.PATH}" property="ls.exe.executable" />
+  <available file="ls.exe" filepath="${env.PATH}" property="ls.exe.executable"/>
   <!-- piggyback the name of the executable here -->
   <condition property="ls.can.run" value="ls">
-    <isset property="ls.executable" />
+    <isset property="ls.executable"/>
   </condition>
   <condition property="ls.can.run" value="ls.exe">
-    <isset property="ls.exe.executable" />
+    <isset property="ls.exe.executable"/>
   </condition>
 
-  <property name="eol" value="${line.separator}" />
+  <property name="eol" value="${line.separator}"/>
 
   <macrodef name="rcat">
-    <attribute name="refid" />
+    <attribute name="refid"/>
     <sequential>
       <echo>@@{refid}=@{refid}</echo>
-      <concat><resources refid="@{refid}" /></concat>
+      <concat><resources refid="@{refid}"/></concat>
     </sequential>
   </macrodef>
 
   <macrodef name="assertEmptyFile">
-    <attribute name="file" />
+    <attribute name="file"/>
     <sequential>
       <au:assertTrue>
         <and>
-          <available file="@{file}" type="file" />
-          <length length="0" file="@{file}" />
+          <available file="@{file}" type="file"/>
+          <length length="0" file="@{file}"/>
         </and>
       </au:assertTrue>
     </sequential>
@@ -91,25 +91,25 @@
     <echo file="${input}/x">s/x/blah/g${eol}</echo>
     <echo file="${input}/y">s/y/blah/g${eol}</echo>
     <echo file="${input}/z">s/z/blah/g${eol}</echo>
-    <fileset id="xyz" dir="${input}" includes="x,y,z" />
-    <filelist id="xyzlist" dir="${input}" files="x,y,z" />
-    <property name="x" location="${input}/x" />
-    <property name="y" location="${input}/y" />
-    <property name="z" location="${input}/z" />
+    <fileset id="xyz" dir="${input}" includes="x,y,z"/>
+    <filelist id="xyzlist" dir="${input}" files="x,y,z"/>
+    <property name="x" location="${input}/x"/>
+    <property name="y" location="${input}/y"/>
+    <property name="z" location="${input}/z"/>
   </target>
 
   <target name="testNoRedirect" depends="xyz" if="test.can.run">
     <apply executable="sh">
-      <arg value="parrot.sh" />
-      <fileset refid="xyz" />
+      <arg value="parrot.sh"/>
+      <fileset refid="xyz"/>
     </apply>
 
-    <au:assertLogContains text="${x} out" />
-    <au:assertLogContains text="${y} out" />
-    <au:assertLogContains text="${z} out" />
-    <au:assertLogContains text="${x} err" />
-    <au:assertLogContains text="${y} err" />
-    <au:assertLogContains text="${z} err" />
+    <au:assertLogContains text="${x} out"/>
+    <au:assertLogContains text="${y} out"/>
+    <au:assertLogContains text="${z} out"/>
+    <au:assertLogContains text="${x} err"/>
+    <au:assertLogContains text="${y} err"/>
+    <au:assertLogContains text="${z} err"/>
 
     <!--
 
@@ -126,21 +126,21 @@
 
   <target name="testRedirect1" depends="xyz" if="test.can.run">
     <apply executable="sh" output="${output}/redirect.out" append="true">
-      <arg value="parrot.sh" />
-      <fileset refid="xyz" />
+      <arg value="parrot.sh"/>
+      <fileset refid="xyz"/>
     </apply>
 
     <au:assertTrue>
       <resourcecount count="1">
         <restrict id="results">
-          <file file="${output}/redirect.out" />
+          <file file="${output}/redirect.out"/>
           <and xmlns="antlib:org.apache.tools.ant.types.resources.selectors">
-            <contains text="${x} out" />
-            <contains text="${y} out" />
-            <contains text="${z} out" />
-            <contains text="${x} err" />
-            <contains text="${y} err" />
-            <contains text="${z} err" />
+            <contains text="${x} out"/>
+            <contains text="${y} out"/>
+            <contains text="${z} out"/>
+            <contains text="${x} err"/>
+            <contains text="${y} err"/>
+            <contains text="${z} err"/>
           </and>
         </restrict>
       </resourcecount>
@@ -151,19 +151,19 @@
   <target name="testRedirect2" depends="xyz" if="test.can.run">
     <apply executable="sh" output="${output}/redirect.out"
            error="${output}/redirect.err" append="true">
-      <arg value="parrot.sh" />
-      <fileset refid="xyz" />
+      <arg value="parrot.sh"/>
+      <fileset refid="xyz"/>
     </apply>
 
     <au:assertTrue>
       <and>
         <resourcesmatch astext="true">
-          <string value="${x} out${eol}${y} out${eol}${z} out" />
-          <file file="${output}/redirect.out" />
+          <string value="${x} out${eol}${y} out${eol}${z} out"/>
+          <file file="${output}/redirect.out"/>
         </resourcesmatch>
         <resourcesmatch astext="true">
-          <string value="${x} err${eol}${y} err${eol}${z} err" />
-          <file file="${output}/redirect.err" />
+          <string value="${x} err${eol}${y} err${eol}${z} err"/>
+          <file file="${output}/redirect.err"/>
         </resourcesmatch>
       </and>
     </au:assertTrue>
@@ -172,42 +172,42 @@
   <target name="testRedirect3" depends="xyz" if="test.can.run">
     <apply executable="sh" logerror="true" append="true"
            output="${output}/redirect.out" outputproperty="redirect3.out">
-      <arg value="parrot.sh" />
-      <fileset refid="xyz" />
+      <arg value="parrot.sh"/>
+      <fileset refid="xyz"/>
     </apply>
 
     <au:assertTrue>
       <resourcesmatch astext="true">
-        <string value="${x} out${eol}${y} out${eol}${z} out" />
-        <file file="${output}/redirect.out" />
-        <propertyresource name="redirect3.out" />
+        <string value="${x} out${eol}${y} out${eol}${z} out"/>
+        <file file="${output}/redirect.out"/>
+        <propertyresource name="redirect3.out"/>
       </resourcesmatch>
     </au:assertTrue>
 
-    <au:assertLogContains text="${x} err" />
-    <au:assertLogContains text="${y} err" />
-    <au:assertLogContains text="${z} err" />
+    <au:assertLogContains text="${x} err"/>
+    <au:assertLogContains text="${y} err"/>
+    <au:assertLogContains text="${z} err"/>
   </target>
 
   <target name="testRedirect4" depends="xyz" if="test.can.run">
     <apply executable="sh" append="true"
            error="${output}/redirect.err" errorproperty="redirect4.err"
            output="${output}/redirect.out" outputproperty="redirect4.out">
-      <arg value="parrot.sh" />
-      <fileset refid="xyz" />
+      <arg value="parrot.sh"/>
+      <fileset refid="xyz"/>
     </apply>
 
     <au:assertTrue>
       <and>
         <resourcesmatch astext="true">
-          <string value="${x} out${eol}${y} out${eol}${z} out" />
-          <file file="${output}/redirect.out" />
-          <propertyresource name="redirect4.out" />
+          <string value="${x} out${eol}${y} out${eol}${z} out"/>
+          <file file="${output}/redirect.out"/>
+          <propertyresource name="redirect4.out"/>
         </resourcesmatch>
         <resourcesmatch astext="true">
-          <string value="${x} err${eol}${y} err${eol}${z} err" />
-          <file file="${output}/redirect.err" />
-          <propertyresource name="redirect4.err" />
+          <string value="${x} err${eol}${y} err${eol}${z} err"/>
+          <file file="${output}/redirect.err"/>
+          <propertyresource name="redirect4.err"/>
         </resourcesmatch>
       </and>
     </au:assertTrue>
@@ -217,21 +217,21 @@
     <apply executable="sed" inputstring="x y z${eol}" append="true"
            error="${output}/redirect.err" errorproperty="redirect5.err"
            output="${output}/redirect.out" outputproperty="redirect5.out">
-      <arg value="-f" />
-      <fileset refid="xyz" />
+      <arg value="-f"/>
+      <fileset refid="xyz"/>
     </apply>
 
     <au:assertTrue>
       <and>
         <resourcesmatch astext="true">
-          <propertyresource name="redirect5.out" />
-          <string value="blah y z${eol}x blah z${eol}x y blah" />
-          <file file="${output}/redirect.out" />
+          <propertyresource name="redirect5.out"/>
+          <string value="blah y z${eol}x blah z${eol}x y blah"/>
+          <file file="${output}/redirect.out"/>
         </resourcesmatch>
-        <equals arg1="${redirect5.err}" arg2="" />
+        <equals arg1="${redirect5.err}" arg2=""/>
       </and>
     </au:assertTrue>
-    <assertEmptyFile file="${output}/redirect.err" />
+    <assertEmptyFile file="${output}/redirect.err"/>
   </target>
 
   <target name="testRedirect6" depends="xyz" if="sed.can.run">
@@ -239,19 +239,19 @@
     <apply executable="sed" input="${input}/redirect.in" append="true"
            error="${output}/redirect.err" errorproperty="redirect6.err"
            output="${output}/redirect.out" outputproperty="redirect6.out">
-      <arg value="-f" />
-      <filelist refid="xyzlist" />
+      <arg value="-f"/>
+      <filelist refid="xyzlist"/>
     </apply>
 
     <au:assertTrue>
       <and>
         <resourcesmatch astext="true">
-          <propertyresource name="redirect6.out" />
-          <string value="blah y z${eol}x blah z${eol}x y blah" />
-          <file file="${output}/redirect.out" />
+          <propertyresource name="redirect6.out"/>
+          <string value="blah y z${eol}x blah z${eol}x y blah"/>
+          <file file="${output}/redirect.out"/>
         </resourcesmatch>
-        <equals arg1="${redirect6.err}" arg2="" />
-        <length length="0"><file file="${output}/redirect.err" /></length>
+        <equals arg1="${redirect6.err}" arg2=""/>
+        <length length="0"><file file="${output}/redirect.err"/></length>
       </and>
     </au:assertTrue>
   </target>
@@ -260,20 +260,20 @@
     <apply executable="sed" inputstring="x y z${eol}"
            error="${output}/redirect.err" output="${output}/redirect.out"
            outputproperty="redirect7.out">
-      <arg value="-f" />
-      <fileset refid="xyz" />
+      <arg value="-f"/>
+      <fileset refid="xyz"/>
     </apply>
 
     <au:assertTrue>
       <and>
-        <equals arg1="${redirect7.out}" arg2="blah y z" />
+        <equals arg1="${redirect7.out}" arg2="blah y z"/>
         <resourcesmatch astext="true">
-          <file file="${output}/redirect.out" />
-          <string value="x y blah" />
+          <file file="${output}/redirect.out"/>
+          <string value="x y blah"/>
         </resourcesmatch>
       </and>
     </au:assertTrue>
-    <assertEmptyFile file="${output}/redirect.err" />
+    <assertEmptyFile file="${output}/redirect.err"/>
   </target>
 
   <target name="testRedirector1" description="fail"
@@ -281,31 +281,31 @@
     <au:expectfailure
             expectedmessage="cannot have &gt; 1 nested &lt;redirector&gt;s">
       <apply executable="sh">
-        <arg value="parrot.sh" />
-        <fileset refid="xyz" />
-        <redirector output="${output}/redirector.out" />
-        <redirector output="${output}/whocares" />
+        <arg value="parrot.sh"/>
+        <fileset refid="xyz"/>
+        <redirector output="${output}/redirector.out"/>
+        <redirector output="${output}/whocares"/>
       </apply>
     </au:expectfailure>
   </target>
 
   <target name="testRedirector2" depends="xyz" if="test.can.run">
     <apply executable="sh">
-      <arg value="parrot.sh" />
-      <fileset refid="xyz" />
-      <redirector output="${output}/redirector.out" append="true" />
+      <arg value="parrot.sh"/>
+      <fileset refid="xyz"/>
+      <redirector output="${output}/redirector.out" append="true"/>
     </apply>
     <au:assertTrue>
       <resourcecount count="1">
         <restrict id="results">
-          <file file="${output}/redirector.out" />
+          <file file="${output}/redirector.out"/>
           <and xmlns="antlib:org.apache.tools.ant.types.resources.selectors">
-            <contains text="${x} out" />
-            <contains text="${y} out" />
-            <contains text="${z} out" />
-            <contains text="${x} err" />
-            <contains text="${y} err" />
-            <contains text="${z} err" />
+            <contains text="${x} out"/>
+            <contains text="${y} out"/>
+            <contains text="${z} out"/>
+            <contains text="${x} err"/>
+            <contains text="${y} err"/>
+            <contains text="${z} err"/>
           </and>
         </restrict>
       </resourcecount>
@@ -314,21 +314,21 @@
 
   <target name="testRedirector3" depends="xyz" if="test.can.run">
     <apply executable="sh">
-      <arg value="parrot.sh" />
-      <fileset refid="xyz" />
+      <arg value="parrot.sh"/>
+      <fileset refid="xyz"/>
       <redirector append="true"
                   output="${output}/redirector.out"
-                  error="${output}/redirector.err" />
+                  error="${output}/redirector.err"/>
     </apply>
     <au:assertTrue>
       <and>
         <resourcesmatch astext="true">
-          <string value="${x} out${eol}${y} out${eol}${z} out" />
-          <file file="${output}/redirector.out" />
+          <string value="${x} out${eol}${y} out${eol}${z} out"/>
+          <file file="${output}/redirector.out"/>
         </resourcesmatch>
         <resourcesmatch astext="true">
-          <string value="${x} err${eol}${y} err${eol}${z} err" />
-          <file file="${output}/redirector.err" />
+          <string value="${x} err${eol}${y} err${eol}${z} err"/>
+          <file file="${output}/redirector.err"/>
         </resourcesmatch>
       </and>
     </au:assertTrue>
@@ -336,23 +336,23 @@
 
   <target name="testRedirector4" depends="xyz" if="test.can.run">
     <apply executable="sh">
-      <arg value="parrot.sh" />
-      <fileset refid="xyz" />
+      <arg value="parrot.sh"/>
+      <fileset refid="xyz"/>
       <redirector output="${output}/redirector.out" logerror="true"
-                  append="true" outputproperty="redirector4.out" />
+                  append="true" outputproperty="redirector4.out"/>
     </apply>
 
     <au:assertTrue>
       <resourcesmatch astext="true">
-        <string value="${x} out${eol}${y} out${eol}${z} out" />
-        <file file="${output}/redirector.out" />
-        <propertyresource name="redirector4.out" />
+        <string value="${x} out${eol}${y} out${eol}${z} out"/>
+        <file file="${output}/redirector.out"/>
+        <propertyresource name="redirector4.out"/>
       </resourcesmatch>
     </au:assertTrue>
 
-    <au:assertLogContains text="${x} err" />
-    <au:assertLogContains text="${y} err" />
-    <au:assertLogContains text="${z} err" />
+    <au:assertLogContains text="${x} err"/>
+    <au:assertLogContains text="${y} err"/>
+    <au:assertLogContains text="${z} err"/>
   </target>
 
   <target name="testRedirector5" depends="xyz" if="test.can.run">
@@ -361,21 +361,21 @@
                   errorproperty="redirector5.err"
                   output="${output}/redirector.out"
                   outputproperty="redirector5.out"
-                  append="true" />
-      <arg value="parrot.sh" />
-      <fileset refid="xyz" />
+                  append="true"/>
+      <arg value="parrot.sh"/>
+      <fileset refid="xyz"/>
     </apply>
     <au:assertTrue>
       <and>
         <resourcesmatch astext="true">
-          <string value="${x} out${eol}${y} out${eol}${z} out" />
-          <file file="${output}/redirector.out" />
-          <propertyresource name="redirector5.out" />
+          <string value="${x} out${eol}${y} out${eol}${z} out"/>
+          <file file="${output}/redirector.out"/>
+          <propertyresource name="redirector5.out"/>
         </resourcesmatch>
         <resourcesmatch astext="true">
-          <string value="${x} err${eol}${y} err${eol}${z} err" />
-          <file file="${output}/redirector.err" />
-          <propertyresource name="redirector5.err" />
+          <string value="${x} err${eol}${y} err${eol}${z} err"/>
+          <file file="${output}/redirector.err"/>
+          <propertyresource name="redirector5.err"/>
         </resourcesmatch>
       </and>
     </au:assertTrue>
@@ -385,24 +385,24 @@
     <apply executable="sh">
       <redirector append="true" outputproperty="redirector6.out"
                   errorproperty="redirector6.err">
-        <outputmapper type="merge" to="${output}/redirector.out" />
-        <errormapper type="merge" to="${output}/redirector.err" />
+        <outputmapper type="merge" to="${output}/redirector.out"/>
+        <errormapper type="merge" to="${output}/redirector.err"/>
       </redirector>
-      <arg value="parrot.sh" />
-      <filelist refid="xyzlist" />
+      <arg value="parrot.sh"/>
+      <filelist refid="xyzlist"/>
     </apply>
 
     <au:assertTrue>
       <and>
         <resourcesmatch astext="true">
-          <string value="${x} out${eol}${y} out${eol}${z} out" />
-          <file file="${output}/redirector.out" />
-          <propertyresource name="redirector6.out" />
+          <string value="${x} out${eol}${y} out${eol}${z} out"/>
+          <file file="${output}/redirector.out"/>
+          <propertyresource name="redirector6.out"/>
         </resourcesmatch>
         <resourcesmatch astext="true">
-          <string value="${x} err${eol}${y} err${eol}${z} err" />
-          <file file="${output}/redirector.err" />
-          <propertyresource name="redirector6.err" />
+          <string value="${x} err${eol}${y} err${eol}${z} err"/>
+          <file file="${output}/redirector.err"/>
+          <propertyresource name="redirector6.err"/>
         </resourcesmatch>
       </and>
     </au:assertTrue>
@@ -412,27 +412,27 @@
     <apply executable="sh">
       <redirector append="true" outputproperty="redirector7.out"
                   errorproperty="redirector7.err">
-        <outputmapper type="merge" to="${output}/redirector.out" />
-        <errormapper type="merge" to="${output}/redirector.err" />
+        <outputmapper type="merge" to="${output}/redirector.out"/>
+        <errormapper type="merge" to="${output}/redirector.err"/>
         <errorfilterchain>
-          <replacestring from="err" to="ERROR!!!" />
+          <replacestring from="err" to="ERROR!!!"/>
         </errorfilterchain>
       </redirector>
-      <arg value="parrot.sh" />
-      <fileset refid="xyz" />
+      <arg value="parrot.sh"/>
+      <fileset refid="xyz"/>
     </apply>
 
     <au:assertTrue>
       <and>
         <resourcesmatch astext="true">
-          <string value="${x} out${eol}${y} out${eol}${z} out" />
-          <file file="${output}/redirector.out" />
-          <propertyresource name="redirector7.out" />
+          <string value="${x} out${eol}${y} out${eol}${z} out"/>
+          <file file="${output}/redirector.out"/>
+          <propertyresource name="redirector7.out"/>
         </resourcesmatch>
         <resourcesmatch astext="true">
-          <string value="${x} ERROR!!!${eol}${y} ERROR!!!${eol}${z} ERROR!!!" />
-          <file file="${output}/redirector.err" />
-          <propertyresource name="redirector7.err" />
+          <string value="${x} ERROR!!!${eol}${y} ERROR!!!${eol}${z} ERROR!!!"/>
+          <file file="${output}/redirector.err"/>
+          <propertyresource name="redirector7.err"/>
         </resourcesmatch>
       </and>
     </au:assertTrue>
@@ -443,41 +443,41 @@
     <apply executable="sed">
       <redirector append="true" outputproperty="redirector8.out"
                   errorproperty="redirector8.err">
-        <inputmapper type="merge" to="${input}/redirector.in" />
-        <outputmapper type="merge" to="${output}/redirector.out" />
-        <errormapper type="merge" to="${output}/redirector.err" />
+        <inputmapper type="merge" to="${input}/redirector.in"/>
+        <outputmapper type="merge" to="${output}/redirector.out"/>
+        <errormapper type="merge" to="${output}/redirector.err"/>
       </redirector>
-      <arg value="-f" />
-      <fileset refid="xyz" />
+      <arg value="-f"/>
+      <fileset refid="xyz"/>
     </apply>
 
     <au:assertTrue>
       <and>
         <resourcesmatch astext="true">
-          <propertyresource name="redirector8.out" />
-          <string value="blah y z${eol}x blah z${eol}x y blah" />
-          <file file="${output}/redirector.out" />
+          <propertyresource name="redirector8.out"/>
+          <string value="blah y z${eol}x blah z${eol}x y blah"/>
+          <file file="${output}/redirector.out"/>
         </resourcesmatch>
-        <equals arg1="${redirector8.err}" arg2="" />
+        <equals arg1="${redirector8.err}" arg2=""/>
       </and>
     </au:assertTrue>
-    <assertEmptyFile file="${output}/redirector.err" />
+    <assertEmptyFile file="${output}/redirector.err"/>
   </target>
 
   <macrodef name="valRor9-12">
-    <attribute name="n" />
+    <attribute name="n"/>
     <sequential>
       <au:assertTrue>
         <and>
-          <equals arg1="" arg2="${redirector@{n}.err}" />
+          <equals arg1="" arg2="${redirector@{n}.err}"/>
           <resourcesmatch astext="true">
-           <string value="blah after y after z${eol}x after blah after z${eol}x after y after blah" />
-           <propertyresource name="redirector@{n}.out" />
-           <file file="${output}/redirector.out" />
+           <string value="blah after y after z${eol}x after blah after z${eol}x after y after blah"/>
+           <propertyresource name="redirector@{n}.out"/>
+           <file file="${output}/redirector.out"/>
           </resourcesmatch>
         </and>
       </au:assertTrue>
-      <assertEmptyFile file="${output}/redirector.err" />
+      <assertEmptyFile file="${output}/redirector.err"/>
     </sequential>
   </macrodef>
 
@@ -487,17 +487,17 @@
       <redirector outputproperty="redirector9.out"
                   errorproperty="redirector9.err" append="true">
         <inputfilterchain>
-          <replacestring from="before" to="after" />
+          <replacestring from="before" to="after"/>
         </inputfilterchain>
-        <inputmapper type="merge" to="${input}/redirector.in" />
-        <outputmapper type="merge" to="${output}/redirector.out" />
-        <errormapper type="merge" to="${output}/redirector.err" />
+        <inputmapper type="merge" to="${input}/redirector.in"/>
+        <outputmapper type="merge" to="${output}/redirector.out"/>
+        <errormapper type="merge" to="${output}/redirector.err"/>
       </redirector>
-      <arg value="-f" />
-      <fileset refid="xyz" />
+      <arg value="-f"/>
+      <fileset refid="xyz"/>
     </apply>
 
-    <valRor9-12 n="9" />
+    <valRor9-12 n="9"/>
   </target>
 
   <target name="testRedirector10" depends="xyz" if="sed.can.run">
@@ -506,18 +506,18 @@
       <redirector outputproperty="redirector10.out"
                   errorproperty="redirector10.err" append="true">
         <outputfilterchain>
-          <replacestring from="before" to="after" />
+          <replacestring from="before" to="after"/>
         </outputfilterchain>
-        <outputmapper type="merge" to="${output}/redirector.out" />
-        <errormapper type="merge" to="${output}/redirector.err" />
+        <outputmapper type="merge" to="${output}/redirector.out"/>
+        <errormapper type="merge" to="${output}/redirector.err"/>
       </redirector>
-      <arg value="-f" />
-      <srcfile />
-      <arg value="${input}/redirector.in" />
-      <filelist refid="xyzlist" />
+      <arg value="-f"/>
+      <srcfile/>
+      <arg value="${input}/redirector.in"/>
+      <filelist refid="xyzlist"/>
     </apply>
 
-    <valRor9-12 n="10" />
+    <valRor9-12 n="10"/>
   </target>
 
   <target name="testRedirector11" depends="xyz" if="sed.can.run">
@@ -527,16 +527,16 @@
                   inputstring="x before y before z${eol}"
                   append="true">
         <inputfilterchain>
-          <replacestring from="before" to="after" />
+          <replacestring from="before" to="after"/>
         </inputfilterchain>
-        <outputmapper type="merge" to="${output}/redirector.out" />
-        <errormapper type="merge" to="${output}/redirector.err" />
+        <outputmapper type="merge" to="${output}/redirector.out"/>
+        <errormapper type="merge" to="${output}/redirector.err"/>
       </redirector>
-      <arg value="-f" />
-      <fileset refid="xyz" />
+      <arg value="-f"/>
+      <fileset refid="xyz"/>
     </apply>
 
-    <valRor9-12 n="11" />
+    <valRor9-12 n="11"/>
   </target>
 
   <target name="testRedirector12" depends="xyz" if="sed.can.run">
@@ -546,40 +546,40 @@
       <redirector outputproperty="redirector12.out"
                   errorproperty="redirector12.err" append="true">
         <outputfilterchain>
-          <replacestring from="before" to="after" />
+          <replacestring from="before" to="after"/>
         </outputfilterchain>
-        <outputmapper type="glob" from="nomatch" to="nomatchout" />
-        <errormapper type="glob" from="nomatch" to="nomatcherr" />
+        <outputmapper type="glob" from="nomatch" to="nomatchout"/>
+        <errormapper type="glob" from="nomatch" to="nomatcherr"/>
       </redirector>
-      <arg value="-f" />
-      <srcfile />
-      <arg value="${input}/redirector.in" />
-      <filelist refid="xyzlist" />
+      <arg value="-f"/>
+      <srcfile/>
+      <arg value="${input}/redirector.in"/>
+      <filelist refid="xyzlist"/>
     </apply>
 
-    <valRor9-12 n="12" />
+    <valRor9-12 n="12"/>
   </target>
 
   <target name="testRedirector13" depends="xyz" if="test.can.run">
     <apply executable="sh">
       <redirector>
         <outputfilterchain>
-          <replacestring from="out" to="OUTPUT???" />
+          <replacestring from="out" to="OUTPUT???"/>
         </outputfilterchain>
         <errorfilterchain>
-          <replacestring from="err" to="ERROR!!!" />
+          <replacestring from="err" to="ERROR!!!"/>
         </errorfilterchain>
       </redirector>
-      <arg value="parrot.sh" />
-      <fileset refid="xyz" />
+      <arg value="parrot.sh"/>
+      <fileset refid="xyz"/>
     </apply>
 
-    <au:assertLogContains text="${x} OUTPUT???" />
-    <au:assertLogContains text="${y} OUTPUT???" />
-    <au:assertLogContains text="${z} OUTPUT???" />
-    <au:assertLogContains text="${x} ERROR!!!" />
-    <au:assertLogContains text="${y} ERROR!!!" />
-    <au:assertLogContains text="${z} ERROR!!!" />
+    <au:assertLogContains text="${x} OUTPUT???"/>
+    <au:assertLogContains text="${y} OUTPUT???"/>
+    <au:assertLogContains text="${z} OUTPUT???"/>
+    <au:assertLogContains text="${x} ERROR!!!"/>
+    <au:assertLogContains text="${y} ERROR!!!"/>
+    <au:assertLogContains text="${z} ERROR!!!"/>
   </target>
 
   <target name="testRedirector14" depends="xyz" if="sed.can.run">
@@ -588,23 +588,23 @@
       <redirector append="true"
                   inputstring="x before y before z${eol}">
         <outputfilterchain>
-          <replacestring from="before" to="after" />
+          <replacestring from="before" to="after"/>
         </outputfilterchain>
-        <inputmapper type="glob" from="x" to="${input}/redirector.in" />
-        <outputmapper type="glob" from="y" to="${output}/redirector.out" />
-        <errormapper type="glob" from="z" to="${output}/redirector.err" />
+        <inputmapper type="glob" from="x" to="${input}/redirector.in"/>
+        <outputmapper type="glob" from="y" to="${output}/redirector.out"/>
+        <errormapper type="glob" from="z" to="${output}/redirector.err"/>
       </redirector>
-      <arg value="-f" />
-      <fileset refid="xyz" />
+      <arg value="-f"/>
+      <fileset refid="xyz"/>
     </apply>
 
-    <assertEmptyFile file="${output}/redirector.err" />
+    <assertEmptyFile file="${output}/redirector.err"/>
 
     <au:assertTrue>
       <and>
         <resourcesmatch astext="true">
-          <string value="x after blah after z" />
-          <file file="${output}/redirector.out" />
+          <string value="x after blah after z"/>
+          <file file="${output}/redirector.out"/>
         </resourcesmatch>
       </and>
     </au:assertTrue>
@@ -615,12 +615,12 @@
     <condition property="pad" value="">
       <or>
         <not>
-          <os family="dos" />
+          <os family="dos"/>
         </not>
         <not>
           <or>
-            <equals arg1="${ant.java.version}" arg2="1.1" />
-            <equals arg1="${ant.java.version}" arg2="1.2" />
+            <equals arg1="${ant.java.version}" arg2="1.1"/>
+            <equals arg1="${ant.java.version}" arg2="1.2"/>
           </or>
         </not>
       </or>
@@ -628,9 +628,9 @@
 
     <condition property="pad" value=" ">
       <and>
-        <os family="dos" />
+        <os family="dos"/>
         <or>
-          <equals arg1="${ant.java.version}" arg2="1.2" />
+          <equals arg1="${ant.java.version}" arg2="1.2"/>
         </or>
       </and>
     </condition>
@@ -638,27 +638,27 @@
   </target>
 
   <target name="testIgnoreMissing" depends="xyz,pad" if="echo.can.run">
-    <filelist id="xylist" dir="${input}" files="x,y" />
-    <delete file="${input}/z" />
+    <filelist id="xylist" dir="${input}" files="x,y"/>
+    <delete file="${input}/z"/>
 
-    <pathconvert property="xy" pathsep="${pad}${eol}" refid="xylist" />
+    <pathconvert property="xy" pathsep="${pad}${eol}" refid="xylist"/>
 
-    <pathconvert property="xyz" pathsep="${pad}${eol}" refid="xyzlist" />
+    <pathconvert property="xyz" pathsep="${pad}${eol}" refid="xyzlist"/>
 
     <apply executable="echo" ignoremissing="true"
            outputproperty="ignoretrue" append="true">
-      <filelist refid="xyzlist" />
+      <filelist refid="xyzlist"/>
     </apply>
 
     <apply executable="echo" ignoremissing="false"
            outputproperty="ignorefalse" append="true">
-      <filelist refid="xyzlist" />
+      <filelist refid="xyzlist"/>
     </apply>
 
     <au:assertTrue>
       <and>
-        <equals arg1="${xy}${pad}" arg2="${ignoretrue}" />
-        <equals arg1="${xyz}${pad}" arg2="${ignorefalse}" />
+        <equals arg1="${xy}${pad}" arg2="${ignoretrue}"/>
+        <equals arg1="${xyz}${pad}" arg2="${ignorefalse}"/>
       </and>
     </au:assertTrue>
   </target>
@@ -666,20 +666,20 @@
   <target name="testForce" depends="xyz,pad" if="echo.can.run">
     <presetdef name="ekko">
       <apply executable="echo" append="true" dest="${input}">
-        <filelist refid="xyzlist" />
-        <mapper type="identity" />
+        <filelist refid="xyzlist"/>
+        <mapper type="identity"/>
       </apply>
     </presetdef>
 
-    <pathconvert property="xyz" pathsep="${pad}${eol}" refid="xyzlist" />
+    <pathconvert property="xyz" pathsep="${pad}${eol}" refid="xyzlist"/>
 
-    <ekko outputproperty="foo" />
-    <ekko outputproperty="bar" force="true" />
+    <ekko outputproperty="foo"/>
+    <ekko outputproperty="bar" force="true"/>
 
     <au:assertTrue>
       <and>
-        <equals arg1="${foo}" arg2="" />
-        <equals arg1="${bar}" arg2="${xyz}" />
+        <equals arg1="${foo}" arg2=""/>
+        <equals arg1="${bar}" arg2="${xyz}"/>
       </and>
     </au:assertTrue>
   </target>
@@ -687,30 +687,30 @@
   <target name="testNoDest" depends="xyz" if="echo.can.run">
     <presetdef name="ekko">
       <apply executable="echo" addsourcefile="false" force="true">
-        <filelist dir="${input}" files="x" />
-        <globmapper from="*" to="${input}/*" />
-        <targetfile />
+        <filelist dir="${input}" files="x"/>
+        <globmapper from="*" to="${input}/*"/>
+        <targetfile/>
       </apply>
     </presetdef>
-    <ekko outputproperty="dest" dest="${input}" />
-    <ekko outputproperty="nodest" />
+    <ekko outputproperty="dest" dest="${input}"/>
+    <ekko outputproperty="nodest"/>
 
-    <au:assertFileDoesntExist file="${dest}" />
-    <au:assertFileExists file="${nodest}" />
+    <au:assertFileDoesntExist file="${dest}"/>
+    <au:assertFileExists file="${nodest}"/>
   </target>
 
   <target name="testLsPath" if="ls.can.run" depends="xyz">
     <apply executable="ls" parallel="false" outputproperty="lsPathOut"
            force="true" dest="${input}" append="true" type="both">
-      <path path="${env.PATH}" />
+      <path path="${env.PATH}"/>
       <identitymapper/>
     </apply>
     <au:assertTrue>
       <resourcecount count="1">
         <restrict>
-          <propertyresource name="lsPathOut" />
+          <propertyresource name="lsPathOut"/>
           <containsregexp expression="^${ls.can.run}$"
-              xmlns="antlib:org.apache.tools.ant.types.resources.selectors" />
+              xmlns="antlib:org.apache.tools.ant.types.resources.selectors"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -719,15 +719,15 @@
   <target name="testLsPathParallel" if="ls.can.run" depends="xyz">
     <apply executable="ls" parallel="true" outputproperty="lsPathParallelOut"
            force="true" dest="${input}" append="true" type="both">
-      <path path="${env.PATH}" />
+      <path path="${env.PATH}"/>
       <identitymapper/>
     </apply>
     <au:assertTrue>
       <resourcecount count="1">
         <restrict>
-          <propertyresource name="lsPathParallelOut" />
+          <propertyresource name="lsPathParallelOut"/>
           <containsregexp expression="^${ls.can.run}$"
-              xmlns="antlib:org.apache.tools.ant.types.resources.selectors" />
+              xmlns="antlib:org.apache.tools.ant.types.resources.selectors"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -735,32 +735,32 @@
 
   <target name="testSrcfilePrefix" if="test.can.run" depends="xyz">
     <apply executable="sh" force="true">
-      <arg value="parrot.sh" />
+      <arg value="parrot.sh"/>
       <srcfile prefix="-Dfoo="/>
-      <fileset refid="xyz" />
+      <fileset refid="xyz"/>
     </apply>
-    <au:assertLogContains text="-Dfoo=${x} out" />
-    <au:assertLogContains text="-Dfoo=${y} out" />
-    <au:assertLogContains text="-Dfoo=${z} out" />
+    <au:assertLogContains text="-Dfoo=${x} out"/>
+    <au:assertLogContains text="-Dfoo=${y} out"/>
+    <au:assertLogContains text="-Dfoo=${z} out"/>
   </target>
 
   <target name="testTargetfileSuffix" if="test.can.run" depends="xyz">
     <apply executable="sh" addsourcefile="false" dest="${input}">
-      <arg value="parrot.sh" />
+      <arg value="parrot.sh"/>
       <targetfile suffix=",x"/>
-      <fileset refid="xyz" />
+      <fileset refid="xyz"/>
       <globmapper from="*" to="*.bar"/>
     </apply>
-    <au:assertLogContains text="${x}.bar,x out" />
-    <au:assertLogContains text="${y}.bar,x out" />
-    <au:assertLogContains text="${z}.bar,x out" />
+    <au:assertLogContains text="${x}.bar,x out"/>
+    <au:assertLogContains text="${y}.bar,x out"/>
+    <au:assertLogContains text="${z}.bar,x out"/>
   </target>
 
   <target name="testRedirectorWithParallel" if="test.can.run" depends="xyz">
     <apply executable="sh" dest="${input}" parallel="true" addsourcefile="yes">
-      <arg value="parrot.sh" />
+      <arg value="parrot.sh"/>
       <targetfile/>
-      <fileset refid="xyz" />
+      <fileset refid="xyz"/>
       <globmapper from="*" to="*.bar"/>
       <redirector output="${output}/all_out.txt" append="yes"/>
     </apply>
diff --git a/src/tests/antunit/taskdefs/exec/exec-test.xml b/src/tests/antunit/taskdefs/exec/exec-test.xml
index 25b00889c..b4e7f5231 100644
--- a/src/tests/antunit/taskdefs/exec/exec-test.xml
+++ b/src/tests/antunit/taskdefs/exec/exec-test.xml
@@ -16,20 +16,20 @@
   limitations under the License.
 -->
 <project name="exec-test" default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-    <import file="../../antunit-base.xml" />
+    <import file="../../antunit-base.xml"/>
 
     <macrodef name="assert-trimmed-resource-content">
-        <attribute name="content" />
-        <attribute name="astext" default="true" />
-        <element name="resource" implicit="true" />
+        <attribute name="content"/>
+        <attribute name="astext" default="true"/>
+        <element name="resource" implicit="true"/>
         <sequential>
             <au:assertTrue>
                 <resourcesmatch astext="@{astext}">
-                    <string value="@{content}" />
+                    <string value="@{content}"/>
                     <concat>
-                        <resource />
+                        <resource/>
                         <filterchain>
-                            <trim />
+                            <trim/>
                         </filterchain>
                     </concat>
                 </resourcesmatch>
@@ -38,78 +38,78 @@
     </macrodef>
 
     <target name="setUp">
-        <mkdir dir="${input}" />
-        <mkdir dir="${output}" />
-        <property environment="env" />
+        <mkdir dir="${input}"/>
+        <mkdir dir="${output}"/>
+        <property environment="env"/>
         <!-- UNIX -->
-        <available file="sh" filepath="${env.PATH}" property="sh.executable" />
+        <available file="sh" filepath="${env.PATH}" property="sh.executable"/>
         <!-- CYGWIN -->
-        <available file="sh.exe" filepath="${env.PATH}" property="sh.exe.executable" />
+        <available file="sh.exe" filepath="${env.PATH}" property="sh.exe.executable"/>
         <condition property="test.can.run">
             <or>
-                <isset property="sh.executable" />
-                <isset property="sh.exe.executable" />
+                <isset property="sh.executable"/>
+                <isset property="sh.exe.executable"/>
             </or>
         </condition>
         <!-- UNIX -->
-        <available file="wc" filepath="${env.PATH}" property="wc.executable" />
+        <available file="wc" filepath="${env.PATH}" property="wc.executable"/>
         <!-- CYGWIN -->
-        <available file="wc.exe" filepath="${env.PATH}" property="wc.exe.executable" />
+        <available file="wc.exe" filepath="${env.PATH}" property="wc.exe.executable"/>
         <condition property="wc.can.run">
             <or>
-                <isset property="wc.executable" />
-                <isset property="wc.exe.executable" />
+                <isset property="wc.executable"/>
+                <isset property="wc.exe.executable"/>
             </or>
         </condition>
         <!-- UNIX -->
-        <available file="cat" filepath="${env.PATH}" property="cat.executable" />
+        <available file="cat" filepath="${env.PATH}" property="cat.executable"/>
         <!-- CYGWIN -->
-        <available file="cat.exe" filepath="${env.PATH}" property="cat.exe.executable" />
+        <available file="cat.exe" filepath="${env.PATH}" property="cat.exe.executable"/>
         <condition property="cat.can.run">
             <or>
-                <isset property="cat.executable" />
-                <isset property="cat.exe.executable" />
+                <isset property="cat.executable"/>
+                <isset property="cat.exe.executable"/>
             </or>
         </condition>
     </target>
 
     <target name="test-no-redirect" depends="setUp" if="test.can.run">
         <exec executable="sh">
-            <arg value="parrot.sh" />
-            <arg value="${ant.file}" />
+            <arg value="parrot.sh"/>
+            <arg value="${ant.file}"/>
         </exec>
-        <au:assertLogContains text="${ant.file} out" />
-        <au:assertLogContains text="${ant.file} err" />
+        <au:assertLogContains text="${ant.file} out"/>
+        <au:assertLogContains text="${ant.file} err"/>
     </target>
 
     <target name="test-redirect-output" depends="setUp" if="test.can.run">
         <exec executable="sh" output="${output}/redirect.out">
-            <arg value="parrot.sh" />
-            <arg value="${ant.file}" />
+            <arg value="parrot.sh"/>
+            <arg value="${ant.file}"/>
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
                 <string>${ant.file} out${line.separator}${ant.file} err</string>
-                <file file="${output}/redirect.out" />
+                <file file="${output}/redirect.out"/>
             </resourcesmatch>
         </au:assertTrue>
     </target>
 
     <target name="test-redirect-output-error" depends="setUp" if="test.can.run">
         <exec executable="sh" output="${output}/redirect.out" error="${output}/redirect.err">
-            <arg value="parrot.sh" />
-            <arg value="${ant.file}" />
+            <arg value="parrot.sh"/>
+            <arg value="${ant.file}"/>
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
                 <string>${ant.file} out</string>
-                <file file="${output}/redirect.out" />
+                <file file="${output}/redirect.out"/>
             </resourcesmatch>
         </au:assertTrue>
         <au:assertTrue>
             <resourcesmatch astext="true">
                 <string>${ant.file} err</string>
-                <file file="${output}/redirect.err" />
+                <file file="${output}/redirect.err"/>
             </resourcesmatch>
         </au:assertTrue>
     </target>
@@ -117,17 +117,17 @@
     <target name="test-redirect-output-outputproperty-logerror" depends="setUp" if="test.can.run">
         <exec executable="sh" logerror="true"
               output="${output}/redirect.out" outputproperty="redirect.out">
-            <arg value="parrot.sh" />
-            <arg value="${ant.file}" />
+            <arg value="parrot.sh"/>
+            <arg value="${ant.file}"/>
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
                 <string>${ant.file} out</string>
-                <file file="${output}/redirect.out" />
-                <propertyresource name="redirect.out" />
+                <file file="${output}/redirect.out"/>
+                <propertyresource name="redirect.out"/>
             </resourcesmatch>
         </au:assertTrue>
-        <au:assertLogContains text="${ant.file} err" />
+        <au:assertLogContains text="${ant.file} err"/>
     </target>
 
     <target name="test-redirect-output-outputproperty-error-errorproperty"
@@ -135,21 +135,21 @@
         <exec executable="sh"
               error="${output}/redirect.err" errorproperty="redirect.err"
               output="${output}/redirect.out" outputproperty="redirect.out">
-            <arg value="parrot.sh" />
-            <arg value="${ant.file}" />
+            <arg value="parrot.sh"/>
+            <arg value="${ant.file}"/>
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
                 <string>${ant.file} out</string>
-                <file file="${output}/redirect.out" />
-                <propertyresource name="redirect.out" />
+                <file file="${output}/redirect.out"/>
+                <propertyresource name="redirect.out"/>
             </resourcesmatch>
         </au:assertTrue>
         <au:assertTrue>
             <resourcesmatch astext="true">
                 <string>${ant.file} err</string>
-                <file file="${output}/redirect.err" />
-                <propertyresource name="redirect.err" />
+                <file file="${output}/redirect.err"/>
+                <propertyresource name="redirect.err"/>
             </resourcesmatch>
         </au:assertTrue>
     </target>
@@ -159,19 +159,19 @@
         <exec executable="wc" inputstring="x y z"
               error="${output}/redirect.err" errorproperty="redirect.err"
               output="${output}/redirect.out" outputproperty="redirect.out">
-            <arg value="-w" />
+            <arg value="-w"/>
         </exec>
         <au:assertTrue>
             <length length="0">
-                <file file="${output}/redirect.err" />
-                <propertyresource name="redirect.err" />
+                <file file="${output}/redirect.err"/>
+                <propertyresource name="redirect.err"/>
             </length>
         </au:assertTrue>
         <assert-trimmed-resource-content content="3">
-            <file file="${output}/redirect.out" />
+            <file file="${output}/redirect.out"/>
         </assert-trimmed-resource-content>
         <assert-trimmed-resource-content content="3">
-            <propertyresource name="redirect.out" />
+            <propertyresource name="redirect.out"/>
         </assert-trimmed-resource-content>
     </target>
 
@@ -181,19 +181,19 @@
         <exec executable="wc" input="${input}/redirect.in"
               error="${output}/redirect.err" errorproperty="redirect.err"
               output="${output}/redirect.out" outputproperty="redirect.out">
-            <arg value="-w" />
+            <arg value="-w"/>
         </exec>
         <au:assertTrue>
             <length length="0">
-                <file file="${output}/redirect.err" />
-                <propertyresource name="redirect.err" />
+                <file file="${output}/redirect.err"/>
+                <propertyresource name="redirect.err"/>
             </length>
         </au:assertTrue>
         <assert-trimmed-resource-content content="3">
-            <file file="${output}/redirect.out" />
+            <file file="${output}/redirect.out"/>
         </assert-trimmed-resource-content>
         <assert-trimmed-resource-content content="3">
-            <propertyresource name="redirect.out" />
+            <propertyresource name="redirect.out"/>
         </assert-trimmed-resource-content>
     </target>
 
@@ -202,22 +202,22 @@
         <exec executable="wc" inputstring="x y z"
               error="${output}/redirect.err"
               output="${output}/redirect.out" outputproperty="redirect.out">
-            <arg value="-w" />
+            <arg value="-w"/>
         </exec>
         <au:assertTrue>
             <length length="0">
-                <file file="${output}/redirect.err" />
+                <file file="${output}/redirect.err"/>
             </length>
         </au:assertTrue>
         <concat>
-            <file file="${output}/redirect.out" />
-            <propertyresource name="redirect.out" />
+            <file file="${output}/redirect.out"/>
+            <propertyresource name="redirect.out"/>
         </concat>
         <assert-trimmed-resource-content content="3">
-            <file file="${output}/redirect.out" />
+            <file file="${output}/redirect.out"/>
         </assert-trimmed-resource-content>
         <assert-trimmed-resource-content content="3">
-            <propertyresource name="redirect.out" />
+            <propertyresource name="redirect.out"/>
         </assert-trimmed-resource-content>
     </target>
 
@@ -225,85 +225,85 @@
             depends="setUp" if="test.can.run">
         <au:expectfailure>
             <exec executable="sh">
-                <arg value="parrot.sh" />
-                <arg value="${ant.file}" />
-                <redirector output="${output}/redirector.out" />
-                <redirector output="whocares" />
+                <arg value="parrot.sh"/>
+                <arg value="${ant.file}"/>
+                <redirector output="${output}/redirector.out"/>
+                <redirector output="whocares"/>
             </exec>
         </au:expectfailure>
     </target>
 
     <target name="test-redirector-output" depends="setUp" if="test.can.run">
         <exec executable="sh">
-            <arg value="parrot.sh" />
-            <arg value="${ant.file}" />
-            <redirector output="${output}/redirector.out" />
+            <arg value="parrot.sh"/>
+            <arg value="${ant.file}"/>
+            <redirector output="${output}/redirector.out"/>
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
                 <string>${ant.file} out${line.separator}${ant.file} err</string>
-                <file file="${output}/redirector.out" />
+                <file file="${output}/redirector.out"/>
             </resourcesmatch>
         </au:assertTrue>
     </target>
 
     <target name="test-redirector-output-error" depends="setUp" if="test.can.run">
         <exec executable="sh">
-            <arg value="parrot.sh" />
-            <arg value="${ant.file}" />
-            <redirector output="${output}/redirector.out" error="${output}/redirector.err" />
+            <arg value="parrot.sh"/>
+            <arg value="${ant.file}"/>
+            <redirector output="${output}/redirector.out" error="${output}/redirector.err"/>
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
                 <string>${ant.file} out</string>
-                <file file="${output}/redirector.out" />
+                <file file="${output}/redirector.out"/>
             </resourcesmatch>
         </au:assertTrue>
         <au:assertTrue>
             <resourcesmatch astext="true">
                 <string>${ant.file} err</string>
-                <file file="${output}/redirector.err" />
+                <file file="${output}/redirector.err"/>
             </resourcesmatch>
         </au:assertTrue>
     </target>
 
     <target name="test-redirector-output-outputproperty-logerror" depends="setUp" if="test.can.run">
         <exec executable="sh">
-            <arg value="parrot.sh" />
-            <arg value="${ant.file}" />
+            <arg value="parrot.sh"/>
+            <arg value="${ant.file}"/>
             <redirector output="${output}/redirector.out" logerror="true"
-                        outputproperty="redirector.out" />
+                        outputproperty="redirector.out"/>
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
                 <string>${ant.file} out</string>
-                <file file="${output}/redirector.out" />
-                <propertyresource name="redirector.out" />
+                <file file="${output}/redirector.out"/>
+                <propertyresource name="redirector.out"/>
             </resourcesmatch>
         </au:assertTrue>
-        <au:assertLogContains text="${ant.file} err" />
+        <au:assertLogContains text="${ant.file} err"/>
     </target>
 
     <target name="test-redirector-output-outputproperty-error-errorproperty"
             depends="setUp" if="test.can.run">
         <exec executable="sh">
             <redirector error="${output}/redirector.err" errorproperty="redirector.err"
-              output="${output}/redirector.out" outputproperty="redirector.out" />
-            <arg value="parrot.sh" />
-            <arg value="${ant.file}" />
+              output="${output}/redirector.out" outputproperty="redirector.out"/>
+            <arg value="parrot.sh"/>
+            <arg value="${ant.file}"/>
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
                 <string>${ant.file} out</string>
-                <file file="${output}/redirector.out" />
-                <propertyresource name="redirector.out" />
+                <file file="${output}/redirector.out"/>
+                <propertyresource name="redirector.out"/>
             </resourcesmatch>
         </au:assertTrue>
         <au:assertTrue>
             <resourcesmatch astext="true">
                 <string>${ant.file} err</string>
-                <file file="${output}/redirector.err" />
-                <propertyresource name="redirector.err" />
+                <file file="${output}/redirector.err"/>
+                <propertyresource name="redirector.err"/>
             </resourcesmatch>
         </au:assertTrue>
     </target>
@@ -313,24 +313,24 @@
         <exec executable="sh">
             <redirector outputproperty="redirector.out"
                         errorproperty="redirector.err">
-                <outputmapper type="merge" to="${output}/redirector.out" />
-                <errormapper type="merge" to="${output}/redirector.err" />
+                <outputmapper type="merge" to="${output}/redirector.out"/>
+                <errormapper type="merge" to="${output}/redirector.err"/>
             </redirector>
-            <arg value="parrot.sh" />
-            <arg value="${ant.file}" />
+            <arg value="parrot.sh"/>
+            <arg value="${ant.file}"/>
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
                 <string>${ant.file} out</string>
-                <file file="${output}/redirector.out" />
-                <propertyresource name="redirector.out" />
+                <file file="${output}/redirector.out"/>
+                <propertyresource name="redirector.out"/>
             </resourcesmatch>
         </au:assertTrue>
         <au:assertTrue>
             <resourcesmatch astext="true">
                 <string>${ant.file} err</string>
-                <file file="${output}/redirector.err" />
-                <propertyresource name="redirector.err" />
+                <file file="${output}/redirector.err"/>
+                <propertyresource name="redirector.err"/>
             </resourcesmatch>
         </au:assertTrue>
     </target>
@@ -340,27 +340,27 @@
         <exec executable="sh">
             <redirector outputproperty="redirector.out"
                         errorproperty="redirector.err">
-                <outputmapper type="merge" to="${output}/redirector.out" />
-                <errormapper type="merge" to="${output}/redirector.err" />
+                <outputmapper type="merge" to="${output}/redirector.out"/>
+                <errormapper type="merge" to="${output}/redirector.err"/>
                 <errorfilterchain>
-                    <replacestring from="err" to="ERROR!!!" />
+                    <replacestring from="err" to="ERROR!!!"/>
                 </errorfilterchain>
             </redirector>
-            <arg value="parrot.sh" />
-            <arg value="${ant.file}" />
+            <arg value="parrot.sh"/>
+            <arg value="${ant.file}"/>
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
                 <string>${ant.file} out</string>
-                <file file="${output}/redirector.out" />
-                <propertyresource name="redirector.out" />
+                <file file="${output}/redirector.out"/>
+                <propertyresource name="redirector.out"/>
             </resourcesmatch>
         </au:assertTrue>
         <au:assertTrue>
             <resourcesmatch astext="true">
                 <string>${ant.file} ERROR!!!</string>
-                <file file="${output}/redirector.err" />
-                <propertyresource name="redirector.err" />
+                <file file="${output}/redirector.err"/>
+                <propertyresource name="redirector.err"/>
             </resourcesmatch>
         </au:assertTrue>
     </target>
@@ -371,22 +371,22 @@
         <exec executable="wc">
             <redirector outputproperty="redirector.out"
                         errorproperty="redirector.err">
-                <inputmapper type="merge" to="${input}/redirector.in" />
-                <outputmapper type="merge" to="${output}/redirector.out" />
-                <errormapper type="merge" to="${output}/redirector.err" />
+                <inputmapper type="merge" to="${input}/redirector.in"/>
+                <outputmapper type="merge" to="${output}/redirector.out"/>
+                <errormapper type="merge" to="${output}/redirector.err"/>
             </redirector>
-            <arg value="-w" />
+            <arg value="-w"/>
         </exec>
         <assert-trimmed-resource-content content="3">
-            <file file="${output}/redirector.out" />
+            <file file="${output}/redirector.out"/>
         </assert-trimmed-resource-content>
         <assert-trimmed-resource-content content="3">
-            <propertyresource name="redirector.out" />
+            <propertyresource name="redirector.out"/>
         </assert-trimmed-resource-content>
         <au:assertTrue>
             <length length="0">
-                <file file="${output}/redirector.err" />
-                <propertyresource name="redirector.err" />
+                <file file="${output}/redirector.err"/>
+                <propertyresource name="redirector.err"/>
             </length>
         </au:assertTrue>
     </target>
@@ -398,24 +398,24 @@
             <redirector outputproperty="redirector.out"
                         errorproperty="redirector.err">
                 <inputfilterchain>
-                    <replacestring from="before" to="after" />
+                    <replacestring from="before" to="after"/>
                 </inputfilterchain>
-                <inputmapper type="merge" to="${input}/redirector.in" />
-                <outputmapper type="merge" to="${output}/redirector.out" />
-                <errormapper type="merge" to="${output}/redirector.err" />
+                <inputmapper type="merge" to="${input}/redirector.in"/>
+                <outputmapper type="merge" to="${output}/redirector.out"/>
+                <errormapper type="merge" to="${output}/redirector.err"/>
             </redirector>
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
-                <string value="blah after blah" />
-                <file file="${output}/redirector.out" />
-                <propertyresource name="redirector.out" />
+                <string value="blah after blah"/>
+                <file file="${output}/redirector.out"/>
+                <propertyresource name="redirector.out"/>
             </resourcesmatch>
         </au:assertTrue>
         <au:assertTrue>
             <length length="0">
-                <file file="${output}/redirector.err" />
-                <propertyresource name="redirector.err" />
+                <file file="${output}/redirector.err"/>
+                <propertyresource name="redirector.err"/>
             </length>
         </au:assertTrue>
     </target>
@@ -427,24 +427,24 @@
             <redirector outputproperty="redirector.out"
                         errorproperty="redirector.err">
                 <outputfilterchain>
-                    <replacestring from="before" to="after" />
+                    <replacestring from="before" to="after"/>
                 </outputfilterchain>
-                <outputmapper type="merge" to="${output}/redirector.out" />
-                <errormapper type="merge" to="${output}/redirector.err" />
+                <outputmapper type="merge" to="${output}/redirector.out"/>
+                <errormapper type="merge" to="${output}/redirector.err"/>
             </redirector>
-            <arg value="${input}/redirector.in" />
+            <arg value="${input}/redirector.in"/>
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
-                <string value="blah after blah" />
-                <file file="${output}/redirector.out" />
-                <propertyresource name="redirector.out" />
+                <string value="blah after blah"/>
+                <file file="${output}/redirector.out"/>
+                <propertyresource name="redirector.out"/>
             </resourcesmatch>
         </au:assertTrue>
         <au:assertTrue>
             <length length="0">
-                <file file="${output}/redirector.err" />
-                <propertyresource name="redirector.err" />
+                <file file="${output}/redirector.err"/>
+                <propertyresource name="redirector.err"/>
             </length>
         </au:assertTrue>
     </target>
@@ -456,23 +456,23 @@
                         errorproperty="redirector.err"
                         inputstring="blah before blah">
                 <inputfilterchain>
-                    <replacestring from="before" to="after" />
+                    <replacestring from="before" to="after"/>
                 </inputfilterchain>
-                <outputmapper type="merge" to="${output}/redirector.out" />
-                <errormapper type="merge" to="${output}/redirector.err" />
+                <outputmapper type="merge" to="${output}/redirector.out"/>
+                <errormapper type="merge" to="${output}/redirector.err"/>
             </redirector>
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
-                <string value="blah after blah" />
-                <file file="${output}/redirector.out" />
-                <propertyresource name="redirector.out" />
+                <string value="blah after blah"/>
+                <file file="${output}/redirector.out"/>
+                <propertyresource name="redirector.out"/>
             </resourcesmatch>
         </au:assertTrue>
         <au:assertTrue>
             <length length="0">
-                <file file="${output}/redirector.err" />
-                <propertyresource name="redirector.err" />
+                <file file="${output}/redirector.err"/>
+                <propertyresource name="redirector.err"/>
             </length>
         </au:assertTrue>
     </target>
@@ -484,29 +484,29 @@
             <redirector outputproperty="redirector.out"
                         errorproperty="redirector.err">
                 <outputfilterchain>
-                    <replacestring from="before" to="after" />
+                    <replacestring from="before" to="after"/>
                 </outputfilterchain>
-                <outputmapper type="glob" from="nomatch" to="${output}/nomatchout" />
-                <errormapper type="glob" from="nomatch" to="${output}/nomatcherr" />
+                <outputmapper type="glob" from="nomatch" to="${output}/nomatchout"/>
+                <errormapper type="glob" from="nomatch" to="${output}/nomatcherr"/>
             </redirector>
-            <arg value="${input}/redirector.in" />
+            <arg value="${input}/redirector.in"/>
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
-                <string value="blah after blah" />
-                <file file="${output}/redirector.out" />
-                <propertyresource name="redirector.out" />
+                <string value="blah after blah"/>
+                <file file="${output}/redirector.out"/>
+                <propertyresource name="redirector.out"/>
             </resourcesmatch>
         </au:assertTrue>
         <au:assertTrue>
             <length length="0">
-                <file file="${output}/redirector.err" />
-                <propertyresource name="redirector.err" />
+                <file file="${output}/redirector.err"/>
+                <propertyresource name="redirector.err"/>
             </length>
         </au:assertTrue>
         <au:assertTrue>
             <resourcecount count="0">
-                <fileset dir="${output}" includes="nomatch???" />
+                <fileset dir="${output}" includes="nomatch???"/>
             </resourcecount>
         </au:assertTrue>
     </target>
@@ -516,17 +516,17 @@
         <exec executable="sh">
             <redirector>
                 <outputfilterchain>
-                    <replacestring from="out" to="OUTPUT???" />
+                    <replacestring from="out" to="OUTPUT???"/>
                 </outputfilterchain>
                 <errorfilterchain>
-                    <replacestring from="err" to="ERROR!!!" />
+                    <replacestring from="err" to="ERROR!!!"/>
                 </errorfilterchain>
             </redirector>
-            <arg value="parrot.sh" />
-            <arg value="${ant.file}" />
+            <arg value="parrot.sh"/>
+            <arg value="${ant.file}"/>
         </exec>
-        <au:assertLogContains text="${ant.file} OUTPUT???" />
-        <au:assertLogContains text="${ant.file} ERROR!!!" />
+        <au:assertLogContains text="${ant.file} OUTPUT???"/>
+        <au:assertLogContains text="${ant.file} ERROR!!!"/>
     </target>
 
     <target name="test-redirector-inputstring-outputfilterchain-outputmapper-errormapper"
@@ -534,25 +534,25 @@
         <exec executable="cat">
             <redirector inputstring="blah before blah">
                 <outputfilterchain>
-                    <replacestring from="before" to="after" />
+                    <replacestring from="before" to="after"/>
                 </outputfilterchain>
-                <outputmapper type="glob" from="nomatch" to="nomatchout" />
-                <errormapper type="glob" from="nomatch" to="nomatcherr" />
+                <outputmapper type="glob" from="nomatch" to="nomatchout"/>
+                <errormapper type="glob" from="nomatch" to="nomatcherr"/>
             </redirector>
         </exec>
-        <au:assertLogContains text="blah after blah" />
+        <au:assertLogContains text="blah after blah"/>
     </target>
 
     <target name="test-redirector-input-output-inputencoding-outputencoding"
             depends="setUp" if="cat.can.run">
         <exec executable="cat">
             <redirector input="input/iso8859-1" output="${output}/redirector.out"
-                        inputencoding="ISO8859_1" outputencoding="UTF8" />
+                        inputencoding="ISO8859_1" outputencoding="UTF8"/>
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
-                <file file="${output}/redirector.out" />
-                <file file="expected/utf-8" />
+                <file file="${output}/redirector.out"/>
+                <file file="expected/utf-8"/>
             </resourcesmatch>
         </au:assertTrue>
     </target>
@@ -560,12 +560,12 @@
     <target name="test-redirector-inputstring-output-error" depends="setUp" if="test.can.run">
         <exec executable="sh">
             <redirector inputstring="exit"
-                        output="${output}/redirector.out" error="${output}/redirector.err" />
+                        output="${output}/redirector.out" error="${output}/redirector.err"/>
         </exec>
         <au:assertTrue>
             <and>
-                <available file="${output}/redirector.out" type="file" />
-                <available file="${output}/redirector.err" type="file" />
+                <available file="${output}/redirector.out" type="file"/>
+                <available file="${output}/redirector.err" type="file"/>
             </and>
         </au:assertTrue>
     </target>
@@ -574,13 +574,13 @@
             depends="setUp" if="test.can.run">
         <exec executable="sh">
             <redirector inputstring="exit" createemptyfiles="false"
-                        output="${output}/redirector.out" error="${output}/redirector.err" />
+                        output="${output}/redirector.out" error="${output}/redirector.err"/>
         </exec>
         <au:assertTrue>
             <not>
                 <or>
-                    <available file="${output}/redirector.out" type="file" />
-                    <available file="${output}/redirector.err" type="file" />
+                    <available file="${output}/redirector.out" type="file"/>
+                    <available file="${output}/redirector.err" type="file"/>
                 </or>
             </not>
         </au:assertTrue>
@@ -588,15 +588,15 @@
 
     <target name="test-redirector-alwayslog-outputproperty" depends="setUp" if="test.can.run">
         <exec executable="sh">
-            <arg value="parrot.sh" />
-            <arg value="${ant.file}" />
+            <arg value="parrot.sh"/>
+            <arg value="${ant.file}"/>
             <redirector alwayslog="true" logerror="true"
-                        outputproperty="redirector.out" />
+                        outputproperty="redirector.out"/>
         </exec>
         <au:assertTrue>
-            <equals arg1="${ant.file} out" arg2="${redirector.out}" />
+            <equals arg1="${ant.file} out" arg2="${redirector.out}"/>
         </au:assertTrue>
-        <au:assertLogContains text="${ant.file} out" />
+        <au:assertLogContains text="${ant.file} out"/>
     </target>
 
     <!-- test will succeed as the OS wont match-->
@@ -615,11 +615,11 @@
       <exec executable="cmd.exe"
             failonerror="true"
             osFamily="winnt">
-            <arg value="/c" />
-            <arg value="time /t" />
+            <arg value="/c"/>
+            <arg value="time /t"/>
       </exec>
     </target>
-    
+
     <target name="testExecInconsistentSettings">
       <exec executable="nonexistent-program-we-expect"
             failonerror="true"
@@ -627,7 +627,7 @@
             os="linux unix">
       </exec>
     </target>
-    
+
     <target name="testDoesntWaitForChildren"
             description="https://issues.apache.org/bugzilla/show_bug.cgi?id=5003">
       <condition property="java"
@@ -687,8 +687,8 @@ public class Hello {
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
-                <file file="${output}/redirector.out" />
-                <file file="${output}/expected" />
+                <file file="${output}/redirector.out"/>
+                <file file="${output}/expected"/>
             </resourcesmatch>
         </au:assertTrue>
     </target>
@@ -701,8 +701,8 @@ public class Hello {
         </exec>
         <au:assertTrue>
             <resourcesmatch astext="true">
-                <file file="${output}/redirector.out" />
-                <file file="${input}/redirector.in" />
+                <file file="${output}/redirector.out"/>
+                <file file="${input}/redirector.in"/>
             </resourcesmatch>
         </au:assertTrue>
     </target>
diff --git a/src/tests/antunit/taskdefs/fail-test.xml b/src/tests/antunit/taskdefs/fail-test.xml
index d525b731a..e9cca05b4 100644
--- a/src/tests/antunit/taskdefs/fail-test.xml
+++ b/src/tests/antunit/taskdefs/fail-test.xml
@@ -18,7 +18,7 @@
 
 <project name="echo-test" default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="testIfNotSet">
     <au:expectfailure>
diff --git a/src/tests/antunit/taskdefs/get-test.xml b/src/tests/antunit/taskdefs/get-test.xml
index b4543f579..ced1dbd23 100644
--- a/src/tests/antunit/taskdefs/get-test.xml
+++ b/src/tests/antunit/taskdefs/get-test.xml
@@ -17,12 +17,12 @@
 -->
 
 <project name="get-test" default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
+
+  <property name="location" value="http://ant.apache.org/webtest/gettest"/>
 
-  <property name="location" value="http://ant.apache.org/webtest/gettest" />
-    
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
   </target>
 
   <target name="testSeeOtherRedirect">
@@ -30,70 +30,70 @@
       <au:assertTrue>
             <resourcecount count="1">
               <restrict>
-                <file file="${output}/other.tmp" />
-                <contains text="seeother redirect succeeded" />
+                <file file="${output}/other.tmp"/>
+                <contains text="seeother redirect succeeded"/>
               </restrict>
             </resourcecount>
           </au:assertTrue>
-    <au:assertLogContains text="other.txt moved to http" />  
+    <au:assertLogContains text="other.txt moved to http"/>
   </target>
-    
+
     <target name="testPermanentRedirect">
       <get  src="${location}/permanent.txt" dest="${output}/permanent.tmp"/>
         <au:assertTrue>
           <resourcecount count="1">
             <restrict>
-              <file file="${output}/permanent.tmp" />
-              <contains text="permanent redirect succeeded" />
+              <file file="${output}/permanent.tmp"/>
+              <contains text="permanent redirect succeeded"/>
             </restrict>
           </resourcecount>
         </au:assertTrue>
-        <au:assertLogContains text="permanent.txt permanently moved to http" />
+        <au:assertLogContains text="permanent.txt permanently moved to http"/>
     </target>
-    
+
     <target name="testTemporaryRedirect">
       <get  src="${location}/temp.txt" dest="${output}/temp.txt"/>
         <au:assertTrue>
           <resourcecount count="1">
             <restrict>
-              <file file="${output}/temp.txt" />
-              <contains text="temporary redirect succeeded" />
+              <file file="${output}/temp.txt"/>
+              <contains text="temporary redirect succeeded"/>
             </restrict>
           </resourcecount>
         </au:assertTrue>
-        <au:assertLogContains text="temp.txt moved to http" />
+        <au:assertLogContains text="temp.txt moved to http"/>
     </target>
-    
+
     <target name="testStatusCode307Redirect">
       <get  src="${location}/307.txt" dest="${output}/307.txt"/>
         <au:assertTrue>
           <resourcecount count="1">
             <restrict>
-              <file file="${output}/307.txt" />
-              <contains text="307 status code redirect succeeded" />
+              <file file="${output}/307.txt"/>
+              <contains text="307 status code redirect succeeded"/>
             </restrict>
           </resourcecount>
         </au:assertTrue>
-        <au:assertLogContains text="307.txt moved to http" />
+        <au:assertLogContains text="307.txt moved to http"/>
     </target>
-    
+
     <target name="test5LevelsOfRedirect">
       <get  src="${location}/redir5.txt" dest="${output}/redir5.tmp"/>
         <au:assertTrue>
           <resourcecount count="1">
             <restrict>
-              <file file="${output}/redir5.tmp" />
-              <contains text="5 levels of redirect succeeded" />
+              <file file="${output}/redir5.tmp"/>
+              <contains text="5 levels of redirect succeeded"/>
             </restrict>
           </resourcecount>
         </au:assertTrue>
 
-        <au:assertLogContains text="redir5.txt moved to http" />
+        <au:assertLogContains text="redir5.txt moved to http"/>
 
-        <au:assertLogContains text="redir5-4.txt moved to http" />
+        <au:assertLogContains text="redir5-4.txt moved to http"/>
     </target>
-    
-    
+
+
     <target name="testInfiniteRedirect" unless="jenkins">
         <au:expectfailure expectedmessage="More than 25 times redirected, giving up">
       <get  src="${location}/infinite.txt" dest="${output}/infinite.tmp"/>
@@ -103,7 +103,7 @@
 
     <target name="testNestedResources">
       <get dest="${output}/downloads">
-        <url url="http://ant.apache.org/index.html"/> 
+        <url url="http://ant.apache.org/index.html"/>
         <url url="http://ant.apache.org/faq.html"/>
       </get>
       <au:assertFileExists file="${output}/downloads/index.html"/>
@@ -115,12 +115,12 @@
     <au:assertTrue>
       <resourcecount count="1">
         <restrict>
-          <file file="${output}/other.tmp" />
+          <file file="${output}/other.tmp"/>
           <contains text="local redirect succeeded"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
-    <au:assertLogContains text="local.cgi moved to http" />  
+    <au:assertLogContains text="local.cgi moved to http"/>
   </target>
 
   <target name="testHttpToHttpsRedirect" description="Tests that a resource that's redirected
diff --git a/src/tests/antunit/taskdefs/gunzip-test.xml b/src/tests/antunit/taskdefs/gunzip-test.xml
index e678eb064..68c11144e 100644
--- a/src/tests/antunit/taskdefs/gunzip-test.xml
+++ b/src/tests/antunit/taskdefs/gunzip-test.xml
@@ -16,12 +16,12 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setup">
     <mkdir dir="${output}"/>
   </target>
-  
+
   <target name="testWithFileResourceToFile" depends="setup">
     <gunzip dest="${output}/asf-logo.gif">
       <file file="../../../etc/testcases/taskdefs/expected/asf-logo.gif.gz"/>
@@ -59,4 +59,3 @@
   </target>
 
 </project>
-
diff --git a/src/tests/antunit/taskdefs/gzip-test.xml b/src/tests/antunit/taskdefs/gzip-test.xml
index 38f0a7a68..f267a1347 100644
--- a/src/tests/antunit/taskdefs/gzip-test.xml
+++ b/src/tests/antunit/taskdefs/gzip-test.xml
@@ -18,19 +18,19 @@
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
 
     <!-- note relies on antunit 1.1 -->
-    <import file="../antunit-base.xml" />
+    <import file="../antunit-base.xml"/>
 
     <target name="setUp">
-        <mkdir dir="${output}" />
-        <mkdir dir="${output}/empty" />
-        <touch file="${output}/fileone" />
-        <touch file="${output}/filetwo" />
+        <mkdir dir="${output}"/>
+        <mkdir dir="${output}/empty"/>
+        <touch file="${output}/fileone"/>
+        <touch file="${output}/filetwo"/>
     </target>
 
     <target name="testFailNone">
         <au:expectfailure expectedmessage="No resource selected, gzip needs exactly one resource." message="Should have thrown an exception">
             <gzip destfile="${output}/file.gz">
-                <fileset dir="${output}/empty" />
+                <fileset dir="${output}/empty"/>
             </gzip>
         </au:expectfailure>
     </target>
@@ -38,7 +38,7 @@
     <target name="testFailTwo">
         <au:expectfailure expectedmessage="gzip cannot handle multiple resources at once. (2 resources were selected.)" message="Should have thrown an exception">
             <gzip destfile="${output}/file.gz">
-                <fileset dir="${output}" />
+                <fileset dir="${output}"/>
             </gzip>
         </au:expectfailure>
     </target>
diff --git a/src/tests/antunit/taskdefs/hostinfo-test.xml b/src/tests/antunit/taskdefs/hostinfo-test.xml
index a044b9b12..267fa4f90 100644
--- a/src/tests/antunit/taskdefs/hostinfo-test.xml
+++ b/src/tests/antunit/taskdefs/hostinfo-test.xml
@@ -18,25 +18,25 @@
 <project name="hostinfo-test" default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
+
+  <property name="undef-name" value="nonexistenthost.nonexistentdomain"/>
+  <property name="undef-hostname" value="nonexistenthost"/>
+  <property name="undef-domainname" value="nonexistentdomain"/>
+
+  <property name="undef-ip4" value="0.0.0.0"/>
+  <property name="undef-ip6" value="::"/>
+
+  <property name="xs4all-hostname" value="www.xs4all.nl"/>
+  <property name="xs4all-domain" value="xs4all.nl"/>
+  <property name="xs4all-realhost" value="www"/>
+  <property name="xs4all-ip4" value="194.109.6.92"/>
 
-  <property name="undef-name" value="nonexistenthost.nonexistentdomain" />
-  <property name="undef-hostname" value="nonexistenthost" />
-  <property name="undef-domainname" value="nonexistentdomain" />
-        
-  <property name="undef-ip4" value="0.0.0.0" />
-  <property name="undef-ip6" value="::" />
-      
-  <property name="xs4all-hostname" value="www.xs4all.nl" />
-  <property name="xs4all-domain" value="xs4all.nl" />
-  <property name="xs4all-realhost" value="www" />
-  <property name="xs4all-ip4" value="194.109.6.92" />
-    
   <target name="setUp">
   </target>
 
   <target name="testLocal" depends="setUp">
-    <hostinfo prefix="local" />
+    <hostinfo prefix="local"/>
       <!-- Do not know what to expect here, machine dependent -->
   </target>
 
@@ -46,19 +46,19 @@
       <au:assertEquals expected="${xs4all-domain}" actual="${DOMAIN}"/>
       <au:assertEquals expected="${xs4all-ip4}" actual="${ADDR4}"/>
     </target>
-    
+
     <target name="testReverse" depends="setUp">
       <hostinfo prefix="reverse" host="${xs4all-ip4}"/>
       <au:assertEquals expected="${xs4all-realhost}" actual="${reverse.NAME}"/>
       <au:assertEquals expected="${xs4all-domain}" actual="${reverse.DOMAIN}"/>
       <au:assertEquals expected="${xs4all-ip4}" actual="${reverse.ADDR4}"/>
     </target>
-    
+
     <target name="testUndef" depends="setUp">
       <hostinfo prefix="undef" host="${undef-name}"/>
       <au:assertEquals expected="${undef-hostname}" actual="${undef.NAME}"/>
       <au:assertEquals expected="${undef-domainname}" actual="${undef.DOMAIN}"/>
       <au:assertEquals expected="${undef-ip4}" actual="${undef.ADDR4}"/>
     </target>
-    
+
 </project>
diff --git a/src/tests/antunit/taskdefs/import-test.xml b/src/tests/antunit/taskdefs/import-test.xml
index f9e4b055e..f2ece684a 100644
--- a/src/tests/antunit/taskdefs/import-test.xml
+++ b/src/tests/antunit/taskdefs/import-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <import>
     <file file="importtests/a.xml"/>
diff --git a/src/tests/antunit/taskdefs/import-url-test.xml b/src/tests/antunit/taskdefs/import-url-test.xml
index 103ece3ec..e4fb84ccb 100644
--- a/src/tests/antunit/taskdefs/import-url-test.xml
+++ b/src/tests/antunit/taskdefs/import-url-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <mkdir dir="${output}"/>
   <mkdir dir="${input}/a/b"/>
diff --git a/src/tests/antunit/taskdefs/importtests/a.xml b/src/tests/antunit/taskdefs/importtests/a.xml
index 6082990f1..4651f9aa6 100644
--- a/src/tests/antunit/taskdefs/importtests/a.xml
+++ b/src/tests/antunit/taskdefs/importtests/a.xml
@@ -20,4 +20,3 @@
     <property name="foo" value="bar"/>
   </target>
 </project>
-
diff --git a/src/tests/antunit/taskdefs/importtests/b.xml b/src/tests/antunit/taskdefs/importtests/b.xml
index 546badf5a..8fdfc1196 100644
--- a/src/tests/antunit/taskdefs/importtests/b.xml
+++ b/src/tests/antunit/taskdefs/importtests/b.xml
@@ -20,4 +20,3 @@
     <property name="foo" value="baz"/>
   </target>
 </project>
-
diff --git a/src/tests/antunit/taskdefs/importtests/override.xml b/src/tests/antunit/taskdefs/importtests/override.xml
index 97fd320bc..0afc5af76 100644
--- a/src/tests/antunit/taskdefs/importtests/override.xml
+++ b/src/tests/antunit/taskdefs/importtests/override.xml
@@ -22,4 +22,3 @@
 
   <target name="dummy" depends="setProperty"/>
 </project>
-
diff --git a/src/tests/antunit/taskdefs/include-test.xml b/src/tests/antunit/taskdefs/include-test.xml
index 7e1a45231..19e04545a 100644
--- a/src/tests/antunit/taskdefs/include-test.xml
+++ b/src/tests/antunit/taskdefs/include-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
  <include>
   <file file="importtests/a.xml"/>
diff --git a/src/tests/antunit/taskdefs/jar-spi-test.xml b/src/tests/antunit/taskdefs/jar-spi-test.xml
index c05311aa8..13316a17a 100644
--- a/src/tests/antunit/taskdefs/jar-spi-test.xml
+++ b/src/tests/antunit/taskdefs/jar-spi-test.xml
@@ -19,8 +19,8 @@
   <property name="jar.dir" location="jar_spi_dir"/>
   <property name="jar.src.dir" location="jar_spi_dir/src"/>
   <property name="jar.src.file" location="jar_spi_dir/src/a_file"/>
-    
-  <available property="jdk1.4+" classname="java.lang.CharSequence"/>  
+
+  <available property="jdk1.4+" classname="java.lang.CharSequence"/>
   <condition property="some.regexp.support">
     <or>
       <isset property="jdk1.4+"/>
diff --git a/src/tests/antunit/taskdefs/jar-test.xml b/src/tests/antunit/taskdefs/jar-test.xml
index 63646e215..4588e69fa 100644
--- a/src/tests/antunit/taskdefs/jar-test.xml
+++ b/src/tests/antunit/taskdefs/jar-test.xml
@@ -16,31 +16,31 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="testIndexOnlyUpdate">
     <mkdir dir="${output}"/>
-    <property name="index.jar" location="${output}/index.jar" />
+    <property name="index.jar" location="${output}/index.jar"/>
 
     <jar destfile="${index.jar}" index="false">
-      <fileset dir="${basedir}" includes="*-test.xml" />
+      <fileset dir="${basedir}" includes="*-test.xml"/>
     </jar>
     <au:assertTrue>
       <resourcecount count="0">
         <restrict>
-          <zipentry zipfile="${index.jar}" name="META-INF/INDEX.LIST" />
-          <exists />
+          <zipentry zipfile="${index.jar}" name="META-INF/INDEX.LIST"/>
+          <exists/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
     <jar destfile="${index.jar}" index="true" update="true">
-      <fileset dir="${basedir}" includes="*-test.xml" />
+      <fileset dir="${basedir}" includes="*-test.xml"/>
     </jar>
     <au:assertTrue>
       <resourcecount count="1">
         <restrict>
-          <zipentry zipfile="${index.jar}" name="META-INF/INDEX.LIST" />
-          <exists />
+          <zipentry zipfile="${index.jar}" name="META-INF/INDEX.LIST"/>
+          <exists/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -258,7 +258,7 @@ Main-Class: MyClass
     <property name="java9.classes"  value="${input}/build/classes9"/>
     <property name="java10.classes" value="${input}/build/classes10"/>
     <macrodef name="create">
-      <attribute name="version" />
+      <attribute name="version"/>
       <sequential>
         <local name="src"/>
         <local name="classes"/>
@@ -278,7 +278,7 @@ Main-Class: MyClass
     <create version="8"/>
     <create version="9"/>
     <create version="10"/>
-    
+
     <!-- Now create the MultiReleaseJar -->
     <jar destfile="${antunit.tmpdir}/mrjar.jar">
       <manifest>
@@ -292,7 +292,7 @@ Main-Class: MyClass
       <zipfileset prefix="META-INF/versions/9/" dir="${java9.classes}"/>
       <zipfileset prefix="META-INF/versions/10/" dir="${java10.classes}"/>
     </jar>
-    
+
     <!-- Now some tests -->
     <au:assertNestedResourceExists>
       <zipentry zipfile="${antunit.tmpdir}/mrjar.jar" name="META-INF/versions/9/org/apache/ant/test/MRJarTest.class"/>
diff --git a/src/tests/antunit/taskdefs/java-test.xml b/src/tests/antunit/taskdefs/java-test.xml
index db673161d..60068a9c8 100644
--- a/src/tests/antunit/taskdefs/java-test.xml
+++ b/src/tests/antunit/taskdefs/java-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="-setUpWriterClass">
     <mkdir dir="${input}"/>
@@ -72,4 +72,3 @@ public class A {
   </target>
 
 </project>
-
diff --git a/src/tests/antunit/taskdefs/javac-test.xml b/src/tests/antunit/taskdefs/javac-test.xml
index 7c1f462bd..0b9ffb842 100644
--- a/src/tests/antunit/taskdefs/javac-test.xml
+++ b/src/tests/antunit/taskdefs/javac-test.xml
@@ -16,11 +16,11 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setup">
-    <property name="javac-dir" location="${output}/javac-dir" />
-    <property name="build-dir" location="${javac-dir}/build" />
+    <property name="javac-dir" location="${output}/javac-dir"/>
+    <property name="build-dir" location="${javac-dir}/build"/>
     <presetdef name="testJavac">
       <javac srcdir="${javac-dir}/src" destdir="${javac-dir}/classes"
              includeantruntime="false"/>
@@ -28,67 +28,67 @@
   </target>
 
   <target name="test-includeDestClasses" depends="setup">
-    <property name="DATE" value="09/10/1999 4:30 pm" />
-    <delete dir="${javac-dir}/src" />
-    <mkdir dir="${javac-dir}/src" />
+    <property name="DATE" value="09/10/1999 4:30 pm"/>
+    <delete dir="${javac-dir}/src"/>
+    <mkdir dir="${javac-dir}/src"/>
     <echo file="${javac-dir}/src/A.java">
       public class A { B b;}
     </echo>
     <echo file="${javac-dir}/src/B.java">
       public class B { }
     </echo>
-    <delete dir="${javac-dir}/classes" quiet="yes" />
-    <mkdir dir="${javac-dir}/classes" />
-    <javac srcdir="${javac-dir}/src" destdir="${javac-dir}/classes" />
-    <touch file="${javac-dir}/src/B.java" datetime="${DATE}" />
-    <touch file="${javac-dir}/classes/B.class" datetime="${DATE}" />
+    <delete dir="${javac-dir}/classes" quiet="yes"/>
+    <mkdir dir="${javac-dir}/classes"/>
+    <javac srcdir="${javac-dir}/src" destdir="${javac-dir}/classes"/>
+    <touch file="${javac-dir}/src/B.java" datetime="${DATE}"/>
+    <touch file="${javac-dir}/classes/B.class" datetime="${DATE}"/>
     <!-- following should not update B.class -->
-    <delete quiet="yes" file="${javac-dir}/classes/A.class" />
-    <javac srcdir="${javac-dir}/src" destdir="${javac-dir}/classes" />
+    <delete quiet="yes" file="${javac-dir}/classes/A.class"/>
+    <javac srcdir="${javac-dir}/src" destdir="${javac-dir}/classes"/>
     <au:assertTrue>
       <isfileselected file="${javac-dir}/classes/B.class">
-        <date datetime="${DATE}" when="equal" />
+        <date datetime="${DATE}" when="equal"/>
       </isfileselected>
     </au:assertTrue>
     <!-- following should update B.class -->
-    <delete quiet="yes" file="${javac-dir}/classes/A.class" />
-    <javac srcdir="${javac-dir}/src" destdir="${javac-dir}/classes" includeDestClasses="no" />
+    <delete quiet="yes" file="${javac-dir}/classes/A.class"/>
+    <javac srcdir="${javac-dir}/src" destdir="${javac-dir}/classes" includeDestClasses="no"/>
     <au:assertFalse>
       <isfileselected file="${javac-dir}/classes/B.class">
-        <date datetime="${DATE}" when="equal" />
+        <date datetime="${DATE}" when="equal"/>
       </isfileselected>
     </au:assertFalse>
   </target>
 
   <target name="test-updated-property" depends="setup">
-    <delete quiet="yes" dir="${build-dir}" />
-    <mkdir dir="${build-dir}" />
-    <javac srcdir="javac-dir/good-src" destdir="${build-dir}" updatedProperty="classes-updated" />
+    <delete quiet="yes" dir="${build-dir}"/>
+    <mkdir dir="${build-dir}"/>
+    <javac srcdir="javac-dir/good-src" destdir="${build-dir}" updatedProperty="classes-updated"/>
     <au:assertTrue>
-      <equals arg1="${classes-updated}" arg2="true" />
+      <equals arg1="${classes-updated}" arg2="true"/>
     </au:assertTrue>
-    <javac srcdir="javac-dir/good-src" destdir="${build-dir}" updatedProperty="classes-updated-2" />
+    <javac srcdir="javac-dir/good-src" destdir="${build-dir}" updatedProperty="classes-updated-2"/>
     <au:assertFalse>
-      <isset property="classes-updated-2" />
+      <isset property="classes-updated-2"/>
     </au:assertFalse>
   </target>
 
   <target name="test-error-property" depends="setup">
-    <delete quiet="yes" dir="${build-dir}" />
-    <mkdir dir="${build-dir}" />
-    <javac srcdir="javac-dir/good-src" destdir="${build-dir}" failOnError="false" errorProperty="compile-failed" />
+    <delete quiet="yes" dir="${build-dir}"/>
+    <mkdir dir="${build-dir}"/>
+    <javac srcdir="javac-dir/good-src" destdir="${build-dir}" failOnError="false" errorProperty="compile-failed"/>
     <au:assertTrue>
-      <equals arg1="${compile-failed}" arg2="${compile-failed}" />
+      <equals arg1="${compile-failed}" arg2="${compile-failed}"/>
     </au:assertTrue>
-    <javac srcdir="javac-dir/bad-src" destdir="${build-dir}" failOnError="false" errorProperty="compile-failed" />
+    <javac srcdir="javac-dir/bad-src" destdir="${build-dir}" failOnError="false" errorProperty="compile-failed"/>
     <au:assertTrue>
-      <equals arg1="${compile-failed}" arg2="true" />
+      <equals arg1="${compile-failed}" arg2="true"/>
     </au:assertTrue>
   </target>
 
   <target name="setUpForPackageInfoJava" depends="setup">
-    <mkdir dir="${javac-dir}/src/a" />
-    <mkdir dir="${build-dir}" />
+    <mkdir dir="${javac-dir}/src/a"/>
+    <mkdir dir="${build-dir}"/>
     <echo file="${javac-dir}/src/a/package-info.java">
       <![CDATA[
 /**
@@ -96,53 +96,53 @@
  */
 ]]>
     </echo>
-    <javac srcdir="${javac-dir}/src" destdir="${build-dir}" updatedProperty="first-pass" />
-    <au:assertPropertyEquals name="first-pass" value="true" />
+    <javac srcdir="${javac-dir}/src" destdir="${build-dir}" updatedProperty="first-pass"/>
+    <au:assertPropertyEquals name="first-pass" value="true"/>
   </target>
 
   <target name="testPackageInfoJava"
           depends="setUpForPackageInfoJava"
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43114">
     <!-- no changes, shouldn't recompile, the initial bug -->
-    <javac srcdir="${javac-dir}/src" destdir="${build-dir}" updatedProperty="second-pass" />
+    <javac srcdir="${javac-dir}/src" destdir="${build-dir}" updatedProperty="second-pass"/>
     <au:assertFalse>
-      <isset property="second-pass" />
+      <isset property="second-pass"/>
     </au:assertFalse>
-    <sleep seconds="2" />
+    <sleep seconds="2"/>
 
     <!-- change package-info.java but make containing target dir even
          more recent - the regression in Ant 1.7.1 -->
-    <touch file="${javac-dir}/src/a/package-info.java" />
-    <sleep seconds="2" />
+    <touch file="${javac-dir}/src/a/package-info.java"/>
+    <sleep seconds="2"/>
     <touch>
-      <file file="${build-dir}/a" />
+      <file file="${build-dir}/a"/>
     </touch>
-    <javac srcdir="${javac-dir}/src" destdir="${build-dir}" updatedProperty="third-pass" />
-    <au:assertPropertyEquals name="third-pass" value="true" />
+    <javac srcdir="${javac-dir}/src" destdir="${build-dir}" updatedProperty="third-pass"/>
+    <au:assertPropertyEquals name="third-pass" value="true"/>
   </target>
 
   <target name="testPackageInfoJavaNoDest"
           depends="setUpForPackageInfoJava"
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=51947">
-    <javac srcdir="${javac-dir}/src" updatedProperty="first-pass" />
-    <au:assertPropertyEquals name="first-pass" value="true" />
+    <javac srcdir="${javac-dir}/src" updatedProperty="first-pass"/>
+    <au:assertPropertyEquals name="first-pass" value="true"/>
 
     <!-- no changes, shouldn't recompile, the initial bug -->
-    <javac srcdir="${javac-dir}/src" updatedProperty="second-pass" />
+    <javac srcdir="${javac-dir}/src" updatedProperty="second-pass"/>
     <au:assertFalse>
-      <isset property="second-pass" />
+      <isset property="second-pass"/>
     </au:assertFalse>
-    <sleep seconds="2" />
+    <sleep seconds="2"/>
 
     <!-- change package-info.java but make containing target dir even
          more recent - the regression in Ant 1.7.1 -->
-    <touch file="${javac-dir}/src/a/package-info.java" />
-    <sleep seconds="2" />
+    <touch file="${javac-dir}/src/a/package-info.java"/>
+    <sleep seconds="2"/>
     <touch>
-      <file file="${javac-dir}/src/a" />
+      <file file="${javac-dir}/src/a"/>
     </touch>
-    <javac srcdir="${javac-dir}/src" updatedProperty="third-pass" />
-    <au:assertPropertyEquals name="third-pass" value="true" />
+    <javac srcdir="${javac-dir}/src" updatedProperty="third-pass"/>
+    <au:assertPropertyEquals name="third-pass" value="true"/>
   </target>
 
   <target name="testSuppressPackageInfoClass"
@@ -152,14 +152,14 @@
     <delete file="${build-dir}/a/package-info.class"/>
     <javac srcdir="${javac-dir}/src" destdir="${build-dir}"
            createMissingPackageInfoClass="false"
-           updatedProperty="second-pass" />
-    <au:assertPropertyEquals name="second-pass" value="true" />
+           updatedProperty="second-pass"/>
+    <au:assertPropertyEquals name="second-pass" value="true"/>
     <au:assertFileDoesntExist file="${build-dir}/a/package-info.class"/>
   </target>
 
   <target name="-create-javac-adapter" depends="setup">
-    <property name="adapter.dir" location="${output}/adapter" />
-    <mkdir dir="${input}/org/example" />
+    <property name="adapter.dir" location="${output}/adapter"/>
+    <mkdir dir="${input}/org/example"/>
     <echo file="${input}/org/example/Adapter.java">
       <![CDATA[
 package org.example;
@@ -174,41 +174,41 @@ public class Adapter implements CompilerAdapter {
     }
 }]]>
     </echo>
-    <mkdir dir="${resources}" />
-    <javac srcdir="${input}" destdir="${resources}" />
+    <mkdir dir="${resources}"/>
+    <javac srcdir="${input}" destdir="${resources}"/>
   </target>
 
   <target name="testCompilerNotFound" depends="-create-javac-adapter">
     <au:expectfailure>
-      <javac srcdir="${input}" destdir="${output}" compiler="org.example.Adapter" />
+      <javac srcdir="${input}" destdir="${output}" compiler="org.example.Adapter"/>
     </au:expectfailure>
-    <au:assertLogDoesntContain text="adapter called" />
+    <au:assertLogDoesntContain text="adapter called"/>
   </target>
 
   <target name="testCompilerClasspath" depends="-create-javac-adapter" description="https://issues.apache.org/bugzilla/show_bug.cgi?id=11143">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
     <javac srcdir="${input}" destdir="${output}" compiler="org.example.Adapter">
-      <compilerclasspath location="${resources}" />
+      <compilerclasspath location="${resources}"/>
     </javac>
-    <au:assertLogContains text="adapter called" />
+    <au:assertLogContains text="adapter called"/>
   </target>
 
   <target name="testCompilerAsNestedElement" depends="-create-javac-adapter">
     <componentdef classname="org.example.Adapter" name="myjavac">
-      <classpath location="${resources}" />
+      <classpath location="${resources}"/>
     </componentdef>
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
     <javac srcdir="${input}" destdir="${output}">
-      <myjavac />
+      <myjavac/>
     </javac>
-    <au:assertLogContains text="adapter called" />
+    <au:assertLogContains text="adapter called"/>
   </target>
 
   <target name="testSourceAttributes" depends="setup"
           xmlns:if="ant:if" xmlns:unless="ant:unless">
-    <delete dir="${javac-dir}/src" />
-    <mkdir dir="${javac-dir}/src" />
-    <mkdir dir="${javac-dir}/classes" />
+    <delete dir="${javac-dir}/src"/>
+    <mkdir dir="${javac-dir}/src"/>
+    <mkdir dir="${javac-dir}/classes"/>
     <echo file="${javac-dir}/src/A.java">
       public class A { }
     </echo>
@@ -223,27 +223,27 @@ public class Adapter implements CompilerAdapter {
       <delete dir="${javac-dir}/classes"/>
       <mkdir dir="${javac-dir}/classes"/>
     </sequential>
-    
+
     <sequential unless:set="jdk1.9+">
       <echo>JDK 1.8+</echo>
       <testJavac source="1.8"/>
       <delete dir="${javac-dir}/classes"/>
       <mkdir dir="${javac-dir}/classes"/>
     </sequential>
-            
+
     <sequential if:set="jdk9+">
       <echo>JDK 9+</echo>
       <testJavac source="9"/>
       <delete dir="${javac-dir}/classes"/>
       <mkdir dir="${javac-dir}/classes"/>
     </sequential>
-  </target>	
-	
+  </target>
+
   <target name="testTargetAttributes" depends="setup"
           xmlns:if="ant:if" xmlns:unless="ant:unless">
-    <delete dir="${javac-dir}/src" />
-    <mkdir dir="${javac-dir}/src" />
-    <mkdir dir="${javac-dir}/classes" />
+    <delete dir="${javac-dir}/src"/>
+    <mkdir dir="${javac-dir}/src"/>
+    <mkdir dir="${javac-dir}/classes"/>
     <echo file="${javac-dir}/src/A.java">
       public class A { }
     </echo>
@@ -258,7 +258,7 @@ public class Adapter implements CompilerAdapter {
       <delete dir="${javac-dir}/classes"/>
       <mkdir dir="${javac-dir}/classes"/>
     </sequential>
-            
+
     <sequential if:set="jdk9+">
       <echo>JDK 9+</echo>
       <testJavac source="9" target="9"/>
@@ -275,7 +275,7 @@ public class Adapter implements CompilerAdapter {
   </target>
 
   <target name="testJavacWithNativeHeaderGeneration" depends="setup">
-    <mkdir dir="${javac-dir}/src/org/example" />
+    <mkdir dir="${javac-dir}/src/org/example"/>
     <mkdir dir="${javac-dir}/classes"/>
     <mkdir dir="${javac-dir}/headers"/>
     <echo file="${javac-dir}/src/org/example/Foo.java">
diff --git a/src/tests/antunit/taskdefs/javadoc-test.xml b/src/tests/antunit/taskdefs/javadoc-test.xml
index 200082bab..4b34e6ef4 100644
--- a/src/tests/antunit/taskdefs/javadoc-test.xml
+++ b/src/tests/antunit/taskdefs/javadoc-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="-makeTestClass">
     <macrodef name="mktest">
diff --git a/src/tests/antunit/taskdefs/length-test.xml b/src/tests/antunit/taskdefs/length-test.xml
index acd5310bb..3924c9eb3 100644
--- a/src/tests/antunit/taskdefs/length-test.xml
+++ b/src/tests/antunit/taskdefs/length-test.xml
@@ -18,201 +18,201 @@
 <project name="length-test" default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
-  <property name="dir.a" location="${input}/a" />
-  <property name="dir.b" location="${input}/b" />
-  <property name="zipfile" location="${output}/lengthtest.zip" />
+  <property name="dir.a" location="${input}/a"/>
+  <property name="dir.b" location="${input}/b"/>
+  <property name="zipfile" location="${output}/lengthtest.zip"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
-    <mkdir dir="${dir.a}" />
-    <mkdir dir="${dir.b}" />
-    <property name="foo" location="${dir.a}/foo" />
-    <property name="bar" location="${dir.b}/bar" />
-    <echo file="${foo}" message="foo" />
-    <echo file="${bar}" message="bar" />
+    <mkdir dir="${output}"/>
+    <mkdir dir="${dir.a}"/>
+    <mkdir dir="${dir.b}"/>
+    <property name="foo" location="${dir.a}/foo"/>
+    <property name="bar" location="${dir.b}/bar"/>
+    <echo file="${foo}" message="foo"/>
+    <echo file="${bar}" message="bar"/>
   </target>
 
   <target name="testEach" depends="setUp">
     <length mode="each" property="length.each">
-      <fileset id="fs" dir="${input}" />
+      <fileset id="fs" dir="${input}"/>
     </length>
-    <length string="${length.each}" property="length.length.each" />
+    <length string="${length.each}" property="length.length.each"/>
     <length string="${foo}${bar}........${line.separator}"
-            property="length.expected" />
+            property="length.expected"/>
 
     <au:assertTrue>
       <!-- test that both files are represented, and that the
            output is the expected length; do not assume order. -->
       <and>
-        <contains string="${length.each}" substring="${foo} : 3" />
-        <contains string="${length.each}" substring="${bar} : 3" />
-        <equals arg1="${length.length.each}" arg2="${length.expected}" />
+        <contains string="${length.each}" substring="${foo} : 3"/>
+        <contains string="${length.each}" substring="${bar} : 3"/>
+        <equals arg1="${length.length.each}" arg2="${length.expected}"/>
       </and>
     </au:assertTrue>
   </target>
 
   <target name="testEachCondition" depends="setUp">
     <length mode="each" property="length.each">
-      <fileset id="fs" dir="${input}" />
+      <fileset id="fs" dir="${input}"/>
     </length>
     <length string="${foo}${bar}........${line.separator}"
-            property="length.expected" />
+            property="length.expected"/>
     <au:assertTrue>
       <!-- test that both files are represented, and that the
            output is the expected length; do not assume order. -->
       <and>
-        <contains string="${length.each}" substring="${foo} : 3" />
-        <contains string="${length.each}" substring="${bar} : 3" />
-        <length string="${length.each}" length="${length.expected}" />
+        <contains string="${length.each}" substring="${foo} : 3"/>
+        <contains string="${length.each}" substring="${bar} : 3"/>
+        <length string="${length.each}" length="${length.expected}"/>
       </and>
     </au:assertTrue>
   </target>
 
   <target name="testAll" depends="setUp">
     <length property="length.all">
-      <fileset id="foo" file="${dir.a}/foo" />
-      <fileset id="bar" file="${dir.b}/bar" />
+      <fileset id="foo" file="${dir.a}/foo"/>
+      <fileset id="bar" file="${dir.b}/bar"/>
     </length>
     <au:assertTrue>
-      <equals arg1="6" arg2="${length.all}" />
+      <equals arg1="6" arg2="${length.all}"/>
     </au:assertTrue>
   </target>
 
   <target name="testAllCondition" depends="setUp">
     <au:assertTrue>
       <length length="6">
-        <fileset id="foo" file="${dir.a}/foo" />
-        <fileset id="bar" file="${dir.b}/bar" />
+        <fileset id="foo" file="${dir.a}/foo"/>
+        <fileset id="bar" file="${dir.b}/bar"/>
       </length>
     </au:assertTrue>
   </target>
 
   <target name="testFile" depends="setUp">
-    <length property="length.foo" file="${dir.a}/foo" />
+    <length property="length.foo" file="${dir.a}/foo"/>
     <au:assertTrue>
-      <equals arg1="3" arg2="${length.foo}" />
+      <equals arg1="3" arg2="${length.foo}"/>
     </au:assertTrue>
   </target>
 
   <target name="testFileCondition" depends="setUp">
     <au:assertTrue>
-      <length length="3" file="${dir.a}/foo" />
+      <length length="3" file="${dir.a}/foo"/>
     </au:assertTrue>
   </target>
 
   <target name="testBoth" depends="setUp">
     <length property="length.foo" file="${dir.a}/foo">
-      <fileset file="${dir.b}/bar" />
+      <fileset file="${dir.b}/bar"/>
     </length>
     <au:assertTrue>
-      <equals arg1="6" arg2="${length.foo}" />
+      <equals arg1="6" arg2="${length.foo}"/>
     </au:assertTrue>
   </target>
 
   <target name="testBothCondition" depends="setUp">
     <au:assertTrue>
       <length length="6" file="${dir.a}/foo">
-        <fileset file="${dir.b}/bar" />
+        <fileset file="${dir.b}/bar"/>
       </length>
     </au:assertTrue>
   </target>
 
   <target name="testDupes" depends="setUp">
     <length property="length.foo" file="${dir.a}/foo">
-      <fileset dir="${input}" />
+      <fileset dir="${input}"/>
     </length>
     <au:assertTrue>
-      <equals arg1="9" arg2="${length.foo}" />
+      <equals arg1="9" arg2="${length.foo}"/>
     </au:assertTrue>
   </target>
 
   <target name="testDupesCondition" depends="setUp">
     <au:assertTrue>
       <length length="9" file="${dir.a}/foo">
-        <fileset dir="${input}" />
+        <fileset dir="${input}"/>
       </length>
     </au:assertTrue>
   </target>
 
   <target name="testString">
-    <length string="foo" property="length.string" />
+    <length string="foo" property="length.string"/>
     <au:assertTrue>
-      <equals arg1="3" arg2="${length.string}" />
+      <equals arg1="3" arg2="${length.string}"/>
     </au:assertTrue>
   </target>
 
   <target name="testStringCondition">
     <au:assertTrue>
-      <length string="foo" length="3" />
+      <length string="foo" length="3"/>
     </au:assertTrue>
   </target>
 
   <target name="testTrimString">
-    <length string=" foo " trim="true" property="length.string" />
+    <length string=" foo " trim="true" property="length.string"/>
     <au:assertTrue>
-      <equals arg1="3" arg2="${length.string}" />
+      <equals arg1="3" arg2="${length.string}"/>
     </au:assertTrue>
   </target>
 
   <target name="testTrimStringCondition">
     <au:assertTrue>
-      <length string=" foo " trim="true" length="3" />
+      <length string=" foo " trim="true" length="3"/>
     </au:assertTrue>
   </target>
 
   <target name="testNoTrimString">
-    <length string=" foo " property="length.string" />
+    <length string=" foo " property="length.string"/>
     <au:assertTrue>
-      <equals arg1="5" arg2="${length.string}" />
+      <equals arg1="5" arg2="${length.string}"/>
     </au:assertTrue>
   </target>
 
   <target name="testNoTrimStringCondition">
     <au:assertTrue>
-      <length string=" foo " length="5" />
+      <length string=" foo " length="5"/>
     </au:assertTrue>
   </target>
 
   <target name="testTrimFile" description="should fail">
     <au:expectfailure>
-      <length file="${ant.file}" trim="false" />
+      <length file="${ant.file}" trim="false"/>
     </au:expectfailure>
   </target>
 
   <target name="testStringFile" description="should fail">
     <au:expectfailure>
-      <length string="foo" file="${ant.file}" />
+      <length string="foo" file="${ant.file}"/>
     </au:expectfailure>
   </target>
 
   <target name="testImmutable">
-    <length string="foo" property="length.string" />
-    <length string="foobar" property="length.string" />
+    <length string="foo" property="length.string"/>
+    <length string="foobar" property="length.string"/>
     <au:assertTrue>
-      <equals arg1="3" arg2="${length.string}" />
+      <equals arg1="3" arg2="${length.string}"/>
     </au:assertTrue>
   </target>
 
   <target name="zip" depends="setUp">
     <zip destfile="${zipfile}">
-      <fileset file="${foo}" />
-      <fileset file="${bar}" />
+      <fileset file="${foo}"/>
+      <fileset file="${bar}"/>
     </zip>
   </target>
 
   <target name="testZipFileSet" depends="zip">
     <length property="length.zipfile1">
-      <zipfileset src="${zipfile}" />
+      <zipfileset src="${zipfile}"/>
     </length>
     <length property="length.zipfile2">
-      <zipfileset src="${zipfile}" includes="bar" />
+      <zipfileset src="${zipfile}" includes="bar"/>
     </length>
     <au:assertTrue>
       <and>
-        <equals arg1="6" arg2="${length.zipfile1}" />
-        <equals arg1="3" arg2="${length.zipfile2}" />
+        <equals arg1="6" arg2="${length.zipfile1}"/>
+        <equals arg1="3" arg2="${length.zipfile2}"/>
       </and>
     </au:assertTrue>
   </target>
@@ -221,19 +221,19 @@
     <au:assertTrue>
       <and>
         <length length="6">
-          <zipfileset src="${zipfile}" />
+          <zipfileset src="${zipfile}"/>
         </length>
         <length length="3">
-          <zipfileset src="${zipfile}" includes="bar" />
+          <zipfileset src="${zipfile}" includes="bar"/>
         </length>
       </and>
     </au:assertTrue>
   </target>
 
   <target name="testResourceAttribute">
-    <string id="s" value="foo-bar-baz" />
+    <string id="s" value="foo-bar-baz"/>
     <au:assertTrue>
-      <length length="11" resource="${ant.refid:s}" />
+      <length length="11" resource="${ant.refid:s}"/>
     </au:assertTrue>
   </target>
 
diff --git a/src/tests/antunit/taskdefs/loadproperties-test.xml b/src/tests/antunit/taskdefs/loadproperties-test.xml
index 04b53f11a..bf92f76aa 100644
--- a/src/tests/antunit/taskdefs/loadproperties-test.xml
+++ b/src/tests/antunit/taskdefs/loadproperties-test.xml
@@ -17,11 +17,11 @@
 -->
 <project name="loadproperties-test" default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${input}" />
-    <property name="properties.tmp" location="${input}/properties.tmp" />
+    <mkdir dir="${input}"/>
+    <property name="properties.tmp" location="${input}/properties.tmp"/>
   </target>
 
   <target name="test-basic">
@@ -30,9 +30,9 @@
 basic.bar=bar
 basic.baz=baz</string>
     </loadproperties>
-    <au:assertPropertyEquals name="basic.foo" value="foo" />
-    <au:assertPropertyEquals name="basic.bar" value="bar" />
-    <au:assertPropertyEquals name="basic.baz" value="baz" />
+    <au:assertPropertyEquals name="basic.foo" value="foo"/>
+    <au:assertPropertyEquals name="basic.bar" value="bar"/>
+    <au:assertPropertyEquals name="basic.baz" value="baz"/>
   </target>
 
   <target name="test-xref">
@@ -41,9 +41,9 @@ basic.baz=baz</string>
 xref.bar=$${xref.foo}
 xref.baz=$${xref.bar}</string>
     </loadproperties>
-    <au:assertPropertyEquals name="xref.foo" value="foo" />
-    <au:assertPropertyEquals name="xref.bar" value="foo" />
-    <au:assertPropertyEquals name="xref.baz" value="foo" />
+    <au:assertPropertyEquals name="xref.foo" value="foo"/>
+    <au:assertPropertyEquals name="xref.bar" value="foo"/>
+    <au:assertPropertyEquals name="xref.baz" value="foo"/>
   </target>
 
   <target name="test-xref-complex">
@@ -55,12 +55,12 @@ xref-complex.d=x
 xref-complex.e=$${xref-complex.a}$${xref-complex.b}xref-complex.d$${xref-complex.c}
 xref-complex.f=$${xref-complex.e}</string>
     </loadproperties>
-    <au:assertPropertyEquals name="xref-complex.a" value="$$" />
-    <au:assertPropertyEquals name="xref-complex.b" value="{" />
-    <au:assertPropertyEquals name="xref-complex.c" value="}" />
-    <au:assertPropertyEquals name="xref-complex.d" value="x" />
-    <au:assertPropertyEquals name="xref-complex.e" value="$${xref-complex.d}" />
-    <au:assertPropertyEquals name="xref-complex.f" value="$${xref-complex.d}" />
+    <au:assertPropertyEquals name="xref-complex.a" value="$$"/>
+    <au:assertPropertyEquals name="xref-complex.b" value="{"/>
+    <au:assertPropertyEquals name="xref-complex.c" value="}"/>
+    <au:assertPropertyEquals name="xref-complex.d" value="x"/>
+    <au:assertPropertyEquals name="xref-complex.e" value="$${xref-complex.d}"/>
+    <au:assertPropertyEquals name="xref-complex.f" value="$${xref-complex.d}"/>
   </target>
 
   <target name="testEncoding"
@@ -93,16 +93,16 @@ http.@SERVER@ = ${server}
         <expandproperties/>
       </filterchain>
     </loadproperties>
-    <property name="server1.http.url" 
+    <property name="server1.http.url"
       value="http://${server1.http.server}:${server1.http.port}"/>
   </target>
 
   <target name="testLineCommentsWithoutFiltering">
     <loadproperties>
-      <string value="#foo=bar" />
+      <string value="#foo=bar"/>
     </loadproperties>
     <au:assertFalse>
-      <isset property="foo" />
+      <isset property="foo"/>
     </au:assertFalse>
   </target>
 
@@ -115,9 +115,9 @@ baz=${foo} ${bar}
     </loadproperties>
     <au:assertTrue>
       <and>
-        <equals arg1="foo" arg2="${prefixFromAttribute.foo}" />
-        <equals arg1="bar" arg2="${prefixFromAttribute.bar}" />
-        <equals arg1="foo bar" arg2="${prefixFromAttribute.baz}" />
+        <equals arg1="foo" arg2="${prefixFromAttribute.foo}"/>
+        <equals arg1="bar" arg2="${prefixFromAttribute.bar}"/>
+        <equals arg1="foo bar" arg2="${prefixFromAttribute.baz}"/>
       </and>
     </au:assertTrue>
   </target>
@@ -130,13 +130,13 @@ bar=bar
 baz=${foo} ${bar}
       </string>
       <filterchain>
-        <prefixlines prefix="prefixFromFilter." />
+        <prefixlines prefix="prefixFromFilter."/>
       </filterchain>
     </loadproperties>
     <au:assertTrue>
       <and>
-        <equals arg1="$${foo} $${bar}" arg2="${prefixFromFilter.baz}" />
-        <isset property="prefixFromFilter." />
+        <equals arg1="$${foo} $${bar}" arg2="${prefixFromFilter.baz}"/>
+        <isset property="prefixFromFilter."/>
       </and>
     </au:assertTrue>
   </target>
@@ -153,7 +153,7 @@ tpfr.c=@C@
 
   <presetdef name="assertPropertiesFromResourceOkay">
     <au:assertTrue>
-      <equals arg1="Abesea" arg2="${tpfr.a}${tpfr.b}${tpfr.c}" />
+      <equals arg1="Abesea" arg2="${tpfr.a}${tpfr.b}${tpfr.c}"/>
     </au:assertTrue>
   </presetdef>
 
@@ -169,14 +169,14 @@ tpfr.c=@C@
 
   <target name="testPropertiesFromFileSet" depends="write properties.tmp">
     <loadproperties>
-      <fileset file="${properties.tmp}" />
+      <fileset file="${properties.tmp}"/>
       <filterchain>
         <replacetokens>
           <token key="C" value="sea"/>
         </replacetokens>
       </filterchain>
     </loadproperties>
-    <assertPropertiesFromResourceOkay />
+    <assertPropertiesFromResourceOkay/>
   </target>
 
   <target name="testLastPropertyWins">
@@ -185,7 +185,7 @@ tpfr.c=@C@
 foo=bar</string>
     </loadproperties>
     <au:assertTrue>
-      <equals arg1="bar" arg2="${foo}" />
+      <equals arg1="bar" arg2="${foo}"/>
     </au:assertTrue>
   </target>
 
diff --git a/src/tests/antunit/taskdefs/loadresource-test.xml b/src/tests/antunit/taskdefs/loadresource-test.xml
index 814ded5be..b34efd33f 100644
--- a/src/tests/antunit/taskdefs/loadresource-test.xml
+++ b/src/tests/antunit/taskdefs/loadresource-test.xml
@@ -17,19 +17,19 @@
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="test-resourceString">
     <loadresource property="p">
       <string value="one"/>
-    </loadresource >
+    </loadresource>
     <au:assertPropertyEquals name="p" value="one"/>
   </target>
 
   <target name="test-resourceSizeZero" description="Bug 42319">
     <loadresource property="p">
       <string value=""/>
-    </loadresource >
+    </loadresource>
     <au:assertTrue>
       <not>
         <isset property="p"/>
diff --git a/src/tests/antunit/taskdefs/local-test.xml b/src/tests/antunit/taskdefs/local-test.xml
index 9c4e7b7e4..2b07a8d5c 100644
--- a/src/tests/antunit/taskdefs/local-test.xml
+++ b/src/tests/antunit/taskdefs/local-test.xml
@@ -16,81 +16,81 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
-  <property name="foo" value="foo" />
+  <property name="foo" value="foo"/>
 
-  <local name="bar" />
-  <property name="bar" value="bar" />
-  <au:assertPropertyEquals name="bar" value="bar" />
+  <local name="bar"/>
+  <property name="bar" value="bar"/>
+  <au:assertPropertyEquals name="bar" value="bar"/>
 
   <target name="testGlobalLocal">
     <au:assertFalse>
-      <isset property="bar" />
+      <isset property="bar"/>
     </au:assertFalse>
   </target>
 
   <target name="testBaseline">
-    <au:assertPropertyEquals name="foo" value="foo" />
+    <au:assertPropertyEquals name="foo" value="foo"/>
   </target>
 
   <target name="testTarget">
-    <au:assertPropertyEquals name="foo" value="foo" />
-    <local name="foo" />
-    <property name="foo" value="foo.target" />
-    <au:assertPropertyEquals name="foo" value="foo.target" />
+    <au:assertPropertyEquals name="foo" value="foo"/>
+    <local name="foo"/>
+    <property name="foo" value="foo.target"/>
+    <au:assertPropertyEquals name="foo" value="foo.target"/>
   </target>
 
   <target name="testSequential">
     <sequential>
-      <local name="foo" />
-      <property name="foo" value="foo.1" />
+      <local name="foo"/>
+      <property name="foo" value="foo.1"/>
       <sequential>
-        <local name="foo" />
-        <property name="foo" value="foo.2" />
-        <au:assertPropertyEquals name="foo" value="foo.2" />
+        <local name="foo"/>
+        <property name="foo" value="foo.2"/>
+        <au:assertPropertyEquals name="foo" value="foo.2"/>
       </sequential>
-      <au:assertPropertyEquals name="foo" value="foo.1" />
+      <au:assertPropertyEquals name="foo" value="foo.1"/>
     </sequential>
-    <au:assertPropertyEquals name="foo" value="foo" />
+    <au:assertPropertyEquals name="foo" value="foo"/>
   </target>
 
   <target name="testParallel">
     <macrodef name="p">
-      <attribute name="value" />
-      <attribute name="sleep" default="0" />
+      <attribute name="value"/>
+      <attribute name="sleep" default="0"/>
       <sequential>
-        <local name="foo" />
-        <sleep seconds="@{sleep}" />
-        <property name="foo" value="@{value}" />
-        <au:assertPropertyEquals name="foo" value="@{value}" />
+        <local name="foo"/>
+        <sleep seconds="@{sleep}"/>
+        <property name="foo" value="@{value}"/>
+        <au:assertPropertyEquals name="foo" value="@{value}"/>
       </sequential>
     </macrodef>
     <parallel>
-      <p sleep="2" value="foo.a" />
-      <au:assertPropertyEquals name="foo" value="foo" />
-      <p sleep="1" value="foo.b" />
-      <au:assertPropertyEquals name="foo" value="foo" />
-      <p sleep="0" value="foo.c" />
-      <au:assertPropertyEquals name="foo" value="foo" />
+      <p sleep="2" value="foo.a"/>
+      <au:assertPropertyEquals name="foo" value="foo"/>
+      <p sleep="1" value="foo.b"/>
+      <au:assertPropertyEquals name="foo" value="foo"/>
+      <p sleep="0" value="foo.c"/>
+      <au:assertPropertyEquals name="foo" value="foo"/>
     </parallel>
-    <au:assertPropertyEquals name="foo" value="foo" />
+    <au:assertPropertyEquals name="foo" value="foo"/>
   </target>
 
   <target name="testMacrodef">
     <macrodef name="m">
       <sequential>
-        <local name="foo" />
-        <property name="foo" value="foo.x" />
-        <au:assertPropertyEquals name="foo" value="foo.x" />
+        <local name="foo"/>
+        <property name="foo" value="foo.x"/>
+        <au:assertPropertyEquals name="foo" value="foo.x"/>
       </sequential>
     </macrodef>
-    <m />
-    <au:assertPropertyEquals name="foo" value="foo" />
-    <m />
-    <au:assertPropertyEquals name="foo" value="foo" />
-    <m />
-    <au:assertPropertyEquals name="foo" value="foo" />
+    <m/>
+    <au:assertPropertyEquals name="foo" value="foo"/>
+    <m/>
+    <au:assertPropertyEquals name="foo" value="foo"/>
+    <m/>
+    <au:assertPropertyEquals name="foo" value="foo"/>
   </target>
 
 </project>
diff --git a/src/tests/antunit/taskdefs/macrodef-test.xml b/src/tests/antunit/taskdefs/macrodef-test.xml
index b12e6f75c..af6b87c18 100644
--- a/src/tests/antunit/taskdefs/macrodef-test.xml
+++ b/src/tests/antunit/taskdefs/macrodef-test.xml
@@ -18,7 +18,7 @@
 <project name="length-test" default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="testDefaultTest">
     <macrodef name="test-log">
diff --git a/src/tests/antunit/taskdefs/manifest-test.xml b/src/tests/antunit/taskdefs/manifest-test.xml
index 4247ef2d7..5b682f3b1 100644
--- a/src/tests/antunit/taskdefs/manifest-test.xml
+++ b/src/tests/antunit/taskdefs/manifest-test.xml
@@ -18,7 +18,7 @@
 <project default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${output}"/>
@@ -150,18 +150,18 @@ public class AntFail {
         }
     }
 ]]></echo>
-    <javac srcdir="${input}" destdir="${output}/bin" includeantruntime="no" />
+    <javac srcdir="${input}" destdir="${output}/bin" includeantruntime="no"/>
   </target>
 
   <target name="testJava5JarProblemManifestInSeparateTask"
           depends="-prepareJava5JarTest"
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=54762">
     <manifest file="${output}/MANIFEST.MF">
-      <attribute name="Main-Class" value="org.example.AntFail" />
+      <attribute name="Main-Class" value="org.example.AntFail"/>
     </manifest>
-    
+
     <jar manifest="${output}/MANIFEST.MF" destfile="${output}/antfail.jar"
-         basedir="${output}/bin" />
+         basedir="${output}/bin"/>
     <java jar="${output}/antfail.jar" fork="true" failonerror="true"/>
   </target>
 
@@ -172,7 +172,7 @@ public class AntFail {
     <jar destfile="${output}/antfail.jar"
          basedir="${output}/bin">
       <manifest>
-        <attribute name="Main-Class" value="org.example.AntFail" />
+        <attribute name="Main-Class" value="org.example.AntFail"/>
       </manifest>
     </jar>
     <java jar="${output}/antfail.jar" fork="true" failonerror="true"/>
diff --git a/src/tests/antunit/taskdefs/manifestclasspath-test.xml b/src/tests/antunit/taskdefs/manifestclasspath-test.xml
index 612990b61..cbc06a950 100644
--- a/src/tests/antunit/taskdefs/manifestclasspath-test.xml
+++ b/src/tests/antunit/taskdefs/manifestclasspath-test.xml
@@ -18,7 +18,7 @@
 <project default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="testRelativePathOfParentDir">
     <manifestclasspath property="jar.classpath"
diff --git a/src/tests/antunit/taskdefs/move-test.xml b/src/tests/antunit/taskdefs/move-test.xml
index 3584f9b08..4dcf3628a 100644
--- a/src/tests/antunit/taskdefs/move-test.xml
+++ b/src/tests/antunit/taskdefs/move-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="test-move-caseonly">
     <!-- this test is inspired by bugzilla 41948 -->
@@ -60,8 +60,7 @@
   </target>
 
   <target name="testNotModifiedSelector"
-          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574"
-          >
+          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574">
     <mkdir dir="${input}/images"/>
     <mkdir dir="${input}/cache"/>
     <touch file="${input}/images/foo.jpg"/>
@@ -82,8 +81,8 @@
     <au:assertFileDoesntExist file="${input}/cache/cache.properties"/>
     <move todir="${output}" overwrite="true">
       <fileset dir="${input}/images">
-        <include name="*.jpg" />
-        <selector refid="cache.selector" />
+        <include name="*.jpg"/>
+        <selector refid="cache.selector"/>
       </fileset>
     </move>
     <au:assertFileExists file="${input}/cache/cache.properties"/>
@@ -91,8 +90,8 @@
     <au:assertFileDoesntExist file="${output}/foo.jpg"/>
     <move todir="${output}" overwrite="true">
       <fileset dir="${input}/images">
-        <include name="*.jpg" />
-        <selector refid="cache.selector" />
+        <include name="*.jpg"/>
+        <selector refid="cache.selector"/>
       </fileset>
     </move>
     <au:assertFileDoesntExist file="${input}/images/foo.jpg"/>
diff --git a/src/tests/antunit/taskdefs/optional/cab.xml b/src/tests/antunit/taskdefs/optional/cab.xml
index 49091074a..a5a2ac298 100644
--- a/src/tests/antunit/taskdefs/optional/cab.xml
+++ b/src/tests/antunit/taskdefs/optional/cab.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <target name="testBasedirOrFilesetRequired">
     <au:expectfailure message="must specify basedir or fileset"
diff --git a/src/tests/antunit/taskdefs/optional/depend/depend-test.xml b/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
index 48f94aa36..3abbca5f2 100644
--- a/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
+++ b/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../../../antunit-base.xml" />
+  <import file="../../../antunit-base.xml"/>
 
   <property name="src1" location="${input}/src1"/>
   <property name="src2" location="${input}/src2"/>
@@ -59,8 +59,8 @@ public class Main {
 
     <!--to ensure that the classfiles generated in the previous step
         will be outdated-->
-    <sleep seconds="3" />
-    <touch file="${src1}/a/B.java" />
+    <sleep seconds="3"/>
+    <touch file="${src1}/a/B.java"/>
     <javac srcdir="${src1}" destdir="${output}"/>
     <jar destfile="${output}/A.jar" basedir="${output}" includes="a/**"/>
     <delete dir="${output}/a"/>
@@ -93,8 +93,8 @@ public class Main {
 
     <javac srcdir="${src1}" destdir="${resources}"/>
     <javac srcdir="${src2}" destdir="${dest2}" classpath="${resources}"/>
-    <sleep seconds="3" />
-    <touch file="${src1}/a/B.java" />
+    <sleep seconds="3"/>
+    <touch file="${src1}/a/B.java"/>
     <javac srcdir="${src1}" destdir="${resources}"/>
     <au:assertFileExists file="${dest2}/b/Main.class"/>
   </target>
@@ -109,8 +109,7 @@ public class Main {
 
     <depend srcDir="${src2}"
             destDir="${dest2}" cache="${output}"
-            classpathref="resources-id"
-            />
+            classpathref="resources-id"/>
     <au:assertFileDoesntExist file="${dest2}/b/Main.class"/>
 
   </target>
@@ -123,8 +122,7 @@ public class Main {
 
     <depend srcDir="${src2}"
             destDir="${dest2}" cache="${output}"
-            classpathref="resources-id"
-            />
+            classpathref="resources-id"/>
     <au:assertFileDoesntExist file="${dest2}/b/Main.class"/>
 
   </target>
diff --git a/src/tests/antunit/taskdefs/optional/funtest-test.xml b/src/tests/antunit/taskdefs/optional/funtest-test.xml
index 6baa4f7e2..6656e443c 100644
--- a/src/tests/antunit/taskdefs/optional/funtest-test.xml
+++ b/src/tests/antunit/taskdefs/optional/funtest-test.xml
@@ -100,7 +100,7 @@
   </target>
 
   <target name="testCondition">
-    <funtest >
+    <funtest>
       <condition>
          <isset property="unset"/>
       </condition>
diff --git a/src/tests/antunit/taskdefs/optional/javah-test.xml b/src/tests/antunit/taskdefs/optional/javah-test.xml
index 82d91c8f6..41ed9a397 100644
--- a/src/tests/antunit/taskdefs/optional/javah-test.xml
+++ b/src/tests/antunit/taskdefs/optional/javah-test.xml
@@ -16,10 +16,10 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <target name="-create-javah-adapter">
-    <mkdir dir="${input}/org/example" />
+    <mkdir dir="${input}/org/example"/>
     <echo file="${input}/org/example/Adapter.java">
       <![CDATA[
 package org.example;
@@ -33,34 +33,34 @@ public class Adapter implements JavahAdapter {
     }
 }]]>
     </echo>
-    <mkdir dir="${resources}" />
-    <javac srcdir="${input}" destdir="${resources}" />
+    <mkdir dir="${resources}"/>
+    <javac srcdir="${input}" destdir="${resources}"/>
   </target>
 
   <target name="testAdapterNotFound" depends="-create-javah-adapter">
     <au:expectfailure>
-      <javah class="org.example.Adapter" destdir="${output}" implementation="org.example.Adapter" />
+      <javah class="org.example.Adapter" destdir="${output}" implementation="org.example.Adapter"/>
     </au:expectfailure>
-    <au:assertLogDoesntContain text="adapter called" />
+    <au:assertLogDoesntContain text="adapter called"/>
   </target>
 
   <target name="testImplementationClasspath" depends="-create-javah-adapter" description="https://issues.apache.org/bugzilla/show_bug.cgi?id=11143">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
     <javah class="org.example.Adapter" destdir="${output}" implementation="org.example.Adapter">
-      <implementationclasspath location="${resources}" />
+      <implementationclasspath location="${resources}"/>
     </javah>
-    <au:assertLogContains text="adapter called" />
+    <au:assertLogContains text="adapter called"/>
   </target>
 
   <target name="testImplementationAsNestedElement" depends="-create-javah-adapter">
     <componentdef classname="org.example.Adapter" name="myjavac">
-      <classpath location="${resources}" />
+      <classpath location="${resources}"/>
     </componentdef>
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
     <javah class="org.example.Adapter" destdir="${output}">
-      <myjavac />
+      <myjavac/>
     </javah>
-    <au:assertLogContains text="adapter called" />
+    <au:assertLogContains text="adapter called"/>
   </target>
 
   <target name="-setupForRealJavahTests">
diff --git a/src/tests/antunit/taskdefs/optional/junit/junit-formatter-test.xml b/src/tests/antunit/taskdefs/optional/junit/junit-formatter-test.xml
index b9a63c949..974777842 100644
--- a/src/tests/antunit/taskdefs/optional/junit/junit-formatter-test.xml
+++ b/src/tests/antunit/taskdefs/optional/junit/junit-formatter-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../../../antunit-base.xml" />
+  <import file="../../../antunit-base.xml"/>
 
   <path id="junit">
     <fileset dir="../../../../../../lib/optional" includes="junit*"/>
@@ -43,7 +43,7 @@ public class ATest extends TestCase {
           <classpath location="${output}"/>
           <batchtest todir="${output}">
             <fileset dir="${output}">
-              <include name="**/*Test.class" />
+              <include name="**/*Test.class"/>
             </fileset>
           </batchtest>
           <formatter type="plain" if="${if}" extension=".dollar_if"/>
diff --git a/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml b/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
index c84ae49aa..8a4266545 100644
--- a/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
+++ b/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="all" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../../../antunit-base.xml" />
+  <import file="../../../antunit-base.xml"/>
   <property name="ant-build" location="../../../../../../build"/>
   <property name="build-junit-dir" location="${ant-build}/antunit/junit-dir"/>
   <property name="reports.dir" location="${build-junit-dir}/report"/>
@@ -43,7 +43,7 @@
 
   <macrodef name="assert-log-not-contains" backtrace="no">
     <sequential>
-      <au:assertLogDoesntContain text="Hello From Test" />
+      <au:assertLogDoesntContain text="Hello From Test"/>
     </sequential>
   </macrodef>
 
@@ -60,7 +60,7 @@
     <sequential>
       <junit fork="@{fork}" haltonfailure="no" showoutput="@{showoutput}"
            outputtoformatters="@{outputtoformatters}">
-        <test name="ExampleTest" todir="${reports.dir}"/> 
+        <test name="ExampleTest" todir="${reports.dir}"/>
         <classpath path="${resources}"/>
         <formatter type="plain" usefile="yes"/>
       </junit>
@@ -72,7 +72,7 @@
     <mkdir  dir="${resources}"/>
     <mkdir  dir="${reports.dir}"/>
   </target>
-    
+
   <target name="compile" depends="init">
     <javac srcdir="src" destdir="${resources}" debug="yes"/>
   </target>
@@ -134,4 +134,3 @@
   </target>
 
 </project>
-
diff --git a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
index d93b96e49..33eb60272 100644
--- a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
+++ b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
@@ -16,16 +16,16 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../../../antunit-base.xml" />
+  <import file="../../../antunit-base.xml"/>
 
   <path id="junit">
-    <fileset dir="../../../../../../lib/optional" includes="junit*" />
-    <fileset dir="../../../../../../lib/optional" includes="hamcrest-core*" />
+    <fileset dir="../../../../../../lib/optional" includes="junit*"/>
+    <fileset dir="../../../../../../lib/optional" includes="hamcrest-core*"/>
   </path>
 
   <macrodef name="empty-test">
-    <attribute name="classname" />
-    <attribute name="package" default="test" />
+    <attribute name="classname"/>
+    <attribute name="package" default="test"/>
     <sequential>
       <echo file="${input}/@{classname}.java">
         <![CDATA[
@@ -41,14 +41,14 @@ public class @{classname} extends TestCase {
   </macrodef>
 
   <target name="setUp">
-    <mkdir dir="${input}" />
-    <mkdir dir="${output}" />
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}"/>
   </target>
 
   <target name="testTimeoutLogOfBatchTests">
-    <mkdir dir="${input}" />
-    <mkdir dir="${output}" />
-    <empty-test classname="ATest" package="org.apache.ant.test" />
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}"/>
+    <empty-test classname="ATest" package="org.apache.ant.test"/>
     <echo file="${input}/BTest.java">
       <![CDATA[
 package org.apache.ant.test;
@@ -61,30 +61,30 @@ public class BTest extends TestCase {
 }
 ]]>
     </echo>
-    <empty-test classname="CTest" package="org.apache.ant.test" />
-    <empty-test classname="DTest" package="org.apache.ant.test" />
+    <empty-test classname="CTest" package="org.apache.ant.test"/>
+    <empty-test classname="DTest" package="org.apache.ant.test"/>
     <javac srcdir="${input}" destdir="${output}">
-      <classpath refid="junit" />
+      <classpath refid="junit"/>
     </javac>
     <junit fork="true" forkMode="perBatch" timeout="5000" printsummary="yes">
-      <classpath refid="junit" />
-      <classpath location="${output}" />
+      <classpath refid="junit"/>
+      <classpath location="${output}"/>
       <batchtest>
         <fileset dir="${output}">
-          <include name="**/*Test.class" />
+          <include name="**/*Test.class"/>
         </fileset>
       </batchtest>
     </junit>
-    <au:assertLogContains text="ATest" />
-    <au:assertLogContains text="BTest" />
-    <au:assertLogContains text="org.apache.ant.test.Batch-With-Multiple-Tests" />
-    <au:assertLogDoesntContain text="CTest" />
-    <au:assertLogDoesntContain text="DTest" />
+    <au:assertLogContains text="ATest"/>
+    <au:assertLogContains text="BTest"/>
+    <au:assertLogContains text="org.apache.ant.test.Batch-With-Multiple-Tests"/>
+    <au:assertLogDoesntContain text="CTest"/>
+    <au:assertLogDoesntContain text="DTest"/>
   </target>
 
   <target name="testFailurePropertyOnTestCase">
-    <mkdir dir="${input}" />
-    <mkdir dir="${output}" />
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}"/>
     <echo file="${input}/ATest.java">
       <![CDATA[
 package test;
@@ -98,23 +98,23 @@ public class ATest extends TestCase {
 ]]>
     </echo>
     <javac srcdir="${input}" destdir="${output}">
-      <classpath refid="junit" />
+      <classpath refid="junit"/>
     </javac>
     <junit failureProperty="testcase.failed" haltonfailure="false">
-      <classpath refid="junit" />
-      <classpath location="${output}" />
+      <classpath refid="junit"/>
+      <classpath location="${output}"/>
       <batchtest>
         <fileset dir="${output}">
-          <include name="**/*Test.class" />
+          <include name="**/*Test.class"/>
         </fileset>
       </batchtest>
     </junit>
-    <au:assertPropertySet name="testcase.failed" />
+    <au:assertPropertySet name="testcase.failed"/>
   </target>
 
   <target name="testFailurePropertyOnTestSuite">
-    <mkdir dir="${input}" />
-    <mkdir dir="${output}" />
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}"/>
     <echo file="${input}/ATest.java">
       <![CDATA[
 package test;
@@ -132,44 +132,44 @@ public class ATest extends TestSuite {
 ]]>
     </echo>
     <javac srcdir="${input}" destdir="${output}">
-      <classpath refid="junit" />
+      <classpath refid="junit"/>
     </javac>
     <junit failureProperty="testsuite.failed" haltonfailure="false">
-      <classpath refid="junit" />
-      <classpath location="${output}" />
+      <classpath refid="junit"/>
+      <classpath location="${output}"/>
       <batchtest>
         <fileset dir="${output}">
-          <include name="**/*Test.class" />
+          <include name="**/*Test.class"/>
         </fileset>
       </batchtest>
     </junit>
-    <au:assertPropertySet name="testsuite.failed" />
+    <au:assertPropertySet name="testsuite.failed"/>
   </target>
 
   <target name="testTimeoutAndFormattersForkPerTest">
     <antcall target="runTimeoutAndFormattersTest">
-      <param name="forkMode" value="perTest" />
+      <param name="forkMode" value="perTest"/>
     </antcall>
-    <au:assertFileExists file="${output}/TEST-test.CTest.txt" />
-    <au:assertFileExists file="${output}/TEST-test.CTest.xml" />
-    <au:assertFileExists file="${output}/TEST-test.DTest.txt" />
-    <au:assertFileExists file="${output}/TEST-test.DTest.xml" />
+    <au:assertFileExists file="${output}/TEST-test.CTest.txt"/>
+    <au:assertFileExists file="${output}/TEST-test.CTest.xml"/>
+    <au:assertFileExists file="${output}/TEST-test.DTest.txt"/>
+    <au:assertFileExists file="${output}/TEST-test.DTest.xml"/>
   </target>
 
   <target name="testTimeoutAndFormattersForkOnce">
     <antcall target="runTimeoutAndFormattersTest">
-      <param name="forkMode" value="once" />
+      <param name="forkMode" value="once"/>
     </antcall>
-    <au:assertFileDoesntExist file="${output}/TEST-test.CTest.txt" />
-    <au:assertFileDoesntExist file="${output}/TEST-test.CTest.xml" />
-    <au:assertFileDoesntExist file="${output}/TEST-test.DTest.txt" />
-    <au:assertFileDoesntExist file="${output}/TEST-test.DTest.xml" />
+    <au:assertFileDoesntExist file="${output}/TEST-test.CTest.txt"/>
+    <au:assertFileDoesntExist file="${output}/TEST-test.CTest.xml"/>
+    <au:assertFileDoesntExist file="${output}/TEST-test.DTest.txt"/>
+    <au:assertFileDoesntExist file="${output}/TEST-test.DTest.xml"/>
   </target>
 
   <target name="runTimeoutAndFormattersTest" description="https://issues.apache.org/bugzilla/show_bug.cgi?id=35634">
-    <mkdir dir="${input}" />
-    <mkdir dir="${output}" />
-    <empty-test classname="ATest" />
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}"/>
+    <empty-test classname="ATest"/>
     <echo file="${input}/BTest.java">
       <![CDATA[
 package test;
@@ -182,27 +182,27 @@ public class BTest extends TestCase {
 }
 ]]>
     </echo>
-    <empty-test classname="CTest" />
-    <empty-test classname="DTest" />
+    <empty-test classname="CTest"/>
+    <empty-test classname="DTest"/>
     <javac srcdir="${input}" destdir="${output}">
-      <classpath refid="junit" />
+      <classpath refid="junit"/>
     </javac>
     <junit fork="true" timeout="5000" forkmode="${forkMode}">
-      <classpath refid="junit" />
-      <classpath location="${output}" />
+      <classpath refid="junit"/>
+      <classpath location="${output}"/>
       <batchtest todir="${output}">
         <fileset dir="${output}">
-          <include name="**/*Test.class" />
+          <include name="**/*Test.class"/>
         </fileset>
       </batchtest>
-      <formatter type="brief" />
-      <formatter type="xml" />
+      <formatter type="brief"/>
+      <formatter type="xml"/>
     </junit>
-    <au:assertFileExists file="${output}/TEST-test.ATest.txt" />
-    <au:assertFileExists file="${output}/TEST-test.ATest.xml" />
+    <au:assertFileExists file="${output}/TEST-test.ATest.txt"/>
+    <au:assertFileExists file="${output}/TEST-test.ATest.xml"/>
    <!--
-    <au:assertFileExists file="${output}/TEST-test.BTest.txt" />
-    <au:assertFileExists file="${output}/TEST-test.BTest.xml" />
+    <au:assertFileExists file="${output}/TEST-test.BTest.txt"/>
+    <au:assertFileExists file="${output}/TEST-test.BTest.xml"/>
 
     These files should only exist if something was written to the log by te runner.
     The test previously passed even though the files were empty, which isn't a meaningful result.
@@ -211,44 +211,44 @@ public class BTest extends TestCase {
   </target>
 
   <target name="-ifUnlessSetup" depends="setUp">
-    <empty-test classname="ATest" />
-    <empty-test classname="BTest" />
-    <empty-test classname="CTest" />
-    <empty-test classname="DTest" />
-    <empty-test classname="ETest" />
-    <empty-test classname="FTest" />
-    <empty-test classname="GTest" />
-    <empty-test classname="HTest" />
+    <empty-test classname="ATest"/>
+    <empty-test classname="BTest"/>
+    <empty-test classname="CTest"/>
+    <empty-test classname="DTest"/>
+    <empty-test classname="ETest"/>
+    <empty-test classname="FTest"/>
+    <empty-test classname="GTest"/>
+    <empty-test classname="HTest"/>
     <javac srcdir="${input}" destdir="${output}">
-      <classpath refid="junit" />
+      <classpath refid="junit"/>
     </javac>
     <macrodef name="j">
       <sequential>
         <junit fork="true" forkMode="perBatch" printsummary="yes">
-          <classpath refid="junit" />
-          <classpath location="${output}" />
-          <test name="test.ATest" if="${if}" />
-          <test name="test.BTest" if="if" />
-          <test name="test.CTest" unless="${if}" />
-          <test name="test.DTest" unless="if" />
+          <classpath refid="junit"/>
+          <classpath location="${output}"/>
+          <test name="test.ATest" if="${if}"/>
+          <test name="test.BTest" if="if"/>
+          <test name="test.CTest" unless="${if}"/>
+          <test name="test.DTest" unless="if"/>
           <batchtest if="${if}">
             <fileset dir="${output}">
-              <include name="**/ETest.class" />
+              <include name="**/ETest.class"/>
             </fileset>
           </batchtest>
           <batchtest if="if">
             <fileset dir="${output}">
-              <include name="**/FTest.class" />
+              <include name="**/FTest.class"/>
             </fileset>
           </batchtest>
           <batchtest unless="${if}">
             <fileset dir="${output}">
-              <include name="**/GTest.class" />
+              <include name="**/GTest.class"/>
             </fileset>
           </batchtest>
           <batchtest unless="if">
             <fileset dir="${output}">
-              <include name="**/HTest.class" />
+              <include name="**/HTest.class"/>
             </fileset>
           </batchtest>
         </junit>
@@ -257,61 +257,61 @@ public class BTest extends TestCase {
   </target>
 
   <target name="testPropertiesNotSet" depends="-ifUnlessSetup">
-    <j />
-    <au:assertLogDoesntContain text="Running test.ATest" />
-    <au:assertLogDoesntContain text="Running test.BTest" />
-    <au:assertLogContains text="Running test.CTest" />
-    <au:assertLogContains text="Running test.DTest" />
-    <au:assertLogDoesntContain text="Running test.ETest" />
-    <au:assertLogDoesntContain text="Running test.FTest" />
-    <au:assertLogContains text="Running test.GTest" />
-    <au:assertLogContains text="Running test.HTest" />
+    <j/>
+    <au:assertLogDoesntContain text="Running test.ATest"/>
+    <au:assertLogDoesntContain text="Running test.BTest"/>
+    <au:assertLogContains text="Running test.CTest"/>
+    <au:assertLogContains text="Running test.DTest"/>
+    <au:assertLogDoesntContain text="Running test.ETest"/>
+    <au:assertLogDoesntContain text="Running test.FTest"/>
+    <au:assertLogContains text="Running test.GTest"/>
+    <au:assertLogContains text="Running test.HTest"/>
   </target>
 
   <target name="testPropertiesSet" depends="-ifUnlessSetup">
-    <property name="if" value="whatever" />
-    <j />
-    <au:assertLogDoesntContain text="Running test.ATest" />
-    <au:assertLogContains text="Running test.BTest" />
-    <au:assertLogContains text="Running test.CTest" />
-    <au:assertLogDoesntContain text="Running test.DTest" />
-    <au:assertLogDoesntContain text="Running test.ETest" />
-    <au:assertLogContains text="Running test.FTest" />
-    <au:assertLogContains text="Running test.GTest" />
-    <au:assertLogDoesntContain text="Running test.HTest" />
+    <property name="if" value="whatever"/>
+    <j/>
+    <au:assertLogDoesntContain text="Running test.ATest"/>
+    <au:assertLogContains text="Running test.BTest"/>
+    <au:assertLogContains text="Running test.CTest"/>
+    <au:assertLogDoesntContain text="Running test.DTest"/>
+    <au:assertLogDoesntContain text="Running test.ETest"/>
+    <au:assertLogContains text="Running test.FTest"/>
+    <au:assertLogContains text="Running test.GTest"/>
+    <au:assertLogDoesntContain text="Running test.HTest"/>
   </target>
 
   <target name="testPropertiesTrue" depends="-ifUnlessSetup">
-    <property name="if" value="true" />
-    <j />
-    <au:assertLogContains text="Running test.ATest" />
-    <au:assertLogContains text="Running test.BTest" />
-    <au:assertLogDoesntContain text="Running test.CTest" />
-    <au:assertLogDoesntContain text="Running test.DTest" />
-    <au:assertLogContains text="Running test.ETest" />
-    <au:assertLogContains text="Running test.FTest" />
-    <au:assertLogDoesntContain text="Running test.GTest" />
-    <au:assertLogDoesntContain text="Running test.HTest" />
+    <property name="if" value="true"/>
+    <j/>
+    <au:assertLogContains text="Running test.ATest"/>
+    <au:assertLogContains text="Running test.BTest"/>
+    <au:assertLogDoesntContain text="Running test.CTest"/>
+    <au:assertLogDoesntContain text="Running test.DTest"/>
+    <au:assertLogContains text="Running test.ETest"/>
+    <au:assertLogContains text="Running test.FTest"/>
+    <au:assertLogDoesntContain text="Running test.GTest"/>
+    <au:assertLogDoesntContain text="Running test.HTest"/>
   </target>
 
   <target name="testPropertiesFalse" depends="-ifUnlessSetup">
-    <property name="if" value="false" />
-    <j />
-    <au:assertLogDoesntContain text="Running test.ATest" />
-    <au:assertLogContains text="Running test.BTest" />
-    <au:assertLogContains text="Running test.CTest" />
-    <au:assertLogDoesntContain text="Running test.DTest" />
-    <au:assertLogDoesntContain text="Running test.ETest" />
-    <au:assertLogContains text="Running test.FTest" />
-    <au:assertLogContains text="Running test.GTest" />
-    <au:assertLogDoesntContain text="Running test.HTest" />
+    <property name="if" value="false"/>
+    <j/>
+    <au:assertLogDoesntContain text="Running test.ATest"/>
+    <au:assertLogContains text="Running test.BTest"/>
+    <au:assertLogContains text="Running test.CTest"/>
+    <au:assertLogDoesntContain text="Running test.DTest"/>
+    <au:assertLogDoesntContain text="Running test.ETest"/>
+    <au:assertLogContains text="Running test.FTest"/>
+    <au:assertLogContains text="Running test.GTest"/>
+    <au:assertLogDoesntContain text="Running test.HTest"/>
   </target>
 
   <target name="testMissingTestName">
-    <property name="test.name" value="null" />
+    <property name="test.name" value="null"/>
     <au:expectfailure message="test name must be specified">
       <junit fork="false">
-        <test name="${test.name}" />
+        <test name="${test.name}"/>
       </junit>
     </au:expectfailure>
   </target>
@@ -326,42 +326,42 @@ public class BTest extends TestCase {
     <echo file="${input}/T2.java">
 		    import org.junit.Test;
 		    public class T2 {
-			@Test 
+			@Test
 			public void ok() {}
-			@Test 
+			@Test
 			public void bad() {
 			throw new RuntimeException("failed");}
 			}</echo>
     <javac srcdir="${input}" destdir="${output}" includes="T1.java,T2.java" source="${source}" includeantruntime="false">
       <classpath>
-        <path refid="junit" />
+        <path refid="junit"/>
       </classpath>
     </javac>
     <junit fork="true" printsummary="true" haltonerror="true">
       <classpath>
-        <pathelement location="${output}" />
-        <path refid="junit" />
+        <pathelement location="${output}"/>
+        <path refid="junit"/>
       </classpath>
-      <test name="T1" methods="testOK" />
-      <test name="T2" methods="ok" />
+      <test name="T1" methods="testOK"/>
+      <test name="T2" methods="ok"/>
     </junit>
   </target>
 
   <target name="testClasspathBuildingSurvivesNonZips" depends="setUp"
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=53964">
-    <empty-test classname="ATest" package="org.apache.ant.test" />
+    <empty-test classname="ATest" package="org.apache.ant.test"/>
     <javac srcdir="${input}" destdir="${output}">
-      <classpath refid="junit" />
+      <classpath refid="junit"/>
     </javac>
     <junit fork="true" printsummary="true" haltonerror="true">
       <classpath>
-        <pathelement location="${output}" />
-        <pathelement location="${ant.file}" />
-        <path refid="junit" />
+        <pathelement location="${output}"/>
+        <pathelement location="${ant.file}"/>
+        <path refid="junit"/>
       </classpath>
       <batchtest>
         <fileset dir="${output}">
-          <include name="**/*Test.class" />
+          <include name="**/*Test.class"/>
         </fileset>
       </batchtest>
     </junit>
diff --git a/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml b/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
index 4aa6e4dad..65b23b194 100644
--- a/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
+++ b/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
@@ -42,7 +42,7 @@ public class A extends TestCase {
       <classpath location="${output}"/>
       <batchtest todir="${output}">
         <fileset dir="${output}">
-          <include name="**/A.class" />
+          <include name="**/A.class"/>
         </fileset>
       </batchtest>
       <formatter type="xml"/>
@@ -72,7 +72,7 @@ public class A extends TestCase {
       <classpath location="${output}"/>
       <batchtest todir="${output}">
         <fileset dir="${output}">
-          <include name="**/A.class" />
+          <include name="**/A.class"/>
         </fileset>
       </batchtest>
       <formatter type="xml"/>
@@ -110,7 +110,7 @@ public class A extends TestCase {
       <classpath location="${output}"/>
       <batchtest todir="${output}">
         <fileset dir="${output}">
-          <include name="**/A.class" />
+          <include name="**/A.class"/>
         </fileset>
       </batchtest>
       <formatter type="xml"/>
diff --git a/src/tests/antunit/taskdefs/optional/native2ascii-test.xml b/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
index 8eff37c66..7ca7892f5 100644
--- a/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
+++ b/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <target name="tearDown" depends="antunit-base.tearDown"
           if="n2a.tmp">
@@ -42,7 +42,7 @@ public class Adapter implements Native2AsciiAdapter {
   </target>
 
   <target name="testAdapterNotFound" depends="-create-native2ascii-adapter" unless="build.sysclasspath.only">
-    <!-- under gump the failure will not happen because the ${resources} directory is systematically on the classpath 
+    <!-- under gump the failure will not happen because the ${resources} directory is systematically on the classpath
          what would be cool would be a task which removes a path element from the classpath. Do we have that ? -->
     <au:expectfailure>
       <native2ascii src="${input}" dest="${output}" includes="**/*.java"
diff --git a/src/tests/antunit/taskdefs/optional/propertyfile-test.xml b/src/tests/antunit/taskdefs/optional/propertyfile-test.xml
index 0ea70513b..1a25d03f9 100644
--- a/src/tests/antunit/taskdefs/optional/propertyfile-test.xml
+++ b/src/tests/antunit/taskdefs/optional/propertyfile-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${output}"/>
diff --git a/src/tests/antunit/taskdefs/optional/propertyfilelayout-test.xml b/src/tests/antunit/taskdefs/optional/propertyfilelayout-test.xml
index f1b367f97..17d85415b 100644
--- a/src/tests/antunit/taskdefs/optional/propertyfilelayout-test.xml
+++ b/src/tests/antunit/taskdefs/optional/propertyfilelayout-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${input}"/>
diff --git a/src/tests/antunit/taskdefs/optional/replaceregexp-test.xml b/src/tests/antunit/taskdefs/optional/replaceregexp-test.xml
index 2d64ce7a9..dd355cecd 100644
--- a/src/tests/antunit/taskdefs/optional/replaceregexp-test.xml
+++ b/src/tests/antunit/taskdefs/optional/replaceregexp-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <target name="testRCSupport">
     <mkdir dir="${output}"/>
diff --git a/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml b/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml
index da78e4276..558e29667 100644
--- a/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml
+++ b/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml
@@ -17,7 +17,7 @@
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../../../antunit-base.xml" />
+  <import file="../../../antunit-base.xml"/>
 
   <description>
     In which we test interesting aspects of scripting.
@@ -28,10 +28,10 @@
   <condition property="prereqs-ok">
     <or>
       <and>
-        <available classname="org.apache.bsf.BSFManager" />
-        <available classname="org.apache.bsf.engines.javascript.JavaScriptEngine" />
+        <available classname="org.apache.bsf.BSFManager"/>
+        <available classname="org.apache.bsf.engines.javascript.JavaScriptEngine"/>
       </and>
-      <available classname="javax.script.ScriptEngineManager" />
+      <available classname="javax.script.ScriptEngineManager"/>
     </or>
   </condition>
 
@@ -40,12 +40,12 @@
   <condition property="script.manager" value="javax">
     <and>
       <not>
-        <available classname="org.apache.bsf.engines.javascript.JavaScriptEngine" />
+        <available classname="org.apache.bsf.engines.javascript.JavaScriptEngine"/>
       </not>
       <isset property="prereqs-ok"/>
     </and>
   </condition>
-  <property name="script.manager" value="auto" />
+  <property name="script.manager" value="auto"/>
 
   <string id="script.code">
     self.log("Ant version =${ant.version}");
@@ -55,36 +55,36 @@
   <presetdef name="js">
     <scriptdef language="javascript" name="scripttest" manager="${script.manager}">
       <!-- optional property attribute-->
-      <attribute name="property" />
+      <attribute name="property"/>
     </scriptdef>
   </presetdef>
 
-  <property name="prop" value='self.log("Ant version =${ant.version}");project.setNewProperty("property","live");' />
+  <property name="prop" value='self.log("Ant version =${ant.version}");project.setNewProperty("property","live");'/>
 
   <presetdef name="assertPropSet">
-    <au:assertPropertyEquals name="property" value="live" />
+    <au:assertPropertyEquals name="property" value="live"/>
   </presetdef>
 
 
   <!--purely to test that everything works -->
   <target name="testInline" if="prereqs-ok">
     <js>self.log("Hello");</js>
-    <scripttest />
+    <scripttest/>
   </target>
 
   <target name="testStringResource" if="prereqs-ok">
     <js>
-      <string value='self.log("Ant version =${ant.version}");' />
+      <string value='self.log("Ant version =${ant.version}");'/>
     </js>
-    <scripttest />
+    <scripttest/>
   </target>
 
   <target name="testStringResourceRef" if="prereqs-ok">
     <js>
-      <string refid="script.code" />
+      <string refid="script.code"/>
     </js>
-    <scripttest />
-    <assertPropSet />
+    <scripttest/>
+    <assertPropSet/>
   </target>
 
   <target name="testStringResourceInline" if="prereqs-ok">
@@ -94,28 +94,28 @@
         project.setNewProperty("property","live");
       </string>
     </js>
-    <scripttest />
-    <assertPropSet />
+    <scripttest/>
+    <assertPropSet/>
   </target>
 
   <target name="testPropertyResource" if="prereqs-ok">
     <js>
-      <propertyresource name="prop" />
+      <propertyresource name="prop"/>
     </js>
-    <scripttest />
-    <assertPropSet />
+    <scripttest/>
+    <assertPropSet/>
   </target>
 
   <target name="testMixedResources" if="prereqs-ok">
     <js>
-      <string refid="script.code" />
-      <propertyresource name="prop" />
+      <string refid="script.code"/>
+      <propertyresource name="prop"/>
       <string>
         project.setNewProperty("property2","live");
       </string>
     </js>
-    <scripttest />
-    <assertPropSet name="property2" />
+    <scripttest/>
+    <assertPropSet name="property2"/>
   </target>
 
   <target name="testExceptionNesting" description="https://issues.apache.org/bugzilla/show_bug.cgi?id=47509" if="prereqs-ok">
@@ -125,7 +125,7 @@
       ]]>
     </scriptdef>
     <au:expectfailure message="I failed!">
-      <quickfail />
+      <quickfail/>
     </au:expectfailure>
   </target>
 </project>
diff --git a/src/tests/antunit/taskdefs/optional/unix/symlink-test.xml b/src/tests/antunit/taskdefs/optional/unix/symlink-test.xml
index 90c57f43c..30e8a6b26 100644
--- a/src/tests/antunit/taskdefs/optional/unix/symlink-test.xml
+++ b/src/tests/antunit/taskdefs/optional/unix/symlink-test.xml
@@ -21,7 +21,7 @@
 
   <target name="setUp">
     <condition property="isUnix">
-      <os family="unix" />
+      <os family="unix"/>
     </condition>
   </target>
 
@@ -33,9 +33,9 @@
 
   <target name="os">
 
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
     <condition property="unix">
-      <os family="unix" />
+      <os family="unix"/>
     </condition>
     <property name="file_ref"
       location="${output}/file"/>
@@ -44,7 +44,7 @@
   </target>
 
   <target name="init" depends="os" if="unix">
-    <touch file="${file_ref}" />
+    <touch file="${file_ref}"/>
   </target>
 
   <target name="testCreateDouble" depends="init" if="unix">
@@ -63,7 +63,7 @@
   </target>
 
   <target name="testCreateOverFile" depends="init" if="unix">
-    <touch file="${output}/link3" />
+    <touch file="${output}/link3"/>
     <symlink overwrite="true" link="${output}/link3"
         resource="${file_ref}"/>
   </target>
diff --git a/src/tests/antunit/taskdefs/optional/windows/attrib-test.xml b/src/tests/antunit/taskdefs/optional/windows/attrib-test.xml
index d5cea2b54..6abf62592 100644
--- a/src/tests/antunit/taskdefs/optional/windows/attrib-test.xml
+++ b/src/tests/antunit/taskdefs/optional/windows/attrib-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../../../antunit-base.xml" />
+  <import file="../../../antunit-base.xml"/>
 
   <target name="setUp">
     <condition property="windows?">
@@ -39,7 +39,7 @@
     <touch file="${input}/9.tld"/>
     <attrib readonly="false">
       <fileset dir="${input}">
-        <include name="*.tld" />
+        <include name="*.tld"/>
       </fileset>
     </attrib>
   </target>
diff --git a/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml b/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml
index 0cfffb4b9..9c3d133f4 100644
--- a/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml
+++ b/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../../../antunit-base.xml" />
+  <import file="../../../antunit-base.xml"/>
 
   <target name="setup">
     <mkdir dir="${output}"/>
@@ -60,4 +60,3 @@
   </target>
 
 </project>
-
diff --git a/src/tests/antunit/taskdefs/optional/xz/xz-test.xml b/src/tests/antunit/taskdefs/optional/xz/xz-test.xml
index 3e4b6a860..ab7296c3c 100644
--- a/src/tests/antunit/taskdefs/optional/xz/xz-test.xml
+++ b/src/tests/antunit/taskdefs/optional/xz/xz-test.xml
@@ -18,20 +18,20 @@
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
 
     <!-- note relies on antunit 1.1 -->
-    <import file="../../../antunit-base.xml" />
+    <import file="../../../antunit-base.xml"/>
 
     <target name="setUp">
-        <mkdir dir="${output}" />
-        <mkdir dir="${output}/empty" />
-        <touch file="${output}/fileone" />
-        <touch file="${output}/filetwo" />
+        <mkdir dir="${output}"/>
+        <mkdir dir="${output}/empty"/>
+        <touch file="${output}/fileone"/>
+        <touch file="${output}/filetwo"/>
         <available property="xz.present" classname="org.tukaani.xz.XZOutputStream"/>
     </target>
 
     <target name="testFailNone" if="xz.present">
         <au:expectfailure expectedmessage="No resource selected, xz needs exactly one resource." message="Should have thrown an exception">
             <xz destfile="${output}/file.gz">
-                <fileset dir="${output}/empty" />
+                <fileset dir="${output}/empty"/>
             </xz>
         </au:expectfailure>
     </target>
@@ -39,7 +39,7 @@
     <target name="testFailTwo" if="xz.present">
         <au:expectfailure expectedmessage="xz cannot handle multiple resources at once. (2 resources were selected.)" message="Should have thrown an exception">
             <xz destfile="${output}/file.xz">
-                <fileset dir="${output}" />
+                <fileset dir="${output}"/>
             </xz>
         </au:expectfailure>
     </target>
diff --git a/src/tests/antunit/taskdefs/parallel-test.xml b/src/tests/antunit/taskdefs/parallel-test.xml
index 72e4828d7..7b531aa95 100644
--- a/src/tests/antunit/taskdefs/parallel-test.xml
+++ b/src/tests/antunit/taskdefs/parallel-test.xml
@@ -19,19 +19,19 @@
 <project default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="testTimeout"
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=49527">
     <au:expectfailure message="Parallel execution timed out">
       <parallel timeout="2000">
         <sequential>
-          <echo message="Before sleep" />
-          <sleep seconds="10" />
-          <echo message="After sleep" />
+          <echo message="Before sleep"/>
+          <sleep seconds="10"/>
+          <echo message="After sleep"/>
         </sequential>
       </parallel>
     </au:expectfailure>
     <au:assertLogDoesntContain text="After sleep"/>
   </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/tests/antunit/taskdefs/pathconvert-test.xml b/src/tests/antunit/taskdefs/pathconvert-test.xml
index 3683affef..09d2f7925 100644
--- a/src/tests/antunit/taskdefs/pathconvert-test.xml
+++ b/src/tests/antunit/taskdefs/pathconvert-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="test-dir-char">
     <pathconvert property="def|ghi" dirsep="|">
diff --git a/src/tests/antunit/taskdefs/property-test.xml b/src/tests/antunit/taskdefs/property-test.xml
index 2eb0e18f4..5395996e6 100644
--- a/src/tests/antunit/taskdefs/property-test.xml
+++ b/src/tests/antunit/taskdefs/property-test.xml
@@ -17,7 +17,7 @@
   -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="testNestedText">
     <property name="foo">bar</property>
@@ -37,7 +37,7 @@
       </property>
     </au:expectfailure>
   </target>
-  
+
   <!-- Ensure we have platform dependent path separator -->
   <property name="base" location="${basedir}"/>
   <!-- an existing file as anchor for calculating paths -->
@@ -47,7 +47,7 @@
     <property name="foo" location="${testfile}"/>
     <au:assertPropertyEquals name="foo" value="${base}${file.separator}${testfile}"/>
   </target>
-  
+
   <target name="testLocationWithRecursive">
     <property name="foo" location="${testfile}" relative="false"/>
     <au:assertPropertyEquals name="foo" value="${base}${file.separator}${testfile}"/>
@@ -62,7 +62,7 @@
     <property name="foo" location="${testfile}" relative="true" basedir="${base}"/>
     <au:assertPropertyEquals name="foo" value="${testfile}"/>
   </target>
-  
+
   <target name="testRelativeUnderBase">
     <property name="foo" location="${testfile}" relative="true" basedir="condition"/>
     <au:assertPropertyEquals name="foo" value="antversion-test.xml"/>
@@ -151,7 +151,7 @@ b=$${a}
     <au:assertPropertyEquals name="baz.b" value="$${a}"/>
   </target>
 
-  <!-- 
+  <!--
   Problems with @-sign discussed on the mailinglist.
   Seems to work.
   http://mail-archives.apache.org/mod_mbox/ant-user/201412.mbox/%3CCAPxjwW%2BQKFFj45O-ZbCGOnAkJXe9KJ5qKtVQCvS2x7hObRJmkQ%40mail.gmail.com%3E
diff --git a/src/tests/antunit/taskdefs/propertyfile-test.xml b/src/tests/antunit/taskdefs/propertyfile-test.xml
index b02cfa4c9..ddcfb122c 100644
--- a/src/tests/antunit/taskdefs/propertyfile-test.xml
+++ b/src/tests/antunit/taskdefs/propertyfile-test.xml
@@ -17,7 +17,7 @@
   -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
 
-    <import file="../antunit-base.xml" />
+    <import file="../antunit-base.xml"/>
 
     <target name="-fileResourceSetup">
       <mkdir dir="${output}"/>
@@ -25,20 +25,20 @@
 
     <target name="testInternationalText" depends="-fileResourceSetup"
         description="https://issues.apache.org/bugzilla/show_bug.cgi?id=50515">
-        <property name="line1" value="萬 利 食 品 批 發 公 司" />
-        <property name="line2" value="TEL: (123)123-1234" />
+        <property name="line1" value="萬 利 食 品 批 發 公 司"/>
+        <property name="line2" value="TEL: (123)123-1234"/>
         <propertyfile file="${output}/test.properties">
-            <entry key="line1" value="${line1}" />
-            <entry key="line2" value="${line2}" />
+            <entry key="line1" value="${line1}"/>
+            <entry key="line2" value="${line2}"/>
         </propertyfile>
         <loadproperties prefix="rereading" srcfile="${output}/test.properties"/>
         <au:assertTrue message="${line2}">
-            <equals arg1="${line2}" arg2="${rereading.line2}" />
+            <equals arg1="${line2}" arg2="${rereading.line2}"/>
         </au:assertTrue>
         <au:assertTrue message="${line1}">
-            <equals arg1="${line1}" arg2="${rereading.line1}" />
+            <equals arg1="${line1}" arg2="${rereading.line1}"/>
         </au:assertTrue>
 
     </target>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/src/tests/antunit/taskdefs/propertyhelper-test.xml b/src/tests/antunit/taskdefs/propertyhelper-test.xml
index f86342e16..041429be0 100644
--- a/src/tests/antunit/taskdefs/propertyhelper-test.xml
+++ b/src/tests/antunit/taskdefs/propertyhelper-test.xml
@@ -17,7 +17,7 @@
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
   <!-- each test verifies that the PropertyEvaluator delegate works -->
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <condition property="prereqs-ok">
     <and>
@@ -44,108 +44,108 @@
       project.addReference("mapEvaluator", new MapEvaluator());
     </script>
     <propertyhelper>
-      <delegate refid="mapEvaluator" />
+      <delegate refid="mapEvaluator"/>
     </propertyhelper>
-    <property name="setup.complete" value="true" />
+    <property name="setup.complete" value="true"/>
   </target>
 
   <target name="testValueTypes" depends="setUp" if="prereqs-ok">
     <!-- verify BC, strings -->
-    <au:assertPropertyEquals name="string" value="${STRING}" />
+    <au:assertPropertyEquals name="string" value="${STRING}"/>
 
     <!-- verify non-string properties -->
-    <au:assertPropertyEquals name="object" value="${OBJECT}" />
-    <au:assertPropertyEquals name="int" value="${INT}" />
+    <au:assertPropertyEquals name="object" value="${OBJECT}"/>
+    <au:assertPropertyEquals name="int" value="${INT}"/>
 
     <!-- verify that a string containing nothing but a property reference is a valid value -->
-    <property name="string2" value="${string}" />
-    <au:assertPropertyEquals name="string2" value="${string}" />
+    <property name="string2" value="${string}"/>
+    <au:assertPropertyEquals name="string2" value="${string}"/>
 
-    <property name="object2" value="${object}" />
+    <property name="object2" value="${object}"/>
     <!-- demonstrate that equals args can be non-string -->
-    <au:assertPropertyEquals name="object2" value="${object}" />
+    <au:assertPropertyEquals name="object2" value="${object}"/>
 
-    <property name="int2" value="${int}" />
-    <au:assertPropertyEquals name="int2" value="${int}" />
+    <property name="int2" value="${int}"/>
+    <au:assertPropertyEquals name="int2" value="${int}"/>
   </target>
 
   <target name="testNull" depends="setUp" if="prereqs-ok">
     <!-- demonstrate that a null value always implies a nonexistent property -->
     <au:assertFalse>
-      <isset property="null" />
+      <isset property="null"/>
     </au:assertFalse>
   </target>
 
   <target name="testAvailable" depends="setUp" if="prereqs-ok">
     <!-- verify the available task can set a non-string property -->
-    <available file="${ant.file}" type="file" property="available.string" value="bc" />
-    <au:assertPropertyEquals name="available.string" value="bc" />
-    <available file="${ant.file}" type="file" property="available.object" value="${object}" />
-    <au:assertPropertyEquals name="available.object" value="${OBJECT}" />
+    <available file="${ant.file}" type="file" property="available.string" value="bc"/>
+    <au:assertPropertyEquals name="available.string" value="bc"/>
+    <available file="${ant.file}" type="file" property="available.object" value="${object}"/>
+    <au:assertPropertyEquals name="available.object" value="${OBJECT}"/>
   </target>
 
   <target name="testCondition" depends="setUp" if="prereqs-ok">
     <!-- verify the condition task can set a non-string property -->
     <echo>$${ant.file}=${ant.file}</echo>
     <condition property="condition.true.string">
-      <available file="${ant.file}" type="file" />
+      <available file="${ant.file}" type="file"/>
     </condition>
-    <au:assertPropertyEquals name="condition.true.string" value="true" />
+    <au:assertPropertyEquals name="condition.true.string" value="true"/>
     <condition property="condition.else.string" value="true" else="false">
-      <not><available file="${ant.file}" type="file" /></not>
+      <not><available file="${ant.file}" type="file"/></not>
     </condition>
-    <au:assertPropertyEquals name="condition.else.string" value="false" />
+    <au:assertPropertyEquals name="condition.else.string" value="false"/>
     <condition property="condition.true.object" value="${object}">
-      <available file="${ant.file}" type="file" />
+      <available file="${ant.file}" type="file"/>
     </condition>
-    <au:assertPropertyEquals name="condition.true.object" value="${OBJECT}" />
+    <au:assertPropertyEquals name="condition.true.object" value="${OBJECT}"/>
     <condition property="condition.else.int" value="${object}" else="${int}">
-      <not><available file="${ant.file}" type="file" /></not>
+      <not><available file="${ant.file}" type="file"/></not>
     </condition>
-    <au:assertPropertyEquals name="condition.else.int" value="${INT}" />
+    <au:assertPropertyEquals name="condition.else.int" value="${INT}"/>
   </target>
 
   <target name="testEmbeddedNonString" if="prereqs-ok">
     <!-- verify that a property embedded in a string is a substring -->
     <au:assertTrue>
-      <equals arg1="@${int}@" arg2="@1@" />
+      <equals arg1="@${int}@" arg2="@1@"/>
     </au:assertTrue>
   </target>
 
   <target name="XtestLoadPropertiesWithObjects" if="prereqs-ok" depends="setUp">
     <au:assertFalse>
-      <isset property="object2" />
+      <isset property="object2"/>
     </au:assertFalse>
-    <string id="props" value="object2=$${object}" />
+    <string id="props" value="object2=$${object}"/>
     <!-- verify the property is not yet expanded -->
     <au:assertTrue>
       <length length="17">
-        <resource refid="props" />
+        <resource refid="props"/>
       </length>
     </au:assertTrue>
     <loadproperties>
-      <resource refid="props" />
+      <resource refid="props"/>
     </loadproperties>
-    <au:assertPropertyEquals name="object2" value="${object}" />
-    <au:assertPropertyEquals name="object2" value="${OBJECT}" />
+    <au:assertPropertyEquals name="object2" value="${object}"/>
+    <au:assertPropertyEquals name="object2" value="${OBJECT}"/>
   </target>
 
   <target name="testLoadPropertiesWithStrings" if="prereqs-ok" depends="setUp">
     <au:assertFalse>
-      <isset property="string2" />
+      <isset property="string2"/>
     </au:assertFalse>
-    <string id="props" value="string2=$${string}" />
+    <string id="props" value="string2=$${string}"/>
     <!-- verify the property is not yet expanded -->
     <au:assertTrue>
       <length length="17">
-        <resource refid="props" />
+        <resource refid="props"/>
       </length>
     </au:assertTrue>
     <loadproperties>
-      <resource refid="props" />
+      <resource refid="props"/>
     </loadproperties>
-    <au:assertPropertyEquals name="string2" value="${string}" />
-    <au:assertPropertyEquals name="string2" value="${STRING}" />
+    <au:assertPropertyEquals name="string2" value="${string}"/>
+    <au:assertPropertyEquals name="string2" value="${STRING}"/>
   </target>
 
 </project>
diff --git a/src/tests/antunit/taskdefs/replace-test.xml b/src/tests/antunit/taskdefs/replace-test.xml
index e7aa11888..382abd60d 100644
--- a/src/tests/antunit/taskdefs/replace-test.xml
+++ b/src/tests/antunit/taskdefs/replace-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <import file="../propertyhelpers.xml" as="ph"/>
 
diff --git a/src/tests/antunit/taskdefs/rmic-test.xml b/src/tests/antunit/taskdefs/rmic-test.xml
index 67b4afc3f..1f0e42d97 100644
--- a/src/tests/antunit/taskdefs/rmic-test.xml
+++ b/src/tests/antunit/taskdefs/rmic-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="-create-rmic-adapter">
     <mkdir dir="${input}/org/example"/>
diff --git a/src/tests/antunit/taskdefs/secure-input.xml b/src/tests/antunit/taskdefs/secure-input.xml
index ae0675ee0..6d51d39e9 100644
--- a/src/tests/antunit/taskdefs/secure-input.xml
+++ b/src/tests/antunit/taskdefs/secure-input.xml
@@ -17,16 +17,16 @@
 -->
 <project name="test-input" default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
   </target>
 
   <target name="test-secure-input">
     <input message="secure-input:>" addproperty="the.password">
-      <handler classname="org.apache.tools.ant.input.SecureInputHandler" />
+      <handler classname="org.apache.tools.ant.input.SecureInputHandler"/>
     </input>
-    <au:assertPropertySet name="the.password" />
+    <au:assertPropertySet name="the.password"/>
   </target>
 
 </project>
diff --git a/src/tests/antunit/taskdefs/setpermissions-test.xml b/src/tests/antunit/taskdefs/setpermissions-test.xml
index 99b90e078..38a811658 100644
--- a/src/tests/antunit/taskdefs/setpermissions-test.xml
+++ b/src/tests/antunit/taskdefs/setpermissions-test.xml
@@ -17,7 +17,7 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${input}"/>
@@ -27,7 +27,7 @@
 
   <target name="testRequiresNestedResources" depends="setUp">
     <au:expectfailure expectedMessage="At least one resource-collection is required">
-      <setpermissions mode="644" />
+      <setpermissions mode="644"/>
     </au:expectfailure>
   </target>
 
diff --git a/src/tests/antunit/taskdefs/signjar-test.xml b/src/tests/antunit/taskdefs/signjar-test.xml
index 8fff479db..585940a0a 100644
--- a/src/tests/antunit/taskdefs/signjar-test.xml
+++ b/src/tests/antunit/taskdefs/signjar-test.xml
@@ -17,31 +17,31 @@
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
-  <property name="classes.dir" value="../../../../build/classes" />
-  <property name="sign.dir" location="${output}" />
-  <property name="subdir" location="${sign.dir}/subdir" />
-  <property name="signtest.jar" location="${sign.dir}/signtest.jar" />
-  <property name="subdirsigntest.jar" location="${subdir}/signtest.jar" />
-  <property name="testkeystore" location="../../../etc/testcases/testkeystore" />
-  <property name="testkeystore.pkcs12" location="${input}/testkeystore.pkcs12" />
+  <property name="classes.dir" value="../../../../build/classes"/>
+  <property name="sign.dir" location="${output}"/>
+  <property name="subdir" location="${sign.dir}/subdir"/>
+  <property name="signtest.jar" location="${sign.dir}/signtest.jar"/>
+  <property name="subdirsigntest.jar" location="${subdir}/signtest.jar"/>
+  <property name="testkeystore" location="../../../etc/testcases/testkeystore"/>
+  <property name="testkeystore.pkcs12" location="${input}/testkeystore.pkcs12"/>
 
   <macrodef name="assertSigned">
-    <attribute name="jar" default="${signtest.jar}" />
+    <attribute name="jar" default="${signtest.jar}"/>
     <sequential>
       <au:assertTrue message="not signed: @{jar}">
-        <issigned file="@{jar}" />
+        <issigned file="@{jar}"/>
       </au:assertTrue>
     </sequential>
   </macrodef>
 
   <presetdef name="sign-base">
-    <signjar alias="testonly" keystore="${testkeystore}" storepass="apacheant" />
+    <signjar alias="testonly" keystore="${testkeystore}" storepass="apacheant"/>
   </presetdef>
 
   <presetdef name="verify-base">
-    <verifyjar keystore="${testkeystore}" storepass="apacheant" />
+    <verifyjar keystore="${testkeystore}" storepass="apacheant"/>
   </presetdef>
 
   <presetdef name="verify-base-pkcs12">
@@ -50,22 +50,22 @@
   </presetdef>
 
   <presetdef name="sign">
-    <sign-base jar="${signtest.jar}" />
+    <sign-base jar="${signtest.jar}"/>
   </presetdef>
 
   <target name="setUp">
     <mkdir dir="${input}"/>
     <gunzip src="${testkeystore}.pkcs12.gz" dest="${testkeystore.pkcs12}"/>
-    <mkdir dir="${sign.dir}" />
-    <mkdir dir="${subdir}" />
+    <mkdir dir="${sign.dir}"/>
+    <mkdir dir="${subdir}"/>
   </target>
 
   <target name="jar" depends="setUp">
-    <jar jarfile="${signtest.jar}" basedir="${classes.dir}" includes="**/Task.class" />
+    <jar jarfile="${signtest.jar}" basedir="${classes.dir}" includes="**/Task.class"/>
   </target>
 
   <target name="basic" depends="jar">
-    <sign />
+    <sign/>
   </target>
 
   <target name="basic-pkcs12" depends="jar" unless="jdk9+" if="jdk1.7+">
@@ -73,23 +73,23 @@
   </target>
 
   <target name="testBasic" depends="basic">
-    <assertSigned />
+    <assertSigned/>
   </target>
 
   <target name="testMaxmemory" depends="jar">
-    <sign maxmemory="128m" />
-    <assertSigned />
+    <sign maxmemory="128m"/>
+    <assertSigned/>
   </target>
 
   <target name="testPreserveLastModified" depends="jar">
-    <touch file="${signtest.jar}" datetime="06/28/2000 2:02 pm" />
-    <sign preservelastmodified="true" />
-    <assertSigned />
+    <touch file="${signtest.jar}" datetime="06/28/2000 2:02 pm"/>
+    <sign preservelastmodified="true"/>
+    <assertSigned/>
     <fail message="preserveLastModified did not preserve the last modified time">
       <condition>
         <not>
           <isfileselected file="${signtest.jar}">
-            <date datetime="06/28/2000 2:02 pm" when="equal" />
+            <date datetime="06/28/2000 2:02 pm" when="equal"/>
           </isfileselected>
         </not>
       </condition>
@@ -98,22 +98,22 @@
 
   <target name="testFileset" depends="jar">
     <sign-base>
-      <fileset file="${signtest.jar}" />
+      <fileset file="${signtest.jar}"/>
     </sign-base>
-    <assertSigned />
+    <assertSigned/>
   </target>
 
   <target name="testFilesetAndJar" depends="jar">
     <sign-base jar="${signtest.jar}" lazy="true">
-      <fileset file="${signtest.jar}" />
+      <fileset file="${signtest.jar}"/>
     </sign-base>
-    <assertSigned />
+    <assertSigned/>
   </target>
 
   <target name="testFilesetAndSignedJar" depends="jar">
     <au:expectfailure expectedMessage="You cannot specify the signed JAR when using paths or filesets">
       <sign-base signedjar="${sign.dir}/newfile.jar">
-        <fileset file="${signtest.jar}" />
+        <fileset file="${signtest.jar}"/>
       </sign-base>
     </au:expectfailure>
   </target>
@@ -121,167 +121,167 @@
   <target name="testPath" depends="jar">
     <sign-base>
       <path>
-        <fileset file="${signtest.jar}" />
+        <fileset file="${signtest.jar}"/>
       </path>
     </sign-base>
-    <assertSigned />
+    <assertSigned/>
   </target>
 
   <target name="testPathAndJar" depends="jar">
     <sign-base jar="${signtest.jar}" lazy="true">
       <path>
-        <fileset file="${signtest.jar}" />
+        <fileset file="${signtest.jar}"/>
       </path>
     </sign-base>
-    <assertSigned />
+    <assertSigned/>
   </target>
 
   <target name="testPathAndSignedJar" depends="jar">
     <au:expectfailure expectedMessage="You cannot specify the signed JAR when using paths or filesets">
       <sign-base signedjar="${sign.dir}/newfile.jar">
         <path>
-          <fileset file="${signtest.jar}" />
+          <fileset file="${signtest.jar}"/>
         </path>
       </sign-base>
     </au:expectfailure>
   </target>
 
   <target name="testSignedJar" depends="jar">
-    <sign signedjar="${subdirsigntest.jar}" />
-    <assertSigned jar="${subdirsigntest.jar}" />
+    <sign signedjar="${subdirsigntest.jar}"/>
+    <assertSigned jar="${subdirsigntest.jar}"/>
   </target>
 
   <target name="testDestDirAndSignedJar" depends="jar">
     <au:expectfailure expectedMessage="'destdir' and 'signedjar' cannot both be set">
-      <sign destDir="${subdir}" signedjar="${sign.dir}/newfile.jar" />
+      <sign destDir="${subdir}" signedjar="${sign.dir}/newfile.jar"/>
     </au:expectfailure>
   </target>
 
   <target name="testDestDir" depends="jar">
-    <sign destDir="${subdir}" />
-    <assertSigned jar="${subdirsigntest.jar}" />
+    <sign destDir="${subdir}"/>
+    <assertSigned jar="${subdirsigntest.jar}"/>
   </target>
 
   <target name="testDestDirFileset" depends="jar">
     <sign-base destDir="${subdir}">
-      <fileset file="${signtest.jar}" />
+      <fileset file="${signtest.jar}"/>
     </sign-base>
-    <assertSigned jar="${subdirsigntest.jar}" />
+    <assertSigned jar="${subdirsigntest.jar}"/>
   </target>
 
   <target name="testDestDirPath" depends="jar">
     <sign-base destDir="${subdir}">
       <path>
-        <fileset file="${signtest.jar}" />
+        <fileset file="${signtest.jar}"/>
       </path>
     </sign-base>
-    <assertSigned jar="${subdirsigntest.jar}" />
+    <assertSigned jar="${subdirsigntest.jar}"/>
   </target>
 
   <target name="testMapperNoDest" depends="jar">
     <au:expectfailure expectedMessage="The destDir attribute is required if a mapper is set">
       <sign-base>
-        <flattenmapper />
-        <fileset file="${signtest.jar}" />
+        <flattenmapper/>
+        <fileset file="${signtest.jar}"/>
       </sign-base>
     </au:expectfailure>
   </target>
 
   <target name="testMapperFileset" depends="jar">
     <sign-base destDir="${subdir}">
-      <fileset file="${signtest.jar}" />
-      <flattenmapper />
+      <fileset file="${signtest.jar}"/>
+      <flattenmapper/>
     </sign-base>
-    <assertSigned jar="${subdirsigntest.jar}" />
+    <assertSigned jar="${subdirsigntest.jar}"/>
   </target>
 
   <target name="testMapperPath" depends="jar">
     <sign-base destDir="${subdir}">
       <path>
-        <pathelement location="${signtest.jar}" />
+        <pathelement location="${signtest.jar}"/>
       </path>
-      <flattenmapper />
+      <flattenmapper/>
     </sign-base>
-    <assertSigned jar="${subdirsigntest.jar}" />
+    <assertSigned jar="${subdirsigntest.jar}"/>
   </target>
 
   <target name="testTwoMappers" depends="jar">
     <au:expectfailure expectedMessage="Too many mappers">
       <sign-base destDir="${subdir}">
-        <fileset file="${signtest.jar}" />
-        <flattenmapper />
-        <flattenmapper />
+        <fileset file="${signtest.jar}"/>
+        <flattenmapper/>
+        <flattenmapper/>
       </sign-base>
     </au:expectfailure>
   </target>
 
   <target name="testNoAlias" depends="jar">
     <au:expectfailure expectedMessage="alias attribute must be set">
-      <signjar keystore="${testkeystore}" jar="${signtest.jar}" storepass="apacheant" />
+      <signjar keystore="${testkeystore}" jar="${signtest.jar}" storepass="apacheant"/>
     </au:expectfailure>
   </target>
 
   <target name="testNoFiles">
     <au:expectfailure expectedMessage="jar must be set through jar attribute">
-      <sign-base />
+      <sign-base/>
     </au:expectfailure>
   </target>
 
   <target name="testNoStorePass" depends="jar">
     <au:expectfailure expectedMessage="storepass attribute must be set">
-      <signjar keystore="${testkeystore}" alias="testonly" jar="${signtest.jar}" />
+      <signjar keystore="${testkeystore}" alias="testonly" jar="${signtest.jar}"/>
     </au:expectfailure>
   </target>
 
   <target name="testSysProperty" depends="jar">
     <sign>
-      <sysproperty key="ant.home" value="${ant.home}" />
+      <sysproperty key="ant.home" value="${ant.home}"/>
     </sign>
-    <assertSigned />
+    <assertSigned/>
   </target>
 
   <target name="testVerifyJar" depends="basic">
-    <verify-base jar="${signtest.jar}" />
+    <verify-base jar="${signtest.jar}"/>
   </target>
 
   <target name="testVerifyJarPKCS12" depends="basic-pkcs12"
           unless="jdk9+" if="jdk1.7+">
-    <verify-base-pkcs12 jar="${signtest.jar}" />
+    <verify-base-pkcs12 jar="${signtest.jar}"/>
   </target>
 
   <target name="testVerifyJarCertificates" depends="basic">
-    <verify-base jar="${signtest.jar}" certificates="true" verbose="true" />
+    <verify-base jar="${signtest.jar}" certificates="true" verbose="true"/>
   </target>
 
   <target name="testVerifyJarUnsigned" depends="jar">
     <au:expectfailure expectedMessage="Failed to verify ${signtest.jar}">
-      <verify-base jar="${signtest.jar}" />
+      <verify-base jar="${signtest.jar}"/>
     </au:expectfailure>
   </target>
 
   <target name="NOtestVerifyJarNotInKeystore" depends="basic">
     <au:expectfailure>
-      <verifyjar jar="${signtest.jar}" certificates="true" verbose="true" />
+      <verifyjar jar="${signtest.jar}" certificates="true" verbose="true"/>
     </au:expectfailure>
   </target>
 
   <target name="testVerifyFileset" depends="basic">
     <verify-base>
-      <fileset file="${signtest.jar}" />
+      <fileset file="${signtest.jar}"/>
     </verify-base>
   </target>
 
   <target name="testVerifyPath" depends="basic">
     <verify-base>
       <path>
-        <pathelement location="${signtest.jar}" />
+        <pathelement location="${signtest.jar}"/>
       </path>
     </verify-base>
   </target>
 
   <target name="testVerifyNoArgs">
     <au:expectfailure expectedMessage="jar must be set through jar attribute">
-      <verify-base />
+      <verify-base/>
     </au:expectfailure>
   </target>
 
@@ -296,4 +296,3 @@
   </target>
 
 </project>
-
diff --git a/src/tests/antunit/taskdefs/subant-test.xml b/src/tests/antunit/taskdefs/subant-test.xml
index 3bc440593..6269b92d2 100644
--- a/src/tests/antunit/taskdefs/subant-test.xml
+++ b/src/tests/antunit/taskdefs/subant-test.xml
@@ -20,17 +20,17 @@
   <description>
     Test that subant properly sets various properties
   </description>
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="assertProperties">
-    <au:assertPropertySet name="ant.version" />
-    <au:assertPropertySet name="java.home" />
-    <au:assertPropertySet name="java.class.path" />
+    <au:assertPropertySet name="ant.version"/>
+    <au:assertPropertySet name="java.home"/>
+    <au:assertPropertySet name="java.class.path"/>
   </target>
 
   <target name="testAntVersion">
     <subant inheritall="false" target="assertProperties">
-      <fileset file="${ant.file}" />
+      <fileset file="${ant.file}"/>
     </subant>
   </target>
 
diff --git a/src/tests/antunit/taskdefs/sync-test.xml b/src/tests/antunit/taskdefs/sync-test.xml
index 21a14426e..28bfe70f6 100644
--- a/src/tests/antunit/taskdefs/sync-test.xml
+++ b/src/tests/antunit/taskdefs/sync-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${input}/a"/>
diff --git a/src/tests/antunit/taskdefs/tar-test.xml b/src/tests/antunit/taskdefs/tar-test.xml
index d83b5f9cc..06796aeed 100644
--- a/src/tests/antunit/taskdefs/tar-test.xml
+++ b/src/tests/antunit/taskdefs/tar-test.xml
@@ -19,18 +19,18 @@
 <project name="tar-test" default="antunit"
          xmlns:cond="antlib:org.apache.tools.ant.types.conditions"
          xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${input}" />
-    <mkdir dir="${output}" />
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}"/>
     <available property="xz.present" classname="org.tukaani.xz.XZOutputStream"/>
   </target>
 
   <target name="testTarFilesetHandlesFilesetReferences" depends="setUp">
-    <fileset id="xml.fileset" dir="." includes="*.xml" />
+    <fileset id="xml.fileset" dir="." includes="*.xml"/>
     <tar  destfile="${output}/testtar.tar">
-      <tarfileset  prefix="pre" refid="xml.fileset" />
+      <tarfileset  prefix="pre" refid="xml.fileset"/>
     </tar>
   </target>
 
diff --git a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
index a2016030a..da23f8c66 100644
--- a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
+++ b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
@@ -16,30 +16,30 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-    <import file="../antunit-base.xml" />
+    <import file="../antunit-base.xml"/>
 
     <target name="setUp">
-        <mkdir dir="${input}/org/example" />
-        <property name="tmpdir" location="../../../../build/antunit/taskdef" />
-        <mkdir dir="${tmpdir}" />
+        <mkdir dir="${input}/org/example"/>
+        <property name="tmpdir" location="../../../../build/antunit/taskdef"/>
+        <mkdir dir="${tmpdir}"/>
         <echo file="${input}/org/example/antlib.xml">
             <![CDATA[<antlib xmlns:e="ant:current">
                 <macrodef name="echoo" backtrace="false">
-                    <attribute name="message" />
+                    <attribute name="message"/>
                     <sequential>
-                        <echo message="@{message}@{message}" />
+                        <echo message="@{message}@{message}"/>
                     </sequential>
                 </macrodef>
                 <macrodef name="echoooo" backtrace="false">
-                    <attribute name="message" />
+                    <attribute name="message"/>
                     <sequential>
-                        <e:echoo message="@{message}@{message}" />
+                        <e:echoo message="@{message}@{message}"/>
                     </sequential>
                 </macrodef>
             </antlib>]]>
         </echo>
         <jar destfile="${test.jar}">
-            <fileset dir="${input}" />
+            <fileset dir="${input}"/>
         </jar>
         <sleep seconds="1"/>
     </target>
@@ -47,16 +47,16 @@
     <target name="testAntlib" depends="setUp">
         <taskdef classpath="${test.jar}" uri="antlib:org.example"
                  loaderref="loader1"/>
-        <echoooo xmlns="antlib:org.example" message="exemple" />
-        <au:assertLogContains text="exempleexempleexempleexemple" />
+        <echoooo xmlns="antlib:org.example" message="exemple"/>
+        <au:assertLogContains text="exempleexempleexempleexemple"/>
     </target>
 
     <target name="testURI" depends="setUp">
         <taskdef classpath="${test.jar}" uri="urn:my:exemple"
                  loaderref="loader2"
-                 resource="org/example/antlib.xml" />
-        <echoooo xmlns="urn:my:exemple" message="exemple" />
-        <au:assertLogContains text="exempleexempleexempleexemple" />
+                 resource="org/example/antlib.xml"/>
+        <echoooo xmlns="urn:my:exemple" message="exemple"/>
+        <au:assertLogContains text="exempleexempleexempleexemple"/>
     </target>
 
 </project>
diff --git a/src/tests/antunit/taskdefs/taskdef-test.xml b/src/tests/antunit/taskdefs/taskdef-test.xml
index 976872de2..e50f487d7 100644
--- a/src/tests/antunit/taskdefs/taskdef-test.xml
+++ b/src/tests/antunit/taskdefs/taskdef-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${input}/org/example"/>
diff --git a/src/tests/antunit/taskdefs/tempfile-test.xml b/src/tests/antunit/taskdefs/tempfile-test.xml
index 1132007a2..46a9a31e8 100644
--- a/src/tests/antunit/taskdefs/tempfile-test.xml
+++ b/src/tests/antunit/taskdefs/tempfile-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="tearDown" depends="antunit-base.tearDown">
     <delete file="${tmp}" quiet="true"/>
diff --git a/src/tests/antunit/taskdefs/touch-test.xml b/src/tests/antunit/taskdefs/touch-test.xml
index a9327ed88..10a999b57 100644
--- a/src/tests/antunit/taskdefs/touch-test.xml
+++ b/src/tests/antunit/taskdefs/touch-test.xml
@@ -20,14 +20,14 @@
 
   <target name="test-no-child">
     <au:expectfailure>
-      <touch />
+      <touch/>
     </au:expectfailure>
   </target>
 
   <target name="test-no-match">
     <touch>
       <fileset file="${ant.file}">
-        <filename name="IDONOTMATCH" />
+        <filename name="IDONOTMATCH"/>
       </fileset>
     </touch>
   </target>
diff --git a/src/tests/antunit/taskdefs/truncate/truncate-test.xml b/src/tests/antunit/taskdefs/truncate/truncate-test.xml
index 86f896c68..717df9940 100644
--- a/src/tests/antunit/taskdefs/truncate/truncate-test.xml
+++ b/src/tests/antunit/taskdefs/truncate/truncate-test.xml
@@ -20,98 +20,98 @@
 
   <target name="default">
     <au:antunit>
-      <file file="${ant.file}" />
+      <file file="${ant.file}"/>
     </au:antunit>
   </target>
 
   <target name="tearDown">
-    <delete file="foo" />
-    <delete file="bar" />
-    <delete dir="baz" />
+    <delete file="foo"/>
+    <delete file="bar"/>
+    <delete dir="baz"/>
   </target>
 
   <target name="test-basic">
-    <truncate file="foo" />
+    <truncate file="foo"/>
     <au:assertTrue>
-      <length file="foo" length="0" />
+      <length file="foo" length="0"/>
     </au:assertTrue>
   </target>
 
   <target name="test-explicit">
-    <truncate file="foo" length="1034" />
+    <truncate file="foo" length="1034"/>
     <au:assertTrue>
-      <length file="foo" length="1034" />
+      <length file="foo" length="1034"/>
     </au:assertTrue>
   </target>
 
   <target name="test-extend">
-    <truncate file="foo" length="5" />
+    <truncate file="foo" length="5"/>
     <au:assertTrue>
-      <length file="foo" length="5" />
+      <length file="foo" length="5"/>
     </au:assertTrue>
-    <truncate file="foo" adjust="5" />
+    <truncate file="foo" adjust="5"/>
     <au:assertTrue>
-      <length file="foo" length="10" />
+      <length file="foo" length="10"/>
     </au:assertTrue>
   </target>
 
   <target name="test-truncate">
-    <truncate file="foo" length="5" />
+    <truncate file="foo" length="5"/>
     <au:assertTrue>
-      <length file="foo" length="5" />
+      <length file="foo" length="5"/>
     </au:assertTrue>
-    <truncate file="foo" adjust="-5" />
+    <truncate file="foo" adjust="-5"/>
     <au:assertTrue>
-      <length file="foo" length="0" />
+      <length file="foo" length="0"/>
     </au:assertTrue>
   </target>
 
   <target name="test-bigger">
-    <truncate file="foo" length="1K" />
+    <truncate file="foo" length="1K"/>
     <au:assertTrue>
       <and>
-        <length file="foo" length="1K" />
-        <length file="foo" length="1024" />
+        <length file="foo" length="1K"/>
+        <length file="foo" length="1024"/>
       </and>
     </au:assertTrue>
   </target>
 
   <target name="truncate-bigger">
-    <truncate file="foo" length="3K" />
+    <truncate file="foo" length="3K"/>
     <au:assertTrue>
-      <length file="foo" length="3K" />
+      <length file="foo" length="3K"/>
     </au:assertTrue>
-    <truncate file="foo" adjust="-2K" />
+    <truncate file="foo" adjust="-2K"/>
     <au:assertTrue>
-      <length file="foo" length="1K" />
+      <length file="foo" length="1K"/>
     </au:assertTrue>
   </target>
 
   <target name="test-no-create">
-    <au:assertFileDoesntExist file="foo" />
-    <truncate file="foo" create="false" length="0" />
-    <au:assertFileDoesntExist file="foo" />
+    <au:assertFileDoesntExist file="foo"/>
+    <truncate file="foo" create="false" length="0"/>
+    <au:assertFileDoesntExist file="foo"/>
   </target>
 
   <target name="test-mkdirs">
-    <au:assertFileDoesntExist file="baz" />
-    <truncate file="baz/foo" mkdirs="true" length="0" />
+    <au:assertFileDoesntExist file="baz"/>
+    <truncate file="baz/foo" mkdirs="true" length="0"/>
     <au:assertTrue>
-      <length file="baz/foo" length="0" />
+      <length file="baz/foo" length="0"/>
     </au:assertTrue>
   </target>
 
   <target name="test-rc">
     <truncate length="10">
       <resources>
-        <file file="foo" />
-        <file file="bar" />
+        <file file="foo"/>
+        <file file="bar"/>
       </resources>
     </truncate>
     <au:assertTrue>
       <and>
-        <length file="foo" length="10" />
-        <length file="bar" length="10" />
+        <length file="foo" length="10"/>
+        <length file="bar" length="10"/>
       </and>
     </au:assertTrue>
   </target>
@@ -119,26 +119,26 @@
   <target name="test-bad-resource">
     <au:expectfailure>
       <truncate length="1P">
-        <string value="blah" />
+        <string value="blah"/>
       </truncate>
     </au:expectfailure>
   </target>
 
   <target name="test-invalid-attrs">
     <au:expectfailure>
-      <truncate file="foo" length="0" adjust="0" />
+      <truncate file="foo" length="0" adjust="0"/>
     </au:expectfailure>
   </target>
 
   <target name="test-bad-length">
     <au:expectfailure>
-      <truncate file="foo" length="-1P" />
+      <truncate file="foo" length="-1P"/>
     </au:expectfailure>
   </target>
 
   <target name="test-no-files">
     <au:expectfailure>
-      <truncate length="0" />
+      <truncate length="0"/>
     </au:expectfailure>
   </target>
 
diff --git a/src/tests/antunit/taskdefs/tstamp-test.xml b/src/tests/antunit/taskdefs/tstamp-test.xml
index c358262bf..da3b383be 100644
--- a/src/tests/antunit/taskdefs/tstamp-test.xml
+++ b/src/tests/antunit/taskdefs/tstamp-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="testMagicProperty">
     <local name="ant.tstamp.now"/>
diff --git a/src/tests/antunit/taskdefs/untar-test.xml b/src/tests/antunit/taskdefs/untar-test.xml
index 4c04bfe8b..8b3d441b7 100644
--- a/src/tests/antunit/taskdefs/untar-test.xml
+++ b/src/tests/antunit/taskdefs/untar-test.xml
@@ -18,12 +18,12 @@
 
 <project name="untar-test" default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${input}"/>
-    <mkdir dir="${output}/expected" />
-    <mkdir dir="${output}/actual" />
+    <mkdir dir="${output}/expected"/>
+    <mkdir dir="${output}/actual"/>
     <available property="xz.present" classname="org.tukaani.xz.XZOutputStream"/>
   </target>
 
diff --git a/src/tests/antunit/taskdefs/unzip-test.xml b/src/tests/antunit/taskdefs/unzip-test.xml
index bdf5f61e1..fcb16a990 100644
--- a/src/tests/antunit/taskdefs/unzip-test.xml
+++ b/src/tests/antunit/taskdefs/unzip-test.xml
@@ -18,10 +18,10 @@
 
 <project name="unzip-test" default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
   </target>
 
   <target name="tearDown" depends="antunit-base.tearDown">
@@ -49,8 +49,7 @@
   </target>
 
   <target name="testTwoByteExtraFieldInLFH"
-          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=42940"
-          >
+          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=42940">
     <mkdir dir="${input}"/>
     <mkdir dir="${output}"/>
     <copy file="zip/Bugzilla-42940.zip" tofile="${input}/test.zip"/>
@@ -59,8 +58,7 @@
   </target>
 
   <target name="testArchiveIsClosedForInvalidZips"
-          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=46559"
-          >
+          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=46559">
     <mkdir dir="${input}"/>
     <mkdir dir="${output}"/>
     <copy file="broken_cd.zip" tofile="${input}/test.zip"/>
diff --git a/src/tests/antunit/taskdefs/uptodate-test.xml b/src/tests/antunit/taskdefs/uptodate-test.xml
index e477803e6..3851f69d2 100644
--- a/src/tests/antunit/taskdefs/uptodate-test.xml
+++ b/src/tests/antunit/taskdefs/uptodate-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="testModifiedDirectories"
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=39122
diff --git a/src/tests/antunit/taskdefs/war-test.xml b/src/tests/antunit/taskdefs/war-test.xml
index e264ebdaf..6c2437f60 100644
--- a/src/tests/antunit/taskdefs/war-test.xml
+++ b/src/tests/antunit/taskdefs/war-test.xml
@@ -19,7 +19,7 @@
 <project name="war-test" default="antunit"
        xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${input}"/>
@@ -43,10 +43,10 @@
       <lib refid="test"/>
     </mkwar>
     <expandwar/>
-    <au:assertFileExists file="${webxml.generated}" />
+    <au:assertFileExists file="${webxml.generated}"/>
   </target>
 
-  <!-- 
+  <!--
   This checks that as of Java EE 5, the web.xml attr is optional.
   Here there is a web.xml, in the webinf fileset, rather than a fileset
   -->
@@ -55,62 +55,62 @@
       <webinf dir="." includes="web.xml"/>
     </mkwar>
     <expandwar/>
-    <au:assertFileExists file="${webxml.generated}" />
+    <au:assertFileExists file="${webxml.generated}"/>
   </target>
 
   <target name="testWebXmlMissingFromUpdate" depends="setUp">
-    <mkwar webxml="${web.xml}" />
+    <mkwar webxml="${web.xml}"/>
     <!-- there is no web.xml file, but that is ok, as
       we are updating -->
     <mkwar update="true">
       <classes dir="." includes="web.xml"/>
     </mkwar>
     <expandwar/>
-    <au:assertFileExists file="${webxml.generated}" />
+    <au:assertFileExists file="${webxml.generated}"/>
   </target>
 
   <target name="testWebXmlInImplicitUpdate" depends="setUp">
-    <mkwar webxml="${web.xml}" />
+    <mkwar webxml="${web.xml}"/>
     <!-- when we are implicitly updating, the web.xml file does not get
      pulled in, but the command still succeeds.-->
-    <mkwar webxml="${web.xml}" >
+    <mkwar webxml="${web.xml}">
       <classes dir="." includes="web.xml"/>
     </mkwar>
     <expandwar/>
-    <au:assertFileExists file="${webxml.generated}" />
+    <au:assertFileExists file="${webxml.generated}"/>
   </target>
 
   <target name="NotestWebXmlFilesetInImplicitUpdate" depends="setUp">
-    <mkwar webxml="${web.xml}" />
+    <mkwar webxml="${web.xml}"/>
     <!-- when we are implicitly updating, the web.xml file does not get
      pulled in, but the command still succeeds.-->
-    <mkwar >
+    <mkwar>
       <webinf dir="." includes="web.xml"/>
     </mkwar>
     <expandwar/>
-    <au:assertFileExists file="${webxml.generated}" />
+    <au:assertFileExists file="${webxml.generated}"/>
   </target>
 
 
   <target name="testDuplicateWebXml" depends="setUp">
-    <mkwar webxml="${web.xml}" >
+    <mkwar webxml="${web.xml}">
       <webinf dir="." includes="web.xml"/>
       <webinf file="${web.xml}"/>
       <zipfileset file="${web.xml}" prefix="WEB-INF"/>
     </mkwar>
     <expandwar/>
-    <au:assertFileExists file="${webxml.generated}" />
+    <au:assertFileExists file="${webxml.generated}"/>
   </target>
 
   <target name="testDifferentDuplicateWebXml" depends="setUp">
-    <copy file="${web.xml}" todir="${input}" />
-    <mkwar webxml="${web.xml}" >
+    <copy file="${web.xml}" todir="${input}"/>
+    <mkwar webxml="${web.xml}">
       <webinf dir="${input}" includes="web.xml"/>
       <webinf file="${web.xml}"/>
       <zipfileset file="${web.xml}" prefix="WEB-INF"/>
     </mkwar>
     <expandwar/>
-    <au:assertFileExists file="${webxml.generated}" />
+    <au:assertFileExists file="${webxml.generated}"/>
     <au:assertLogContains text="The duplicate entry is"/>
   </target>
 
@@ -124,15 +124,15 @@
       <classes dir="." includes="web.xml"/>
     </mkwar>
     <expandwar/>
-    <au:assertFileExists file="${input}/WEB-INF/classes/web.xml" />
+    <au:assertFileExists file="${input}/WEB-INF/classes/web.xml"/>
     <au:assertFalse>
-      <available file="${webxml.generated}" />
+      <available file="${webxml.generated}"/>
     </au:assertFalse>
   </target>
 
   <target name="testWebXmlOptionalFailure" depends="setUp">
     <au:expectfailure>
-      <mkwar >
+      <mkwar>
         <classes dir="." includes="web.xml"/>
       </mkwar>
     </au:expectfailure>
@@ -151,7 +151,7 @@
       <classes dir="." includes="web.xml"/>
     </mkwar>
     <expandwar/>
-    <au:assertFileExists file="${input}/WEB-INF/classes/web.xml" />
+    <au:assertFileExists file="${input}/WEB-INF/classes/web.xml"/>
   </target>
 
   <target name="testLibElement" depends="setUp">
@@ -159,7 +159,7 @@
       <lib dir="." includes="web.xml"/>
     </mkwar>
     <expandwar/>
-    <au:assertFileExists file="${input}/WEB-INF/lib/web.xml" />
+    <au:assertFileExists file="${input}/WEB-INF/lib/web.xml"/>
   </target>
 
   <target name="testMappedClasspathFromManual">
diff --git a/src/tests/antunit/taskdefs/whichresource-test.xml b/src/tests/antunit/taskdefs/whichresource-test.xml
index 6bf5a8813..c78d40572 100644
--- a/src/tests/antunit/taskdefs/whichresource-test.xml
+++ b/src/tests/antunit/taskdefs/whichresource-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="init">
     <delete quiet="yes" dir="${output}"/>
@@ -24,7 +24,7 @@
     <javac srcdir="javac-dir/good-src" destdir="${output}"/>
     <path id="whichresource-build" path="${output}"/>
   </target>
-  
+
   <target name="test-reference" depends="init">
     <whichresource
       property="whichresource.prop"
@@ -47,5 +47,5 @@
       <isset property="whichresource.prop2"/>
     </au:assertFalse>
   </target>
-    
+
 </project>
diff --git a/src/tests/antunit/taskdefs/xmlproperty-test.xml b/src/tests/antunit/taskdefs/xmlproperty-test.xml
index 5be04207e..1afd0ba64 100644
--- a/src/tests/antunit/taskdefs/xmlproperty-test.xml
+++ b/src/tests/antunit/taskdefs/xmlproperty-test.xml
@@ -18,7 +18,7 @@
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
   <description/>
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="test-empty">
     <xmlproperty file="xmlproperty-test.xml"/>
@@ -141,4 +141,3 @@
                              value="${b.c.loc}${path.separator}${glob.dot.jar}"/>
   </target>
 </project>
-
diff --git a/src/tests/antunit/taskdefs/xmlproperty.multi.xml b/src/tests/antunit/taskdefs/xmlproperty.multi.xml
index 9899c586c..b0d56eb1b 100644
--- a/src/tests/antunit/taskdefs/xmlproperty.multi.xml
+++ b/src/tests/antunit/taskdefs/xmlproperty.multi.xml
@@ -16,6 +16,6 @@
   limitations under the License.
 -->
 <root>
-   <element value="a" />
-   <element value="b" />
+   <element value="a"/>
+   <element value="b"/>
 </root>
diff --git a/src/tests/antunit/taskdefs/xslt-test.xml b/src/tests/antunit/taskdefs/xslt-test.xml
index b327c7b58..e65854a7b 100644
--- a/src/tests/antunit/taskdefs/xslt-test.xml
+++ b/src/tests/antunit/taskdefs/xslt-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${output}"/>
@@ -34,20 +34,20 @@
        resource="${output}/out.xml"
        value="set='myvalue'"/>
   </target>
-  
+
   <target name="testParameterTypes" depends="setUp" description="parameters of various data types and XPath expressions">
 
     <property name="antProperty1" value="ANT_PROPERTY_1"/>
     <property name="antProperty2" value="ANT_PROPERTY_2"/>
     <property name="antProperty3" value="3"/>
     <property name="antProperty4" value="substring-before"/>
-    
+
     <xslt in="${legacy.dir}/data.xml"
           out="${output}/out.xml">
       <param name="p1" expression="123" type="INT"/>
       <param name="p2" expression="64 * 64 div 128 + 10" type="XPATH_NUMBER"/>
       <param name="p3" expression="${antProperty4}($antProperty2, '_')" type="XPATH_STRING"/>
-      
+
       <style>
         <string><![CDATA[<xsl:stylesheet
   version="1.0"
@@ -135,8 +135,7 @@ undefined='<xsl:value-of select="$undefined"/>'
     <au:expectfailure expectedmessage="Fatal error during transformation">
       <xslt in="${legacy.dir}/data.xml"
             out="${output}/out.xml"
-            style="xslt/printParams-invalid.xsl"
-            />
+            style="xslt/printParams-invalid.xsl"/>
     </au:expectfailure>
   </target>
 
diff --git a/src/tests/antunit/taskdefs/zip-test.xml b/src/tests/antunit/taskdefs/zip-test.xml
index 7ff45c1ad..c3775191b 100644
--- a/src/tests/antunit/taskdefs/zip-test.xml
+++ b/src/tests/antunit/taskdefs/zip-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="testEmptyDirs">
     <mkdir dir="${input}/foo"/>
@@ -176,8 +176,8 @@
       <touch file="${input}/test1.txt"/>
       <mkdir dir="${output}"/>
       <zip destfile="${output}/test.zip" basedir="${input}">
-        <fileset dir="${input}"/>                                          
-      </zip>                                                                  
+        <fileset dir="${input}"/>
+      </zip>
       <zip destfile="${output}/test.zip" update="true">
         <fileset dir="${basedir}" includes="zip-test.xml"/>
       </zip>
@@ -189,17 +189,17 @@
       <touch file="${input}/test1.txt"/>
       <touch file="${input}/subdir/test2.txt"/>
       <mkdir dir="${output}"/>
-      <zip destfile="${output}/test.zip" basedir="${input}" modificationtime="2016-01-01 00:00" />
-      <checksum file="${output}/test.zip" property="testSetZipModTime_hash" />
-      <delete file="${output}/test.zip" />
+      <zip destfile="${output}/test.zip" basedir="${input}" modificationtime="2016-01-01 00:00"/>
+      <checksum file="${output}/test.zip" property="testSetZipModTime_hash"/>
+      <delete file="${output}/test.zip"/>
 
-      <sleep seconds="4" /> <!-- Necessary to ensure zips would have normally differed in timestamp -->
+      <sleep seconds="4"/> <!-- Necessary to ensure zips would have normally differed in timestamp -->
       <touch file="${input}/test1.txt"/>
       <touch file="${input}/subdir/test2.txt"/>
-      <zip destfile="${output}/test.zip" basedir="${input}" modificationtime="2016-01-01 00:00" />
-      <checksum file="${output}/test.zip" property="${testSetZipModTime_hash}" verifyproperty="testSetZipModTime_okay" />
+      <zip destfile="${output}/test.zip" basedir="${input}" modificationtime="2016-01-01 00:00"/>
+      <checksum file="${output}/test.zip" property="${testSetZipModTime_hash}" verifyproperty="testSetZipModTime_okay"/>
       <au:assertTrue>
-        <equals arg1="${testSetZipModTime_okay}" arg2="true" />
+        <equals arg1="${testSetZipModTime_okay}" arg2="true"/>
       </au:assertTrue>
     </target>
 </project>
diff --git a/src/tests/antunit/types/conditions/isreference-test.xml b/src/tests/antunit/types/conditions/isreference-test.xml
index 8929e9017..5be800773 100644
--- a/src/tests/antunit/types/conditions/isreference-test.xml
+++ b/src/tests/antunit/types/conditions/isreference-test.xml
@@ -18,7 +18,7 @@
 <project name="isreference-test" default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <target name="out-of-band">
     <path id="out-of-band" path="."/>
@@ -37,4 +37,3 @@
     </au:assertTrue>
   </target>
 </project>
-
diff --git a/src/tests/antunit/types/conditions/matches-test.xml b/src/tests/antunit/types/conditions/matches-test.xml
index 5d174613d..c3c1f23b4 100644
--- a/src/tests/antunit/types/conditions/matches-test.xml
+++ b/src/tests/antunit/types/conditions/matches-test.xml
@@ -20,7 +20,7 @@
   <property name="NL" value="&#10;"/>
   <regexp id="myid" pattern="^[a-z]{3,4}$"/>
 
-  <available property="jdk1.4+" classname="java.lang.CharSequence"/>  
+  <available property="jdk1.4+" classname="java.lang.CharSequence"/>
   <condition property="some.regexp.support">
     <or>
       <isset property="jdk1.4+"/>
@@ -28,7 +28,7 @@
       <isset property="apache.oro.present"/>
     </or>
   </condition>
-    
+
   <target name="test-refid" if="some.regexp.support">
     <au:assertTrue>
       <matches string="abc">
@@ -45,7 +45,7 @@
 
   <target name="test-nomatch" if="some.regexp.support">
     <au:assertFalse>
-      <matches string="abc" pattern="^b.*" />
+      <matches string="abc" pattern="^b.*"/>
     </au:assertFalse>
   </target>
 
@@ -55,7 +55,7 @@
     </tstamp>
     <au:assertTrue>
       <matches string="${today}">
-        <regexp pattern="^[0123]\d-[01]\d-[12]\d\d\d$" />
+        <regexp pattern="^[0123]\d-[01]\d-[12]\d\d\d$"/>
       </matches>
     </au:assertTrue>
   </target>
diff --git a/src/tests/antunit/types/cutdirs-test.xml b/src/tests/antunit/types/cutdirs-test.xml
index 64f0652bb..67be37bbf 100644
--- a/src/tests/antunit/types/cutdirs-test.xml
+++ b/src/tests/antunit/types/cutdirs-test.xml
@@ -19,7 +19,7 @@
          name="firstmatch-test"
          default="antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${input}"/>
@@ -53,4 +53,4 @@
     </au:assertTrue>
   </target>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/src/tests/antunit/types/defer-reference-test.xml b/src/tests/antunit/types/defer-reference-test.xml
index a67ad3b72..83f2173a0 100644
--- a/src/tests/antunit/types/defer-reference-test.xml
+++ b/src/tests/antunit/types/defer-reference-test.xml
@@ -17,9 +17,9 @@
 -->
 <project default="all" xmlns:au="antlib:org.apache.ant.antunit">
   <target name="notcalled">
-    <filelist id="ref1" dir="${basedir}" files="xxx" />
+    <filelist id="ref1" dir="${basedir}" files="xxx"/>
   </target>
-  
+
   <target name="test-macrodef-embedded-ref">
     <!-- bug 34458 -->
     <macrodef name="foo">
@@ -36,20 +36,20 @@
 
   <condition property="allow.script">
     <and>
-      <available classname="org.apache.bsf.BSFManager" />
-      <available classname="bsh.StringUtil" />
+      <available classname="org.apache.bsf.BSFManager"/>
+      <available classname="bsh.StringUtil"/>
     </and>
   </condition>
 
   <target name="test-script" if="allow.script">
     <!-- bugzilla: 37688 -->
-    <macrodef name="compileMapper" >
-      <attribute name="objDir" />
-      <attribute name="id" default="compileMapperID" />
+    <macrodef name="compileMapper">
+      <attribute name="objDir"/>
+      <attribute name="id" default="compileMapperID"/>
       <sequential>
         <mkdir dir="@{objDir}"/>
         <mapper id="@{id}">
-          <chainedmapper  >
+          <chainedmapper>
             <flattenmapper/>
             <globmapper from="*" to="@{objDir}/*.o"/>
           </chainedmapper>
diff --git a/src/tests/antunit/types/fileset-test.xml b/src/tests/antunit/types/fileset-test.xml
index ea39dec8b..31389bc49 100644
--- a/src/tests/antunit/types/fileset-test.xml
+++ b/src/tests/antunit/types/fileset-test.xml
@@ -27,7 +27,7 @@
     <au:assertTrue>
       <and>
         <equals arg1="" arg2="${toString:missing.path.id}"/>
-        <resourcecount count="0" refid="missing.dir.fs" />
+        <resourcecount count="0" refid="missing.dir.fs"/>
       </and>
     </au:assertTrue>
   </target>
@@ -36,7 +36,7 @@
     <mkdir dir="${output}"/>
     <au:expectfailure expectedmessage="not present does not exist">
       <copy todir="${output}">
-        <fileset dir="not present" />
+        <fileset dir="not present"/>
       </copy>
     </au:expectfailure>
   </target>
@@ -68,7 +68,7 @@
     <mkdir dir="${output}"/>
     <au:expectfailure expectedmessage="you can only specify one of the dir and file attributes">
       <copy todir="${output}">
-        <fileset dir="foo" file="bar" />
+        <fileset dir="foo" file="bar"/>
       </copy>
     </au:expectfailure>
   </target>
diff --git a/src/tests/antunit/types/filterset-test.xml b/src/tests/antunit/types/filterset-test.xml
index f1654f6d4..e02a82fda 100644
--- a/src/tests/antunit/types/filterset-test.xml
+++ b/src/tests/antunit/types/filterset-test.xml
@@ -17,20 +17,20 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
-  <property name="br" value="${line.separator}" />
+  <property name="br" value="${line.separator}"/>
 
   <target name="testRecursionRegression">
     <mkdir dir="${output}"/>
     <copy todir="${output}">
-      <string value="@a@${br}@b@${br}@c@${br}@d@${br}" />
-      <mergemapper to="filterset-output.txt" />
+      <string value="@a@${br}@b@${br}@c@${br}@d@${br}"/>
+      <mergemapper to="filterset-output.txt"/>
       <filterset>
-        <filter token="a" value="aaa" />
-        <filter token="b" value="bbb" />
-        <filter token="c" value="@a@:@b@" />
-        <filter token="d" value="@c@:@c@" />
+        <filter token="a" value="aaa"/>
+        <filter token="b" value="bbb"/>
+        <filter token="c" value="@a@:@b@"/>
+        <filter token="d" value="@c@:@c@"/>
       </filterset>
     </copy>
 
@@ -45,11 +45,11 @@
   <target name="testOverlappingMulticharToken">
     <mkdir dir="${output}"/>
     <copy todir="${output}">
-      <string value="@@USER@@@@@HOST@@" />
-      <mergemapper to="filterset-output.txt" />
+      <string value="@@USER@@@@@HOST@@"/>
+      <mergemapper to="filterset-output.txt"/>
       <filterset begintoken="@@" endtoken="@@">
-        <filter token="USER" value="user" />
-        <filter token="HOST" value="host" />
+        <filter token="USER" value="user"/>
+        <filter token="HOST" value="host"/>
       </filterset>
     </copy>
 
@@ -77,20 +77,19 @@ Filter with property set test
 @bar.x@ - should not change
 @cccc@ - should not change
     </echo>
-    <property name="foo.x" value="1111" />
-    <property name="foo.y" value="2222" />
+    <property name="foo.x" value="1111"/>
+    <property name="foo.y" value="2222"/>
     <copy todir="${output}">
       <fileset dir="${input}"/>
       <filterset>
         <propertyset>
-          <propertyref prefix="foo." />
+          <propertyref prefix="foo."/>
         </propertyset>
       </filterset>
     </copy>
     <au:assertFilesMatch
         actual="${output}/src.txt"
-        expected="${output}/expected.txt"
-        />
+        expected="${output}/expected.txt"/>
   </target>
 
 </project>
diff --git a/src/tests/antunit/types/firstmatch-test.xml b/src/tests/antunit/types/firstmatch-test.xml
index 68c332b23..44d1ab835 100644
--- a/src/tests/antunit/types/firstmatch-test.xml
+++ b/src/tests/antunit/types/firstmatch-test.xml
@@ -19,7 +19,7 @@
          name="firstmatch-test"
          default="antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="testMatch">
     <mkdir dir="${input}"/>
diff --git a/src/tests/antunit/types/javaresource-test.xml b/src/tests/antunit/types/javaresource-test.xml
index d0e99e004..ccebc50b4 100644
--- a/src/tests/antunit/types/javaresource-test.xml
+++ b/src/tests/antunit/types/javaresource-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${resources}"/>
@@ -58,5 +58,3 @@
     <au:assertPropertyEquals name="a" value="b"/>
   </target>
 </project>
-
-        
diff --git a/src/tests/antunit/types/mapper-ref.xml b/src/tests/antunit/types/mapper-ref.xml
index 3ada7f3b8..947d01e1d 100644
--- a/src/tests/antunit/types/mapper-ref.xml
+++ b/src/tests/antunit/types/mapper-ref.xml
@@ -23,33 +23,33 @@
   <macrodef name="test">
     <sequential>
       <pathconvert property="dest">
-        <string value="foo" />
-        <mapper refid="mapper" />
+        <string value="foo"/>
+        <mapper refid="mapper"/>
       </pathconvert>
       <au:assertTrue>
-        <equals arg1="${dest}" arg2="bar" />
+        <equals arg1="${dest}" arg2="bar"/>
       </au:assertTrue>
     </sequential>
   </macrodef>
 
   <target name="testBasic" description="success">
-    <mapper id="mapper" type="merge" to="bar" />
-    <test />
+    <mapper id="mapper" type="merge" to="bar"/>
+    <test/>
   </target>
 
   <target name="testFileNameMapper" description="success">
-    <mergemapper id="mapper" to="bar" />
-    <test />
+    <mergemapper id="mapper" to="bar"/>
+    <test/>
   </target>
 
   <target name="testWrongType" description="failure">
-    <path id="mapper" path="whocares" />
-    <au:expectfailure 
+    <path id="mapper" path="whocares"/>
+    <au:expectfailure
       expectedMessage="org.apache.tools.ant.types.Path at reference 'mapper' is not a valid mapper reference.">
-      <test />
+      <test/>
     </au:expectfailure>
   </target>
 
-  <target name="all" depends="testBasic,testFileNameMapper,testWrongType" />
+  <target name="all" depends="testBasic,testFileNameMapper,testWrongType"/>
 
 </project>
diff --git a/src/tests/antunit/types/mappers/glob-test.xml b/src/tests/antunit/types/mappers/glob-test.xml
index c4d92da2d..0ea502088 100644
--- a/src/tests/antunit/types/mappers/glob-test.xml
+++ b/src/tests/antunit/types/mappers/glob-test.xml
@@ -20,7 +20,7 @@
          name="glob-test"
          default="antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${input}"/>
diff --git a/src/tests/antunit/types/mappers/packagemapper-test.xml b/src/tests/antunit/types/mappers/packagemapper-test.xml
index cad014642..1da18bc7d 100644
--- a/src/tests/antunit/types/mappers/packagemapper-test.xml
+++ b/src/tests/antunit/types/mappers/packagemapper-test.xml
@@ -18,7 +18,7 @@
 <project xmlns:au="antlib:org.apache.ant.antunit"
          default="antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <target name="testHandleDirSep"
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=51086">
@@ -47,4 +47,4 @@
     </pathconvert>
     <au:assertPropertyEquals name="p2" value="foo.bar"/>
   </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/tests/antunit/types/optional/xz/xzresource-test.xml b/src/tests/antunit/types/optional/xz/xzresource-test.xml
index 56fe66d18..add17b917 100644
--- a/src/tests/antunit/types/optional/xz/xzresource-test.xml
+++ b/src/tests/antunit/types/optional/xz/xzresource-test.xml
@@ -17,7 +17,7 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../../../antunit-base.xml" />
+  <import file="../../../antunit-base.xml"/>
 
   <target name="setup">
     <mkdir dir="${output}"/>
diff --git a/src/tests/antunit/types/path-test.xml b/src/tests/antunit/types/path-test.xml
index 4f4be9ab1..3b6af6491 100644
--- a/src/tests/antunit/types/path-test.xml
+++ b/src/tests/antunit/types/path-test.xml
@@ -17,25 +17,25 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
-  <property name="existingFile" value="${basedir}/build.xml" />
+  <property name="existingFile" value="${basedir}/build.xml"/>
 
   <files id="files">
-    <include name="${existingFile}" />
+    <include name="${existingFile}"/>
   </files>
-    
+
   <target name="test-directUse" description="Bug 42397 - works fine">
     <path id="path">
       <files>
-        <include name="${existingFile}" />
+        <include name="${existingFile}"/>
       </files>
     </path>
   </target>
 
   <target name="test-refid" description="Bug 42397">
     <path id="path">
-      <files refid="files" />
+      <files refid="files"/>
     </path>
   </target>
 
diff --git a/src/tests/antunit/types/patternset-invert-test.xml b/src/tests/antunit/types/patternset-invert-test.xml
index 7c0912e71..42b00ea1c 100644
--- a/src/tests/antunit/types/patternset-invert-test.xml
+++ b/src/tests/antunit/types/patternset-invert-test.xml
@@ -23,10 +23,10 @@
         <resourcecount count="0">
           <intersect>
             <fileset dir="${basedir}">
-              <patternset refid="plus" />
+              <patternset refid="plus"/>
             </fileset>
             <fileset dir="${basedir}">
-              <patternset refid="minus" />
+              <patternset refid="minus"/>
             </fileset>
           </intersect>
         </resourcecount>
@@ -35,31 +35,31 @@
   </macrodef>
 
   <target name="testInvertNested">
-    <basename property="basename" file="${ant.file}" />
+    <basename property="basename" file="${ant.file}"/>
     <echo>$${basename}=${basename}</echo>
-    <patternset id="plus" includes="${basename}" />
+    <patternset id="plus" includes="${basename}"/>
     <patternset id="minus">
       <invert>
-        <patternset refid="plus" />
+        <patternset refid="plus"/>
       </invert>
     </patternset>
-    <test />
+    <test/>
   </target>
 
   <target name="testInvertRefid">
-    <basename property="basename" file="${ant.file}" />
+    <basename property="basename" file="${ant.file}"/>
     <echo>$${basename}=${basename}</echo>
-    <patternset id="plus" includes="${basename}" />
+    <patternset id="plus" includes="${basename}"/>
     <patternset id="minus">
-      <invert refid="plus" />
+      <invert refid="plus"/>
     </patternset>
-    <test />
+    <test/>
   </target>
 
   <target name="all">
     <au:antunit>
       <fileset file="${ant.file}"/>
-      <au:plainlistener />
+      <au:plainlistener/>
     </au:antunit>
   </target>
 
diff --git a/src/tests/antunit/types/patternset-test.xml b/src/tests/antunit/types/patternset-test.xml
index 60690d498..ed08244e4 100644
--- a/src/tests/antunit/types/patternset-test.xml
+++ b/src/tests/antunit/types/patternset-test.xml
@@ -17,7 +17,7 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${input}"/>
diff --git a/src/tests/antunit/types/propertyset-test.xml b/src/tests/antunit/types/propertyset-test.xml
index 0b7e236c9..6543df435 100644
--- a/src/tests/antunit/types/propertyset-test.xml
+++ b/src/tests/antunit/types/propertyset-test.xml
@@ -20,7 +20,7 @@
 <project name="test-propertyset" basedir="." default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../antunit-base.xml" />
+  <import file="../antunit-base.xml"/>
 
   <property name="fooA" value="FooA"/>
   <property name="barB" value="BarB"/>
@@ -35,7 +35,7 @@
     <propertyset refid="properties-starting-with-foo"/>
     <propertyset refid="properties-starting-with-bar"/>
   </propertyset>
-  
+
   <macrodef name="expect.equals">
     <attribute name="test"/>
     <attribute name="exp"/>
@@ -63,11 +63,11 @@
     <propertyset id="nested-mapped">
       <propertyset>
         <propertyset refid="properties-starting-with-foo"/>
-        <globmapper from="foo*" to="boo*" />
+        <globmapper from="foo*" to="boo*"/>
       </propertyset>
       <propertyset>
         <propertyset refid="properties-starting-with-bar"/>
-        <globmapper from="bar*" to="far*" />
+        <globmapper from="bar*" to="far*"/>
       </propertyset>
     </propertyset>
     <expect.equals
@@ -80,15 +80,15 @@
     <propertyset id="nested-mapped-mapped">
       <propertyset>
         <propertyset refid="properties-starting-with-foo"/>
-        <globmapper from="foo*" to="boo*" />
+        <globmapper from="foo*" to="boo*"/>
       </propertyset>
       <propertyset>
         <propertyset refid="properties-starting-with-bar"/>
-        <globmapper from="bar*" to="far*" />
+        <globmapper from="bar*" to="far*"/>
       </propertyset>
       <mapper>
-        <globmapper from="boo*" to="hoo*" />
-        <globmapper from="far*" to="near*" />
+        <globmapper from="boo*" to="hoo*"/>
+        <globmapper from="far*" to="near*"/>
       </mapper>
     </propertyset>
     <expect.equals
@@ -101,8 +101,8 @@
     <au:assertTrue>
       <resourcecount count="2">
         <restrict>
-          <exists />
-          <resources refid="my-set" />
+          <exists/>
+          <resources refid="my-set"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -112,10 +112,10 @@
     <au:assertTrue>
       <resourcecount count="2">
         <restrict>
-          <exists />
+          <exists/>
           <propertyset>
-            <propertyset refid="my-set" />
-            <globmapper from="bar*" to="far*" />
+            <propertyset refid="my-set"/>
+            <globmapper from="bar*" to="far*"/>
           </propertyset>
         </restrict>
       </resourcecount>
diff --git a/src/tests/antunit/types/resources/archives-test.xml b/src/tests/antunit/types/resources/archives-test.xml
index 961effc71..903de06bb 100644
--- a/src/tests/antunit/types/resources/archives-test.xml
+++ b/src/tests/antunit/types/resources/archives-test.xml
@@ -91,7 +91,7 @@
         <archives refid="ref"/>
       </copy>
     </au:expectfailure>
-  </target>    
+  </target>
 
   <!-- works but takes a veeeeeery long time -->
   <target name="XtestResourcesManualExample">
diff --git a/src/tests/antunit/types/resources/comparators/test.xml b/src/tests/antunit/types/resources/comparators/test.xml
index 524f67a1f..ffdee5d1c 100644
--- a/src/tests/antunit/types/resources/comparators/test.xml
+++ b/src/tests/antunit/types/resources/comparators/test.xml
@@ -19,46 +19,46 @@
          xmlns:au="antlib:org.apache.ant.antunit"
          xmlns:rcmp="antlib:org.apache.tools.ant.types.resources.comparators">
 
-  <import file="../../../antunit-base.xml" />
+  <import file="../../../antunit-base.xml"/>
 
-  <property name="dirname" value="work" />
-  <property name="dir" location="${output}/${dirname}" />
-  <property name="echolevel" value="debug" />
+  <property name="dirname" value="work"/>
+  <property name="dir" location="${output}/${dirname}"/>
+  <property name="echolevel" value="debug"/>
 
   <target name="tearDown">
-    <delete dir="${dir}" />
-    <delete file="${zip}" />
-    <delete file="${jar}" deleteonexit="true" />
-    <delete file="${file}" />
+    <delete dir="${dir}"/>
+    <delete file="${zip}"/>
+    <delete file="${jar}" deleteonexit="true"/>
+    <delete file="${file}"/>
   </target>
 
   <target name="setUp">
-    <mkdir dir="${dir}" />
+    <mkdir dir="${dir}"/>
 
-    <echo file="${dir}/b" message="yyy" />
-    <echo file="${dir}/e" message="aaa" />
-    <sleep seconds="2" />
-    <echo file="${dir}/c" message="x" />
-    <echo file="${dir}/d" message="x" />
-    <sleep seconds="2" />
-    <echo file="${dir}/a" message="zz" />
-    <echo file="${dir}/f" message="zz" />
+    <echo file="${dir}/b" message="yyy"/>
+    <echo file="${dir}/e" message="aaa"/>
+    <sleep seconds="2"/>
+    <echo file="${dir}/c" message="x"/>
+    <echo file="${dir}/d" message="x"/>
+    <sleep seconds="2"/>
+    <echo file="${dir}/a" message="zz"/>
+    <echo file="${dir}/f" message="zz"/>
 
-    <mkdir dir="${dir}/a.dir" />
-    <mkdir dir="${dir}/b.dir" />
-    <mkdir dir="${dir}/c.dir" />
+    <mkdir dir="${dir}/a.dir"/>
+    <mkdir dir="${dir}/b.dir"/>
+    <mkdir dir="${dir}/c.dir"/>
 
     <macrodef name="mysort">
-      <attribute name="property" />
-      <attribute name="separator" default="," />
-      <element name="cmp" optional="true" implicit="true" />
+      <attribute name="property"/>
+      <attribute name="separator" default=","/>
+      <element name="cmp" optional="true" implicit="true"/>
       <sequential>
         <pathconvert property="@{property}" pathsep="@{separator}">
           <sort>
-            <fileset dir="${dir}" includes="a,b,c" />
-            <cmp />
+            <fileset dir="${dir}" includes="a,b,c"/>
+            <cmp/>
           </sort>
-          <flattenmapper />
+          <flattenmapper/>
         </pathconvert>
         <echo level="${echolevel}">@{property}=${@{property}}</echo>
       </sequential>
@@ -66,98 +66,98 @@
   </target>
 
   <target name="testsortdefault" depends="setUp">
-    <mysort property="sortdf" />
+    <mysort property="sortdf"/>
     <au:assertTrue>
-      <equals arg1="${sortdf}" arg2="a,b,c" />
+      <equals arg1="${sortdf}" arg2="a,b,c"/>
     </au:assertTrue>
   </target>
 
   <target name="testrvdefault" depends="setUp">
     <mysort property="sortdf-rev">
-      <rcmp:reverse />
+      <rcmp:reverse/>
     </mysort>
     <au:assertTrue>
-      <equals arg1="${sortdf-rev}" arg2="c,b,a" />
+      <equals arg1="${sortdf-rev}" arg2="c,b,a"/>
     </au:assertTrue>
   </target>
 
   <target name="testname" depends="setUp">
     <mysort property="sortnm">
-      <rcmp:name />
+      <rcmp:name/>
     </mysort>
     <au:assertTrue>
-      <equals arg1="${sortnm}" arg2="a,b,c" />
+      <equals arg1="${sortnm}" arg2="a,b,c"/>
     </au:assertTrue>
   </target>
 
   <target name="testrvname" depends="setUp">
     <mysort property="sortnm-rev">
       <rcmp:reverse>
-        <rcmp:name />
+        <rcmp:name/>
       </rcmp:reverse>
     </mysort>
     <au:assertTrue>
-      <equals arg1="${sortnm-rev}" arg2="c,b,a" />
+      <equals arg1="${sortnm-rev}" arg2="c,b,a"/>
     </au:assertTrue>
   </target>
 
   <target name="testdate" depends="setUp">
     <mysort property="sortlm">
-      <rcmp:date />
+      <rcmp:date/>
     </mysort>
     <au:assertTrue>
-      <equals arg1="${sortlm}" arg2="b,c,a" />
+      <equals arg1="${sortlm}" arg2="b,c,a"/>
     </au:assertTrue>
   </target>
 
   <target name="testrvdate" depends="setUp">
     <mysort property="sortlm-rev">
       <rcmp:reverse>
-        <rcmp:date />
+        <rcmp:date/>
       </rcmp:reverse>
     </mysort>
     <au:assertTrue>
-      <equals arg1="${sortlm-rev}" arg2="a,c,b" />
+      <equals arg1="${sortlm-rev}" arg2="a,c,b"/>
     </au:assertTrue>
   </target>
 
   <target name="testsize" depends="setUp">
     <mysort property="sortsz">
-      <rcmp:size />
+      <rcmp:size/>
     </mysort>
     <au:assertTrue>
-      <equals arg1="${sortsz}" arg2="c,a,b" />
+      <equals arg1="${sortsz}" arg2="c,a,b"/>
     </au:assertTrue>
   </target>
 
   <target name="testrvsize" depends="setUp">
     <mysort property="sortsz-rev">
       <rcmp:reverse>
-        <rcmp:size />
+        <rcmp:size/>
       </rcmp:reverse>
     </mysort>
     <au:assertTrue>
-      <equals arg1="${sortsz-rev}" arg2="b,a,c" />
+      <equals arg1="${sortsz-rev}" arg2="b,a,c"/>
     </au:assertTrue>
   </target>
 
   <target name="testcontent" depends="setUp">
     <mysort property="sortct">
-      <rcmp:content />
+      <rcmp:content/>
     </mysort>
     <au:assertTrue>
-      <equals arg1="${sortct}" arg2="c,b,a" />
+      <equals arg1="${sortct}" arg2="c,b,a"/>
     </au:assertTrue>
   </target>
 
   <target name="testrvcontent" depends="setUp">
     <mysort property="sortct-rev">
       <rcmp:reverse>
-        <rcmp:content />
+        <rcmp:content/>
       </rcmp:reverse>
     </mysort>
     <au:assertTrue>
-      <equals arg1="${sortct-rev}" arg2="a,b,c" />
+      <equals arg1="${sortct-rev}" arg2="a,b,c"/>
     </au:assertTrue>
   </target>
 
@@ -165,15 +165,15 @@
     <pathconvert property="sortex" pathsep=",">
       <sort>
         <resources>
-          <file file="${dir}/a" />
-          <resource name="redherring" exists="false" />
+          <file file="${dir}/a"/>
+          <resource name="redherring" exists="false"/>
         </resources>
-        <rcmp:exists />
+        <rcmp:exists/>
       </sort>
-      <flattenmapper />
+      <flattenmapper/>
     </pathconvert>
     <au:assertTrue>
-      <equals arg1="${sortex}" arg2="redherring,a" />
+      <equals arg1="${sortex}" arg2="redherring,a"/>
     </au:assertTrue>
   </target>
 
@@ -181,17 +181,17 @@
     <pathconvert property="sortex-rev" pathsep=",">
       <sort>
         <resources>
-          <file file="${dir}/a" />
-          <resource name="redherring" exists="false" />
+          <file file="${dir}/a"/>
+          <resource name="redherring" exists="false"/>
         </resources>
         <rcmp:reverse>
-          <rcmp:exists />
+          <rcmp:exists/>
         </rcmp:reverse>
       </sort>
-      <flattenmapper />
+      <flattenmapper/>
     </pathconvert>
     <au:assertTrue>
-      <equals arg1="${sortex-rev}" arg2="a,redherring" />
+      <equals arg1="${sortex-rev}" arg2="a,redherring"/>
     </au:assertTrue>
   </target>
 
@@ -199,79 +199,79 @@
     <pathconvert property="sorttp" pathsep=",">
       <sort>
         <resources>
-          <file file="${dir}/a" />
-          <file file="${dir}/a.dir" />
+          <file file="${dir}/a"/>
+          <file file="${dir}/a.dir"/>
         </resources>
-        <rcmp:type />
+        <rcmp:type/>
       </sort>
-      <flattenmapper />
+      <flattenmapper/>
     </pathconvert>
-    <au:assertPropertyEquals name="sorttp" value="a,a.dir" />
+    <au:assertPropertyEquals name="sorttp" value="a,a.dir"/>
   </target>
 
   <target name="testrvtype" depends="setUp">
     <pathconvert property="sorttp-rev" pathsep=",">
       <sort>
         <resources>
-          <file file="${dir}/a" />
-          <file file="${dir}/a.dir" />
+          <file file="${dir}/a"/>
+          <file file="${dir}/a.dir"/>
         </resources>
         <rcmp:reverse>
-          <rcmp:type />
+          <rcmp:type/>
         </rcmp:reverse>
       </sort>
-      <flattenmapper />
+      <flattenmapper/>
     </pathconvert>
     <au:assertTrue>
-      <equals arg1="${sorttp-rev}" arg2="a.dir,a" />
+      <equals arg1="${sorttp-rev}" arg2="a.dir,a"/>
     </au:assertTrue>
   </target>
 
   <target name="forwardsort"
-    depends="testsortdefault,testname,testdate,testsize,testcontent,testexists,testtype" />
+    depends="testsortdefault,testname,testdate,testsize,testcontent,testexists,testtype"/>
 
   <target name="reversesort"
-    depends="testrvdefault,testrvname,testrvdate,testrvsize,testrvcontent,testrvexists,testrvtype" />
+    depends="testrvdefault,testrvname,testrvdate,testrvsize,testrvcontent,testrvexists,testrvtype"/>
 
   <target name="testcompoundsort1" depends="setUp">
     <pathconvert property="sortcmp1" pathsep=",">
       <sort>
         <resources>
-          <file file="${dir}/c" />
-          <file file="${dir}/b.dir" />
-          <file file="${dir}/a" />
-          <file file="${dir}/c.dir" />
-          <file file="${dir}/b" />
-          <file file="${dir}/a.dir" />
+          <file file="${dir}/c"/>
+          <file file="${dir}/b.dir"/>
+          <file file="${dir}/a"/>
+          <file file="${dir}/c.dir"/>
+          <file file="${dir}/b"/>
+          <file file="${dir}/a.dir"/>
         </resources>
         <rcmp:reverse>
-          <rcmp:type />
+          <rcmp:type/>
         </rcmp:reverse>
-        <rcmp:name />
+        <rcmp:name/>
       </sort>
-      <flattenmapper />
+      <flattenmapper/>
     </pathconvert>
-    <au:assertPropertyEquals name="sortcmp1" value="a.dir,b.dir,c.dir,a,b,c" />
+    <au:assertPropertyEquals name="sortcmp1" value="a.dir,b.dir,c.dir,a,b,c"/>
   </target>
 
   <target name="testcompoundsort2" depends="setUp">
     <pathconvert property="sortcmp2" pathsep=",">
       <sort>
         <fileset dir="${dir}" includes="?"/>
-        <rcmp:size />
-        <rcmp:content />
+        <rcmp:size/>
+        <rcmp:content/>
         <rcmp:reverse>
-          <rcmp:name />
+          <rcmp:name/>
         </rcmp:reverse>
       </sort>
-      <flattenmapper />
+      <flattenmapper/>
     </pathconvert>
-    <au:assertPropertyEquals name="sortcmp2" value="d,c,f,a,e,b" />
+    <au:assertPropertyEquals name="sortcmp2" value="d,c,f,a,e,b"/>
   </target>
 
-  <target name="compoundsort" depends="testcompoundsort1,testcompoundsort2" />
+  <target name="compoundsort" depends="testcompoundsort1,testcompoundsort2"/>
 
-  <target name="sort" depends="forwardsort,reversesort,compoundsort" />
+  <target name="sort" depends="forwardsort,reversesort,compoundsort"/>
 
   <target name="testEquals">
     <!-- test for PR 46527 -->
@@ -284,15 +284,15 @@
     </sort>
 
     <au:assertTrue>
-      <resourcecount refid="testEquals" count="3" />
+      <resourcecount refid="testEquals" count="3"/>
     </au:assertTrue>
 
     <pathconvert refid="testEquals" property="testEquals" pathsep="" preserveduplicates="true">
-      <mergemapper to="X" />
+      <mergemapper to="X"/>
     </pathconvert>
 
     <au:assertTrue>
-      <length string="${testEquals}" length="3" />
+      <length string="${testEquals}" length="3"/>
     </au:assertTrue>
   </target>
 
diff --git a/src/tests/antunit/types/resources/concat-resource-test.xml b/src/tests/antunit/types/resources/concat-resource-test.xml
index 554c13d20..9154301f1 100644
--- a/src/tests/antunit/types/resources/concat-resource-test.xml
+++ b/src/tests/antunit/types/resources/concat-resource-test.xml
@@ -19,10 +19,10 @@
 <project name="test-concat" basedir="." default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
-  <property name="br" value="${line.separator}" />
-  <property name="world" value="World" />
+  <property name="br" value="${line.separator}"/>
+  <property name="world" value="World"/>
 
   <target name="testCountEquals1">
     <au:assertTrue>
@@ -46,9 +46,9 @@
       <resourcesmatch>
         <string>foobarbaz</string>
         <concat>
-          <string value="foo" />
-          <string value="bar" />
-          <string value="baz" />
+          <string value="foo"/>
+          <string value="bar"/>
+          <string value="baz"/>
         </concat>
       </resourcesmatch>
     </au:assertTrue>
@@ -59,9 +59,9 @@
       <resourcesmatch>
         <string>foo${line.separator}bar${line.separator}baz${line.separator}</string>
         <concat fixlastline="true">
-          <string value="foo" />
-          <string value="bar" />
-          <string value="baz" />
+          <string value="foo"/>
+          <string value="bar"/>
+          <string value="baz"/>
         </concat>
       </resourcesmatch>
     </au:assertTrue>
@@ -76,12 +76,12 @@
     </copy>
     <au:assertTrue>
       <resourcesmatch astext="true">
-        <file file="${output}/utf-16.in" />
+        <file file="${output}/utf-16.in"/>
         <concat outputEncoding="utf-16">foo${br}bar${br}baz${br}</concat>
         <concat outputEncoding="utf-16" fixlastline="true">
-          <string value="foo" />
-          <string value="bar" />
-          <string value="baz" />
+          <string value="foo"/>
+          <string value="bar"/>
+          <string value="baz"/>
         </concat>
       </resourcesmatch>
     </au:assertTrue>
@@ -100,9 +100,9 @@ baz
 #comment 3
           <filterchain>
             <striplinecomments>
-              <comment value="#" />
+              <comment value="#"/>
             </striplinecomments>
-            <ignoreblank />
+            <ignoreblank/>
           </filterchain>
         </concat>
       </resourcesmatch>
@@ -115,12 +115,12 @@ baz
     </resources>
     <au:assertTrue>
       <and>
-        <resourcecount count="1" refid="concat" />
+        <resourcecount count="1" refid="concat"/>
         <resourcesmatch>
           <string>foo</string>
-          <resources refid="concat" />
+          <resources refid="concat"/>
           <!-- purposely hit it twice to see what happens -->
-          <resources refid="concat" />
+          <resources refid="concat"/>
         </resourcesmatch>
       </and>
     </au:assertTrue>
@@ -132,7 +132,7 @@ baz
         <string>foobar</string>
         <concat>
           <string>foo</string>
-          <propertyresource name="someunsetproperty" />
+          <propertyresource name="someunsetproperty"/>
           <string>bar</string>
         </concat>
       </resourcesmatch>
@@ -143,7 +143,7 @@ baz
     <au:assertTrue>
       <resourcecount count="1">
         <restrict>
-          <name name="snicklefritz" />
+          <name name="snicklefritz"/>
           <resources>
             <concat resourceName="snicklefritz">
               whatever
diff --git a/src/tests/antunit/types/resources/fileresource-test.xml b/src/tests/antunit/types/resources/fileresource-test.xml
index 71141193a..e81f92f3e 100644
--- a/src/tests/antunit/types/resources/fileresource-test.xml
+++ b/src/tests/antunit/types/resources/fileresource-test.xml
@@ -17,7 +17,7 @@
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <!-- using restrict/exists to force getFile() to be called -->
 
@@ -25,8 +25,8 @@
     <au:assertTrue>
       <resourcecount when="ge" count="0">
         <restrict>
-          <exists />
-          <file name="foo" />
+          <exists/>
+          <file name="foo"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -36,8 +36,8 @@
     <au:assertTrue>
       <resourcecount when="ge" count="0">
         <restrict>
-          <exists />
-          <file name="foo" />
+          <exists/>
+          <file name="foo"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -47,8 +47,8 @@
     <au:assertTrue>
       <resourcecount when="ge" count="0">
         <restrict>
-          <exists />
-          <file basedir="${basedir}" name="foo" />
+          <exists/>
+          <file basedir="${basedir}" name="foo"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
diff --git a/src/tests/antunit/types/resources/first-last-test.xml b/src/tests/antunit/types/resources/first-last-test.xml
index e7fc831bb..3670a11fe 100644
--- a/src/tests/antunit/types/resources/first-last-test.xml
+++ b/src/tests/antunit/types/resources/first-last-test.xml
@@ -17,17 +17,17 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <tokens id="testrc">
-    <string value="1,2,3,4,5" />
-    <stringtokenizer delims="," />
+    <string value="1,2,3,4,5"/>
+    <stringtokenizer delims=","/>
   </tokens>
 
   <target name="testfirst0">
     <au:assertTrue>
       <resourcecount count="0">
-        <first count="0"><resources refid="testrc" /></first>
+        <first count="0"><resources refid="testrc"/></first>
       </resourcecount>
     </au:assertTrue>
   </target>
@@ -36,8 +36,8 @@
     <au:assertTrue>
       <resourcecount count="0">
         <difference>
-          <first><resources refid="testrc" /></first>
-          <string value="1" />
+          <first><resources refid="testrc"/></first>
+          <string value="1"/>
         </difference>
       </resourcecount>
     </au:assertTrue>
@@ -47,10 +47,10 @@
     <au:assertTrue>
       <resourcecount count="0">
         <difference>
-          <first count="2"><resources refid="testrc" /></first>
+          <first count="2"><resources refid="testrc"/></first>
           <resources>
-            <string value="1" />
-            <string value="2" />
+            <string value="1"/>
+            <string value="2"/>
           </resources>
         </difference>
       </resourcecount>
@@ -61,8 +61,8 @@
     <au:assertTrue>
       <resourcecount count="0">
         <difference>
-          <first count="5"><resources refid="testrc" /></first>
-          <resources refid="testrc" />
+          <first count="5"><resources refid="testrc"/></first>
+          <resources refid="testrc"/>
         </difference>
       </resourcecount>
     </au:assertTrue>
@@ -72,8 +72,8 @@
     <au:assertTrue>
       <resourcecount count="0">
         <difference>
-          <first count="6"><resources refid="testrc" /></first>
-          <resources refid="testrc" />
+          <first count="6"><resources refid="testrc"/></first>
+          <resources refid="testrc"/>
         </difference>
       </resourcecount>
     </au:assertTrue>
@@ -82,7 +82,7 @@
   <target name="testfirst-1">
     <au:expectfailure expectedmessage="size-limited collection count should be set to an int &gt;= 0">
       <resourcecount>
-        <first count="-1"><resources refid="testrc" /></first>
+        <first count="-1"><resources refid="testrc"/></first>
       </resourcecount>
     </au:expectfailure>
   </target>
@@ -90,7 +90,7 @@
   <target name="testlast0">
     <au:assertTrue>
       <resourcecount count="0">
-        <last count="0"><resources refid="testrc" /></last>
+        <last count="0"><resources refid="testrc"/></last>
       </resourcecount>
     </au:assertTrue>
   </target>
@@ -99,8 +99,8 @@
     <au:assertTrue>
       <resourcecount count="0">
         <difference>
-          <last><resources refid="testrc" /></last>
-          <string value="5" />
+          <last><resources refid="testrc"/></last>
+          <string value="5"/>
         </difference>
       </resourcecount>
     </au:assertTrue>
@@ -110,10 +110,10 @@
     <au:assertTrue>
       <resourcecount count="0">
         <difference>
-          <last count="2"><resources refid="testrc" /></last>
+          <last count="2"><resources refid="testrc"/></last>
           <resources>
-            <string value="4" />
-            <string value="5" />
+            <string value="4"/>
+            <string value="5"/>
           </resources>
         </difference>
       </resourcecount>
@@ -124,8 +124,8 @@
     <au:assertTrue>
       <resourcecount count="0">
         <difference>
-          <last count="5"><resources refid="testrc" /></last>
-          <resources refid="testrc" />
+          <last count="5"><resources refid="testrc"/></last>
+          <resources refid="testrc"/>
         </difference>
       </resourcecount>
     </au:assertTrue>
@@ -135,8 +135,8 @@
     <au:assertTrue>
       <resourcecount count="0">
         <difference>
-          <last count="6"><resources refid="testrc" /></last>
-          <resources refid="testrc" />
+          <last count="6"><resources refid="testrc"/></last>
+          <resources refid="testrc"/>
         </difference>
       </resourcecount>
     </au:assertTrue>
@@ -145,7 +145,7 @@
   <target name="testlast-1">
     <au:expectfailure expectedmessage="size-limited collection count should be set to an int &gt;= 0">
       <resourcecount>
-        <last count="-1"><resources refid="testrc" /></last>
+        <last count="-1"><resources refid="testrc"/></last>
       </resourcecount>
     </au:expectfailure>
   </target>
@@ -153,7 +153,7 @@
   <target name="testallbutfirst5">
     <au:assertTrue>
       <resourcecount count="0">
-        <allbutfirst count="5"><resources refid="testrc" /></allbutfirst>
+        <allbutfirst count="5"><resources refid="testrc"/></allbutfirst>
       </resourcecount>
     </au:assertTrue>
   </target>
@@ -162,8 +162,8 @@
     <au:assertTrue>
       <resourcecount count="0">
         <difference>
-          <allbutfirst count="4"><resources refid="testrc" /></allbutfirst>
-          <string value="5" />
+          <allbutfirst count="4"><resources refid="testrc"/></allbutfirst>
+          <string value="5"/>
         </difference>
       </resourcecount>
     </au:assertTrue>
@@ -173,10 +173,10 @@
     <au:assertTrue>
       <resourcecount count="0">
         <difference>
-          <allbutfirst count="3"><resources refid="testrc" /></allbutfirst>
+          <allbutfirst count="3"><resources refid="testrc"/></allbutfirst>
           <resources>
-            <string value="4" />
-            <string value="5" />
+            <string value="4"/>
+            <string value="5"/>
           </resources>
         </difference>
       </resourcecount>
@@ -187,12 +187,12 @@
     <au:assertTrue>
       <resourcecount count="0">
         <difference>
-          <allbutfirst><resources refid="testrc" /></allbutfirst>
+          <allbutfirst><resources refid="testrc"/></allbutfirst>
           <resources>
-            <string value="2" />
-            <string value="3" />
-            <string value="4" />
-            <string value="5" />
+            <string value="2"/>
+            <string value="3"/>
+            <string value="4"/>
+            <string value="5"/>
           </resources>
         </difference>
       </resourcecount>
@@ -202,7 +202,7 @@
   <target name="testallbutfirst6">
     <au:assertTrue>
       <resourcecount count="0">
-        <allbutfirst count="6"><resources refid="testrc" /></allbutfirst>
+        <allbutfirst count="6"><resources refid="testrc"/></allbutfirst>
       </resourcecount>
     </au:assertTrue>
   </target>
@@ -210,7 +210,7 @@
   <target name="testallbutfirst-1">
     <au:expectfailure expectedmessage="size-limited collection count should be set to an int &gt;= 0">
       <resourcecount>
-        <allbutfirst count="-1"><resources refid="testrc" /></allbutfirst>
+        <allbutfirst count="-1"><resources refid="testrc"/></allbutfirst>
       </resourcecount>
     </au:expectfailure>
   </target>
@@ -218,7 +218,7 @@
   <target name="testallbutlast5">
     <au:assertTrue>
       <resourcecount count="0">
-        <allbutlast count="5"><resources refid="testrc" /></allbutlast>
+        <allbutlast count="5"><resources refid="testrc"/></allbutlast>
       </resourcecount>
     </au:assertTrue>
   </target>
@@ -227,8 +227,8 @@
     <au:assertTrue>
       <resourcecount count="0">
         <difference>
-          <allbutlast count="4"><resources refid="testrc" /></allbutlast>
-          <string value="1" />
+          <allbutlast count="4"><resources refid="testrc"/></allbutlast>
+          <string value="1"/>
         </difference>
       </resourcecount>
     </au:assertTrue>
@@ -238,12 +238,12 @@
     <au:assertTrue>
       <resourcecount count="0">
         <difference>
-          <allbutlast><resources refid="testrc" /></allbutlast>
+          <allbutlast><resources refid="testrc"/></allbutlast>
           <resources>
-            <string value="1" />
-            <string value="2" />
-            <string value="3" />
-            <string value="4" />
+            <string value="1"/>
+            <string value="2"/>
+            <string value="3"/>
+            <string value="4"/>
           </resources>
         </difference>
       </resourcecount>
@@ -254,8 +254,8 @@
     <au:assertTrue>
       <resourcecount count="0">
         <difference>
-          <allbutlast count="0"><resources refid="testrc" /></allbutlast>
-          <resources refid="testrc" />
+          <allbutlast count="0"><resources refid="testrc"/></allbutlast>
+          <resources refid="testrc"/>
         </difference>
       </resourcecount>
     </au:assertTrue>
@@ -264,7 +264,7 @@
   <target name="testallbutlast6">
     <au:assertTrue>
       <resourcecount count="0">
-        <allbutlast count="6"><resources refid="testrc" /></allbutlast>
+        <allbutlast count="6"><resources refid="testrc"/></allbutlast>
       </resourcecount>
     </au:assertTrue>
   </target>
@@ -272,7 +272,7 @@
   <target name="testallbutlast-1">
     <au:expectfailure expectedmessage="size-limited collection count should be set to an int &gt;= 0">
       <resourcecount>
-        <allbutlast count="-1"><resources refid="testrc" /></allbutlast>
+        <allbutlast count="-1"><resources refid="testrc"/></allbutlast>
       </resourcecount>
     </au:expectfailure>
   </target>
diff --git a/src/tests/antunit/types/resources/latepath-test.xml b/src/tests/antunit/types/resources/latepath-test.xml
index 5cafffde0..475c00724 100644
--- a/src/tests/antunit/types/resources/latepath-test.xml
+++ b/src/tests/antunit/types/resources/latepath-test.xml
@@ -19,16 +19,16 @@
 
   <target name="testLatePath" depends="tearDown">
     <path id="p">
-      <fileset file="testLatePath" />
+      <fileset file="testLatePath"/>
     </path>
-    <pathconvert refid="p" />
-    <touch file="testLatePath" />
+    <pathconvert refid="p"/>
+    <touch file="testLatePath"/>
     <au:assertTrue>
-      <resourcecount when="eq" count="1" refid="p" />
+      <resourcecount when="eq" count="1" refid="p"/>
     </au:assertTrue>
   </target>
 
   <target name="tearDown">
-    <delete file="testLatePath" />
+    <delete file="testLatePath"/>
   </target>
 </project>
diff --git a/src/tests/antunit/types/resources/multirootfileset-test.xml b/src/tests/antunit/types/resources/multirootfileset-test.xml
index 27b6193ea..b6f01bbfe 100644
--- a/src/tests/antunit/types/resources/multirootfileset-test.xml
+++ b/src/tests/antunit/types/resources/multirootfileset-test.xml
@@ -159,7 +159,7 @@
     </multirootfileset>
     <pathconvert property="dirs" pathsep=":" refid="the-one-dirs"/>
     <au:assertPropertyEquals value="${a}${file.separator}1" name="dirs"/>
-    <resourcecount property="dir-count" refid="the-one-dirs" />
+    <resourcecount property="dir-count" refid="the-one-dirs"/>
     <au:assertPropertyEquals value="1" name="dir-count"/>
   </target>
 
diff --git a/src/tests/antunit/types/resources/resourcelist-test.xml b/src/tests/antunit/types/resources/resourcelist-test.xml
index 335774761..145c86927 100644
--- a/src/tests/antunit/types/resources/resourcelist-test.xml
+++ b/src/tests/antunit/types/resources/resourcelist-test.xml
@@ -19,7 +19,7 @@
 <project name="test-concat" basedir="." default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${input}"/>
diff --git a/src/tests/antunit/types/resources/selectors/name-test.xml b/src/tests/antunit/types/resources/selectors/name-test.xml
index 84cbedb4a..c248f755a 100644
--- a/src/tests/antunit/types/resources/selectors/name-test.xml
+++ b/src/tests/antunit/types/resources/selectors/name-test.xml
@@ -17,7 +17,7 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../../../antunit-base.xml" />
+  <import file="../../../antunit-base.xml"/>
 
   <property name="file" value="testfile"/>
 
diff --git a/src/tests/antunit/types/resources/selectors/readwrite-test.xml b/src/tests/antunit/types/resources/selectors/readwrite-test.xml
index 4247875a0..3bdca7911 100644
--- a/src/tests/antunit/types/resources/selectors/readwrite-test.xml
+++ b/src/tests/antunit/types/resources/selectors/readwrite-test.xml
@@ -18,7 +18,7 @@
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit"
          xmlns:rsel="antlib:org.apache.tools.ant.types.resources.selectors">
 
-  <import file="../../../antunit-base.xml" />
+  <import file="../../../antunit-base.xml"/>
 
   <property name="dir" location="testdir"/>
   <property name="file" value="testfile"/>
diff --git a/src/tests/antunit/types/resources/selectors/test-componentdef.xml b/src/tests/antunit/types/resources/selectors/test-componentdef.xml
index 187412ecb..71de167ad 100644
--- a/src/tests/antunit/types/resources/selectors/test-componentdef.xml
+++ b/src/tests/antunit/types/resources/selectors/test-componentdef.xml
@@ -17,27 +17,27 @@
 -->
 <project default="all" xmlns:au="antlib:org.apache.ant.antunit">
 
-  <available property="jdk1.4+" classname="java.lang.CharSequence"/>  
+  <available property="jdk1.4+" classname="java.lang.CharSequence"/>
   <condition property="some.regexp.support">
     <or>
       <isset property="jdk1.4+"/>
       <isset property="apache.regexp.present"/>
       <isset property="apache.oro.present"/>
     </or>
-  </condition>    
-    
+  </condition>
+
   <target name="testname1">
     <au:assertTrue>
       <resourcecount when="equal" count="2">
         <restrict>
           <resources>
-            <resource name="foo" />
-            <resource name="bar" />
-            <resource name="baz" />
-            <resource name="boo" />
-            <resource name="bang" />
+            <resource name="foo"/>
+            <resource name="bar"/>
+            <resource name="baz"/>
+            <resource name="boo"/>
+            <resource name="bang"/>
           </resources>
-          <name name="ba?" />
+          <name name="ba?"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -48,28 +48,28 @@
       <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>
-          <name name="foo" />
+          <name name="foo"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
   </target>
 
-  <target name="name" depends="testname1,testname2" />
+  <target name="name" depends="testname1,testname2"/>
 
   <target name="testexists">
     <au:assertTrue>
       <resourcecount when="equal" count="1">
         <restrict>
           <resources>
-            <file file="idonotexist" />
-            <resource name="foo" />
-            <resource name="foo" exists="false" />
+            <file file="idonotexist"/>
+            <resource name="foo"/>
+            <resource name="foo" exists="false"/>
           </resources>
-          <exists />
+          <exists/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -80,13 +80,13 @@
       <resourcecount when="equal" count="2">
         <restrict>
           <resources>
-            <file file="foo" />
-            <url url="http://ant.apache.org/index.html" />
-            <resource name="foo" />
-            <string value="foo" />
-            <file file="bar" />
+            <file file="foo"/>
+            <url url="http://ant.apache.org/index.html"/>
+            <resource name="foo"/>
+            <string value="foo"/>
+            <file file="bar"/>
           </resources>
-          <instanceof type="file" />
+          <instanceof type="file"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -94,15 +94,15 @@
 
   <target name="testinstanceoftype2">
     <typedef name="file" uri="test"
-             classname="org.apache.tools.ant.types.resources.FileResource" />
+             classname="org.apache.tools.ant.types.resources.FileResource"/>
     <au:assertTrue>
       <resourcecount when="equal" count="1">
         <restrict>
           <resources>
-            <url file="foo" />
-            <file file="bar" xmlns="test" />
+            <url file="foo"/>
+            <file file="bar" xmlns="test"/>
           </resources>
-          <instanceof type="test:file" />
+          <instanceof type="test:file"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -110,49 +110,49 @@
 
   <target name="testinstanceoftype3">
     <typedef name="file" uri="test"
-             classname="org.apache.tools.ant.types.resources.FileResource" />
+             classname="org.apache.tools.ant.types.resources.FileResource"/>
     <au:assertTrue>
       <resourcecount when="equal" count="1">
         <restrict>
           <resources>
-            <url file="foo" />
-            <file file="bar" xmlns="test" />
+            <url file="foo"/>
+            <file file="bar" xmlns="test"/>
           </resources>
-          <instanceof type="file" uri="test" />
+          <instanceof type="file" uri="test"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
   </target>
 
   <target name="instanceoftype"
-    depends="testinstanceoftype1,testinstanceoftype2,testinstanceoftype3" />
+    depends="testinstanceoftype1,testinstanceoftype2,testinstanceoftype3"/>
 
   <target name="testinstanceofclass">
     <au:assertTrue>
       <resourcecount when="equal" count="7">
         <restrict>
           <resources>
-            <filelist dir="${basedir}" files="a,b,c,d,e,f,g" />
+            <filelist dir="${basedir}" files="a,b,c,d,e,f,g"/>
           </resources>
-          <instanceof class="org.apache.tools.ant.types.Resource" />
+          <instanceof class="org.apache.tools.ant.types.Resource"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
   </target>
 
-  <target name="instanceof" depends="instanceoftype,testinstanceofclass" />
+  <target name="instanceof" depends="instanceoftype,testinstanceofclass"/>
 
   <target name="testtype">
     <au:assertTrue>
       <resourcecount when="equal" count="2">
         <restrict>
           <resources>
-             <file file="${basedir}" />
-             <file file="${ant.file}" />
-             <resource directory="true" />
-             <resource directory="false" />
+             <file file="${basedir}"/>
+             <file file="${ant.file}"/>
+             <resource directory="true"/>
+             <resource directory="false"/>
           </resources>
-          <type type="dir" />
+          <type type="dir"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -163,13 +163,13 @@
       <resourcecount when="equal" count="3">
         <restrict>
           <resources>
-             <resource lastmodified="4" />
-             <resource lastmodified="5" />
-             <resource lastmodified="6" />
-             <resource lastmodified="7" />
-             <resource lastmodified="8" />
+             <resource lastmodified="4"/>
+             <resource lastmodified="5"/>
+             <resource lastmodified="6"/>
+             <resource lastmodified="7"/>
+             <resource lastmodified="8"/>
           </resources>
-          <date when="after" millis="5" granularity="0" />
+          <date when="after" millis="5" granularity="0"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -180,13 +180,13 @@
       <resourcecount when="equal" count="4">
         <restrict>
           <resources>
-             <resource size="4" />
-             <resource size="5" />
-             <resource size="6" />
-             <resource size="7" />
-             <resource size="8" />
+             <resource size="4"/>
+             <resource size="5"/>
+             <resource size="6"/>
+             <resource size="7"/>
+             <resource size="8"/>
           </resources>
-          <size when="le" size="7" />
+          <size when="le" size="7"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -197,14 +197,14 @@
       <resourcecount when="equal" count="1">
         <restrict>
           <resources>
-            <string value="fee" />
-            <resource name="fi" size="3" />
-            <resource name="fo" />
-            <resource name="fum" />
+            <string value="fee"/>
+            <resource name="fi" size="3"/>
+            <resource name="fo"/>
+            <resource name="fum"/>
           </resources>
           <and xmlns="antlib:org.apache.tools.ant.types.resources.selectors">
-            <name name="f?" />
-            <size size="3" />
+            <name name="f?"/>
+            <size size="3"/>
           </and>
         </restrict>
       </resourcecount>
@@ -216,14 +216,14 @@
       <resourcecount when="equal" count="3">
         <restrict>
           <resources>
-            <string value="fee" />
-            <resource name="fi" size="3" />
-            <resource name="fo" />
-            <resource name="fum" />
+            <string value="fee"/>
+            <resource name="fi" size="3"/>
+            <resource name="fo"/>
+            <resource name="fum"/>
           </resources>
           <or xmlns="antlib:org.apache.tools.ant.types.resources.selectors">
-            <name name="f?" />
-            <size size="3" />
+            <name name="f?"/>
+            <size size="3"/>
           </or>
         </restrict>
       </resourcecount>
@@ -235,13 +235,13 @@
       <resourcecount when="equal" count="2">
         <restrict>
           <resources>
-            <string value="fee" />
-            <resource name="fi" size="3" />
-            <resource name="fo" />
-            <resource name="fum" />
+            <string value="fee"/>
+            <resource name="fi" size="3"/>
+            <resource name="fo"/>
+            <resource name="fum"/>
           </resources>
           <not xmlns="antlib:org.apache.tools.ant.types.resources.selectors">
-            <size size="3" />
+            <size size="3"/>
           </not>
         </restrict>
       </resourcecount>
@@ -253,14 +253,14 @@
       <resourcecount when="equal" count="1">
         <restrict>
           <resources>
-            <string value="fee" />
-            <resource name="fi" size="3" />
-            <resource name="fo" />
-            <resource name="fum" />
+            <string value="fee"/>
+            <resource name="fi" size="3"/>
+            <resource name="fo"/>
+            <resource name="fum"/>
           </resources>
           <none xmlns="antlib:org.apache.tools.ant.types.resources.selectors">
-            <name name="f?" />
-            <size size="3" />
+            <name name="f?"/>
+            <size size="3"/>
           </none>
         </restrict>
       </resourcecount>
@@ -272,15 +272,15 @@
       <resourcecount when="equal" count="2">
         <restrict>
           <resources>
-            <string value="fee" />
-            <resource name="fi" size="3" />
-            <resource name="fo" />
-            <resource name="fum" />
+            <string value="fee"/>
+            <resource name="fi" size="3"/>
+            <resource name="fo"/>
+            <resource name="fum"/>
           </resources>
           <majority xmlns="antlib:org.apache.tools.ant.types.resources.selectors">
-            <name name="f?" />
-            <size size="3" />
-            <instanceof type="string" />
+            <name name="f?"/>
+            <size size="3"/>
+            <instanceof type="string"/>
           </majority>
         </restrict>
       </resourcecount>
@@ -292,15 +292,15 @@
       <resourcecount when="equal" count="3">
         <restrict>
           <resources>
-            <string value="fee" />
-            <resource name="fi" size="3" />
-            <resource name="fo" />
-            <resource name="fum" />
+            <string value="fee"/>
+            <resource name="fi" size="3"/>
+            <resource name="fo"/>
+            <resource name="fum"/>
           </resources>
           <majority>
-            <name name="f?" />
-            <size size="3" />
-            <instanceof type="resource" />
+            <name name="f?"/>
+            <size size="3"/>
+            <instanceof type="resource"/>
           </majority>
         </restrict>
       </resourcecount>
@@ -312,16 +312,16 @@
       <resourcecount when="equal" count="3">
         <restrict>
           <resources>
-            <string value="fee" />
-            <resource name="fi" size="3" />
-            <resource name="fo" />
-            <resource name="fum" />
+            <string value="fee"/>
+            <resource name="fi" size="3"/>
+            <resource name="fo"/>
+            <resource name="fum"/>
           </resources>
           <majority allowtie="true">
-            <name name="f?" />
-            <size size="3" />
-            <instanceof type="string" />
-            <exists />
+            <name name="f?"/>
+            <size size="3"/>
+            <instanceof type="string"/>
+            <exists/>
           </majority>
         </restrict>
       </resourcecount>
@@ -333,16 +333,16 @@
       <resourcecount when="equal" count="2">
         <restrict>
           <resources>
-            <string value="fee" />
-            <resource name="fi" size="3" />
-            <resource name="fo" />
-            <resource name="fum" />
+            <string value="fee"/>
+            <resource name="fi" size="3"/>
+            <resource name="fo"/>
+            <resource name="fum"/>
           </resources>
           <majority allowtie="false">
-            <name name="f?" />
-            <size size="3" />
-            <instanceof type="string" />
-            <exists />
+            <name name="f?"/>
+            <size size="3"/>
+            <instanceof type="string"/>
+            <exists/>
           </majority>
         </restrict>
       </resourcecount>
@@ -354,9 +354,9 @@
       <resourcecount when="equal" count="2">
         <restrict>
           <resources>
-            <string value="foo" />
-            <string value="bar" />
-            <string value="baz" />
+            <string value="foo"/>
+            <string value="bar"/>
+            <string value="baz"/>
           </resources>
           <contains text="b"/>
         </restrict>
@@ -369,9 +369,9 @@
       <resourcecount when="equal" count="2">
         <restrict>
           <resources>
-            <string value="foo" />
-            <string value="bar" />
-            <string value="baz" />
+            <string value="foo"/>
+            <string value="bar"/>
+            <string value="baz"/>
           </resources>
           <containsregexp expression="^b..$"/>
         </restrict>
@@ -386,14 +386,14 @@
         <resourcecount count="3">
           <restrict>
             <compare when="greater" against="each">
-              <control><string value="b" /></control>
+              <control><string value="b"/></control>
             </compare>
             <resources>
-              <string value="a" />
-              <string value="b" />
-              <string value="c" />
-              <string value="d" />
-              <string value="e" />
+              <string value="a"/>
+              <string value="b"/>
+              <string value="c"/>
+              <string value="d"/>
+              <string value="e"/>
             </resources>
           </restrict>
         </resourcecount>
@@ -401,15 +401,15 @@
         <resourcecount count="5">
           <restrict>
             <compare>
-              <control><string value="." /></control>
-              <size />
+              <control><string value="."/></control>
+              <size/>
             </compare>
             <resources>
-              <string value="a" />
-              <string value="b" />
-              <string value="c" />
-              <string value="d" />
-              <string value="e" />
+              <string value="a"/>
+              <string value="b"/>
+              <string value="c"/>
+              <string value="d"/>
+              <string value="e"/>
             </resources>
           </restrict>
         </resourcecount>
@@ -418,22 +418,22 @@
           <restrict>
             <compare when="greater" against="each">
               <control>
-                <string value="a" />
-                <string value="b" />
-                <string value="bb" />
-                <string value="c" />
-                <string value="ccc" />
+                <string value="a"/>
+                <string value="b"/>
+                <string value="bb"/>
+                <string value="c"/>
+                <string value="ccc"/>
               </control>
-              <name />
-              <size />
+              <name/>
+              <size/>
             </compare>
             <resources>
-              <string value="a" />
-              <string value="bbbb" />
-              <string value="ccc" />
-              <string value="cccc" />
-              <string value="d" />
-              <string value="e" />
+              <string value="a"/>
+              <string value="bbbb"/>
+              <string value="ccc"/>
+              <string value="cccc"/>
+              <string value="d"/>
+              <string value="e"/>
             </resources>
           </restrict>
         </resourcecount>
@@ -442,17 +442,17 @@
   </target>
 
   <target name="majority"
-          depends="testmajority1,testmajority2,testmajority3,testmajority4" />
+          depends="testmajority1,testmajority2,testmajority3,testmajority4"/>
 
   <target name="logical"
-          depends="testand,testor,testnone,testnot,majority" />
+          depends="testand,testor,testnone,testnot,majority"/>
 
   <target name="all"
-    depends="name,testexists,instanceof,testtype,testdate,testsize,testcontains,testcontainsregexp,logical,testcompare" />
+    depends="name,testexists,instanceof,testtype,testdate,testsize,testcontains,testcontainsregexp,logical,testcompare"/>
 
-  <!-- 
-    The tests for oata.types.selectors.ModifiedSelectorTest as 
-    ResourceSelector are in its test-buildfile src\etc\testcases\types\selectors.xml. 
+  <!--
+    The tests for oata.types.selectors.ModifiedSelectorTest as
+    ResourceSelector are in its test-buildfile src\etc\testcases\types\selectors.xml.
   -->
 
 </project>
diff --git a/src/tests/antunit/types/resources/selectors/test.xml b/src/tests/antunit/types/resources/selectors/test.xml
index 24b804a36..fb022ba1b 100644
--- a/src/tests/antunit/types/resources/selectors/test.xml
+++ b/src/tests/antunit/types/resources/selectors/test.xml
@@ -19,29 +19,29 @@
          xmlns:rsel="antlib:org.apache.tools.ant.types.resources.selectors"
          xmlns:rcmp="antlib:org.apache.tools.ant.types.resources.comparators">
 
-  <import file="../../../antunit-base.xml" />
+  <import file="../../../antunit-base.xml"/>
 
-  <available property="jdk1.4+" classname="java.lang.CharSequence"/>  
+  <available property="jdk1.4+" classname="java.lang.CharSequence"/>
   <condition property="some.regexp.support">
     <or>
       <isset property="jdk1.4+"/>
       <isset property="apache.regexp.present"/>
       <isset property="apache.oro.present"/>
     </or>
-  </condition>    
-    
+  </condition>
+
   <target name="testname1">
     <au:assertTrue>
       <resourcecount when="equal" count="2">
         <restrict>
           <resources>
-            <resource name="foo" />
-            <resource name="bar" />
-            <resource name="baz" />
-            <resource name="boo" />
-            <resource name="bang" />
+            <resource name="foo"/>
+            <resource name="bar"/>
+            <resource name="baz"/>
+            <resource name="boo"/>
+            <resource name="bang"/>
           </resources>
-          <rsel:name name="ba?" />
+          <rsel:name name="ba?"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -52,28 +52,28 @@
       <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>
-          <rsel:name name="foo" />
+          <rsel:name name="foo"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
   </target>
 
-  <target name="name" depends="testname1,testname2" />
+  <target name="name" depends="testname1,testname2"/>
 
   <target name="testexists">
     <au:assertTrue>
       <resourcecount when="equal" count="1">
         <restrict>
           <resources>
-            <file file="idonotexist" />
-            <resource name="foo" />
-            <resource name="foo" exists="false" />
+            <file file="idonotexist"/>
+            <resource name="foo"/>
+            <resource name="foo" exists="false"/>
           </resources>
-          <rsel:exists />
+          <rsel:exists/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -84,13 +84,13 @@
       <resourcecount when="equal" count="2">
         <restrict>
           <resources>
-            <file file="foo" />
-            <url url="http://ant.apache.org/index.html" />
-            <resource name="foo" />
-            <string value="foo" />
-            <file file="bar" />
+            <file file="foo"/>
+            <url url="http://ant.apache.org/index.html"/>
+            <resource name="foo"/>
+            <string value="foo"/>
+            <file file="bar"/>
           </resources>
-          <rsel:instanceof type="file" />
+          <rsel:instanceof type="file"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -98,15 +98,15 @@
 
   <target name="testinstanceoftype2">
     <typedef name="file" uri="test"
-             classname="org.apache.tools.ant.types.resources.FileResource" />
+             classname="org.apache.tools.ant.types.resources.FileResource"/>
     <au:assertTrue>
       <resourcecount when="equal" count="1">
         <restrict>
           <resources>
-            <url file="foo" />
-            <file file="bar" xmlns="test" />
+            <url file="foo"/>
+            <file file="bar" xmlns="test"/>
           </resources>
-          <rsel:instanceof type="test:file" />
+          <rsel:instanceof type="test:file"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -114,66 +114,66 @@
 
   <target name="testinstanceoftype3">
     <typedef name="file" uri="test"
-             classname="org.apache.tools.ant.types.resources.FileResource" />
+             classname="org.apache.tools.ant.types.resources.FileResource"/>
     <au:assertTrue>
       <resourcecount when="equal" count="1">
         <restrict>
           <resources>
-            <url file="foo" />
-            <file file="bar" xmlns="test" />
+            <url file="foo"/>
+            <file file="bar" xmlns="test"/>
           </resources>
-          <rsel:instanceof type="file" uri="test" />
+          <rsel:instanceof type="file" uri="test"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
   </target>
 
   <target name="instanceoftype"
-    depends="testinstanceoftype1,testinstanceoftype2,testinstanceoftype3" />
+    depends="testinstanceoftype1,testinstanceoftype2,testinstanceoftype3"/>
 
   <target name="testinstanceofclass">
     <au:assertTrue>
       <resourcecount when="equal" count="7">
         <restrict>
           <resources>
-            <filelist dir="${basedir}" files="a,b,c,d,e,f,g" />
+            <filelist dir="${basedir}" files="a,b,c,d,e,f,g"/>
           </resources>
-          <rsel:instanceof class="org.apache.tools.ant.types.Resource" />
+          <rsel:instanceof class="org.apache.tools.ant.types.Resource"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
   </target>
 
-  <target name="instanceof" depends="instanceoftype,testinstanceofclass" />
+  <target name="instanceof" depends="instanceoftype,testinstanceofclass"/>
 
   <target name="testtype">
     <resources id="testtype">
-       <file file="${basedir}" />
-       <file file="${ant.file}" />
-       <resource directory="true" />
-       <resource directory="false" />
+       <file file="${basedir}"/>
+       <file file="${ant.file}"/>
+       <resource directory="true"/>
+       <resource directory="false"/>
     </resources>
     <au:assertTrue>
       <resourcecount when="equal" count="2">
         <restrict>
-          <resources refid="testtype" />
-          <rsel:type type="dir" />
+          <resources refid="testtype"/>
+          <rsel:type type="dir"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
     <au:assertTrue>
       <resourcecount when="equal" count="2">
         <restrict>
-          <resources refid="testtype" />
-          <rsel:type type="file" />
+          <resources refid="testtype"/>
+          <rsel:type type="file"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
     <au:assertTrue>
       <resourcecount when="equal" count="4">
         <restrict>
-          <resources refid="testtype" />
-          <rsel:type type="any" />
+          <resources refid="testtype"/>
+          <rsel:type type="any"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -184,13 +184,13 @@
       <resourcecount when="equal" count="3">
         <restrict>
           <resources>
-             <resource lastmodified="4" />
-             <resource lastmodified="5" />
-             <resource lastmodified="6" />
-             <resource lastmodified="7" />
-             <resource lastmodified="8" />
+             <resource lastmodified="4"/>
+             <resource lastmodified="5"/>
+             <resource lastmodified="6"/>
+             <resource lastmodified="7"/>
+             <resource lastmodified="8"/>
           </resources>
-          <rsel:date when="after" millis="5" granularity="0" />
+          <rsel:date when="after" millis="5" granularity="0"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -201,13 +201,13 @@
       <resourcecount when="equal" count="4">
         <restrict>
           <resources>
-             <resource size="4" />
-             <resource size="5" />
-             <resource size="6" />
-             <resource size="7" />
-             <resource size="8" />
+             <resource size="4"/>
+             <resource size="5"/>
+             <resource size="6"/>
+             <resource size="7"/>
+             <resource size="8"/>
           </resources>
-          <rsel:size when="le" size="7" />
+          <rsel:size when="le" size="7"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -218,14 +218,14 @@
       <resourcecount when="equal" count="1">
         <restrict>
           <resources>
-            <string value="fee" />
-            <resource name="fi" size="3" />
-            <resource name="fo" />
-            <resource name="fum" />
+            <string value="fee"/>
+            <resource name="fi" size="3"/>
+            <resource name="fo"/>
+            <resource name="fum"/>
           </resources>
           <and xmlns="antlib:org.apache.tools.ant.types.resources.selectors">
-            <name name="f?" />
-            <size size="3" />
+            <name name="f?"/>
+            <size size="3"/>
           </and>
         </restrict>
       </resourcecount>
@@ -237,14 +237,14 @@
       <resourcecount when="equal" count="3">
         <restrict>
           <resources>
-            <string value="fee" />
-            <resource name="fi" size="3" />
-            <resource name="fo" />
-            <resource name="fum" />
+            <string value="fee"/>
+            <resource name="fi" size="3"/>
+            <resource name="fo"/>
+            <resource name="fum"/>
           </resources>
           <or xmlns="antlib:org.apache.tools.ant.types.resources.selectors">
-            <name name="f?" />
-            <size size="3" />
+            <name name="f?"/>
+            <size size="3"/>
           </or>
         </restrict>
       </resourcecount>
@@ -256,13 +256,13 @@
       <resourcecount when="equal" count="2">
         <restrict>
           <resources>
-            <string value="fee" />
-            <resource name="fi" size="3" />
-            <resource name="fo" />
-            <resource name="fum" />
+            <string value="fee"/>
+            <resource name="fi" size="3"/>
+            <resource name="fo"/>
+            <resource name="fum"/>
           </resources>
           <not xmlns="antlib:org.apache.tools.ant.types.resources.selectors">
-            <size size="3" />
+            <size size="3"/>
           </not>
         </restrict>
       </resourcecount>
@@ -274,14 +274,14 @@
       <resourcecount when="equal" count="1">
         <restrict>
           <resources>
-            <string value="fee" />
-            <resource name="fi" size="3" />
-            <resource name="fo" />
-            <resource name="fum" />
+            <string value="fee"/>
+            <resource name="fi" size="3"/>
+            <resource name="fo"/>
+            <resource name="fum"/>
           </resources>
           <none xmlns="antlib:org.apache.tools.ant.types.resources.selectors">
-            <name name="f?" />
-            <size size="3" />
+            <name name="f?"/>
+            <size size="3"/>
           </none>
         </restrict>
       </resourcecount>
@@ -293,15 +293,15 @@
       <resourcecount when="equal" count="2">
         <restrict>
           <resources>
-            <string value="fee" />
-            <resource name="fi" size="3" />
-            <resource name="fo" />
-            <resource name="fum" />
+            <string value="fee"/>
+            <resource name="fi" size="3"/>
+            <resource name="fo"/>
+            <resource name="fum"/>
           </resources>
           <majority xmlns="antlib:org.apache.tools.ant.types.resources.selectors">
-            <name name="f?" />
-            <size size="3" />
-            <instanceof type="string" />
+            <name name="f?"/>
+            <size size="3"/>
+            <instanceof type="string"/>
           </majority>
         </restrict>
       </resourcecount>
@@ -313,15 +313,15 @@
       <resourcecount when="equal" count="3">
         <restrict>
           <resources>
-            <string value="fee" />
-            <resource name="fi" size="3" />
-            <resource name="fo" />
-            <resource name="fum" />
+            <string value="fee"/>
+            <resource name="fi" size="3"/>
+            <resource name="fo"/>
+            <resource name="fum"/>
           </resources>
           <majority xmlns="antlib:org.apache.tools.ant.types.resources.selectors">
-            <name name="f?" />
-            <size size="3" />
-            <instanceof type="resource" />
+            <name name="f?"/>
+            <size size="3"/>
+            <instanceof type="resource"/>
           </majority>
         </restrict>
       </resourcecount>
@@ -333,17 +333,17 @@
       <resourcecount when="equal" count="3">
         <restrict>
           <resources>
-            <string value="fee" />
-            <resource name="fi" size="3" />
-            <resource name="fo" />
-            <resource name="fum" />
+            <string value="fee"/>
+            <resource name="fi" size="3"/>
+            <resource name="fo"/>
+            <resource name="fum"/>
           </resources>
           <majority allowtie="true"
               xmlns="antlib:org.apache.tools.ant.types.resources.selectors">
-            <name name="f?" />
-            <size size="3" />
-            <instanceof type="string" />
-            <exists />
+            <name name="f?"/>
+            <size size="3"/>
+            <instanceof type="string"/>
+            <exists/>
           </majority>
         </restrict>
       </resourcecount>
@@ -355,17 +355,17 @@
       <resourcecount when="equal" count="2">
         <restrict>
           <resources>
-            <string value="fee" />
-            <resource name="fi" size="3" />
-            <resource name="fo" />
-            <resource name="fum" />
+            <string value="fee"/>
+            <resource name="fi" size="3"/>
+            <resource name="fo"/>
+            <resource name="fum"/>
           </resources>
           <majority allowtie="false"
               xmlns="antlib:org.apache.tools.ant.types.resources.selectors">
-            <name name="f?" />
-            <size size="3" />
-            <instanceof type="string" />
-            <exists />
+            <name name="f?"/>
+            <size size="3"/>
+            <instanceof type="string"/>
+            <exists/>
           </majority>
         </restrict>
       </resourcecount>
@@ -377,12 +377,12 @@
       <resourcecount when="equal" count="2">
         <restrict>
           <resources>
-            <string value="foo" />
-            <string value="bar" />
-            <string value="baz" />
+            <string value="foo"/>
+            <string value="bar"/>
+            <string value="baz"/>
           </resources>
           <contains text="b"
-              xmlns="antlib:org.apache.tools.ant.types.resources.selectors" />
+              xmlns="antlib:org.apache.tools.ant.types.resources.selectors"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -393,12 +393,12 @@
       <resourcecount when="equal" count="2">
         <restrict>
           <resources>
-            <string value="foo" />
-            <string value="bar" />
-            <string value="baz" />
+            <string value="foo"/>
+            <string value="bar"/>
+            <string value="baz"/>
           </resources>
           <containsregexp expression="^b..$"
-              xmlns="antlib:org.apache.tools.ant.types.resources.selectors" />
+              xmlns="antlib:org.apache.tools.ant.types.resources.selectors"/>
         </restrict>
       </resourcecount>
     </au:assertTrue>
@@ -411,14 +411,14 @@
         <resourcecount count="3">
           <restrict>
             <rsel:compare when="greater" against="each">
-              <control><string value="b" /></control>
+              <control><string value="b"/></control>
             </rsel:compare>
             <resources>
-              <string value="a" />
-              <string value="b" />
-              <string value="c" />
-              <string value="d" />
-              <string value="e" />
+              <string value="a"/>
+              <string value="b"/>
+              <string value="c"/>
+              <string value="d"/>
+              <string value="e"/>
             </resources>
           </restrict>
         </resourcecount>
@@ -426,15 +426,15 @@
         <resourcecount count="5">
           <restrict>
             <rsel:compare>
-              <control><string value="." /></control>
-              <rcmp:size />
+              <control><string value="."/></control>
+              <rcmp:size/>
             </rsel:compare>
             <resources>
-              <string value="a" />
-              <string value="b" />
-              <string value="c" />
-              <string value="d" />
-              <string value="e" />
+              <string value="a"/>
+              <string value="b"/>
+              <string value="c"/>
+              <string value="d"/>
+              <string value="e"/>
             </resources>
           </restrict>
         </resourcecount>
@@ -443,22 +443,22 @@
           <restrict>
             <rsel:compare when="greater" against="each">
               <control>
-                <string value="a" />
-                <string value="b" />
-                <string value="bb" />
-                <string value="c" />
-                <string value="ccc" />
+                <string value="a"/>
+                <string value="b"/>
+                <string value="bb"/>
+                <string value="c"/>
+                <string value="ccc"/>
               </control>
-              <rcmp:name />
-              <rcmp:size />
+              <rcmp:name/>
+              <rcmp:size/>
             </rsel:compare>
             <resources>
-              <string value="a" />
-              <string value="bbbb" />
-              <string value="ccc" />
-              <string value="cccc" />
-              <string value="d" />
-              <string value="e" />
+              <string value="a"/>
+              <string value="bbbb"/>
+              <string value="ccc"/>
+              <string value="cccc"/>
+              <string value="d"/>
+              <string value="e"/>
             </resources>
           </restrict>
         </resourcecount>
@@ -467,17 +467,17 @@
   </target>
 
   <target name="majority"
-          depends="testmajority1,testmajority2,testmajority3,testmajority4" />
+          depends="testmajority1,testmajority2,testmajority3,testmajority4"/>
 
   <target name="logical"
-          depends="testand,testor,testnone,testnot,majority" />
+          depends="testand,testor,testnone,testnot,majority"/>
 
   <target name="all"
-    depends="name,testexists,instanceof,testtype,testdate,testsize,testcontains,testcontainsregexp,logical,testcompare" />
+    depends="name,testexists,instanceof,testtype,testdate,testsize,testcontains,testcontainsregexp,logical,testcompare"/>
 
-  <!-- 
-    The tests for oata.types.selectors.ModifiedSelectorTest as 
-    ResourceSelector are in its test-buildfile src\etc\testcases\types\selectors.xml. 
+  <!--
+    The tests for oata.types.selectors.ModifiedSelectorTest as
+    ResourceSelector are in its test-buildfile src\etc\testcases\types\selectors.xml.
   -->
 
 </project>
diff --git a/src/tests/antunit/types/resources/test.xml b/src/tests/antunit/types/resources/test.xml
index 5af37b9ad..22a00e9e9 100644
--- a/src/tests/antunit/types/resources/test.xml
+++ b/src/tests/antunit/types/resources/test.xml
@@ -17,14 +17,14 @@
 -->
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
 
-  <import file="../../antunit-base.xml" />
-
-  <property name="dirname" value="work" />
-  <property name="dir" location="${output}/${dirname}" />
-  <property name="zip" location="${output}/${dirname}.zip" />
-  <property name="jar" location="${antunit.tmpdir}/${dirname}.jar" />
-  <property name="file" location="${output}/${dirname}/file.txt" />
-    
+  <import file="../../antunit-base.xml"/>
+
+  <property name="dirname" value="work"/>
+  <property name="dir" location="${output}/${dirname}"/>
+  <property name="zip" location="${output}/${dirname}.zip"/>
+  <property name="jar" location="${antunit.tmpdir}/${dirname}.jar"/>
+  <property name="file" location="${output}/${dirname}/file.txt"/>
+
   <condition property="offline">
     <not>
       <or>
@@ -37,45 +37,45 @@
   <target name="setUp">
 
     <touch mkdirs="true">
-      <filelist dir="${dir}/foo/a" files="x,y,z" />
+      <filelist dir="${dir}/foo/a" files="x,y,z"/>
     </touch>
 
     <copy todir="${dir}/foo" enablemultiplemappings="true">
-      <fileset dir="${dir}/foo" />
+      <fileset dir="${dir}/foo"/>
       <mapper>
-        <globmapper handledirsep="true" from="a/*" to="b/*" />
-        <globmapper handledirsep="true" from="a/*" to="c/*" />
+        <globmapper handledirsep="true" from="a/*" to="b/*"/>
+        <globmapper handledirsep="true" from="a/*" to="c/*"/>
       </mapper>
     </copy>
 
     <copy todir="${dir}/bar">
-      <fileset dir="${dir}/foo" />
+      <fileset dir="${dir}/foo"/>
     </copy>
 
-    <property name="foo" location="${dir}/foo" />
-    <property name="foo.a" location="${dir}/foo/a" />
-    <property name="foo.b" location="${dir}/foo/b" />
-    <property name="foo.c" location="${dir}/foo/c" />
+    <property name="foo" location="${dir}/foo"/>
+    <property name="foo.a" location="${dir}/foo/a"/>
+    <property name="foo.b" location="${dir}/foo/b"/>
+    <property name="foo.c" location="${dir}/foo/c"/>
 
-    <property name="bar" location="${dir}/bar" />
-    <property name="bar.a" location="${dir}/bar/a" />
-    <property name="bar.b" location="${dir}/bar/b" />
-    <property name="bar.c" location="${dir}/bar/c" />
+    <property name="bar" location="${dir}/bar"/>
+    <property name="bar.a" location="${dir}/bar/a"/>
+    <property name="bar.b" location="${dir}/bar/b"/>
+    <property name="bar.c" location="${dir}/bar/c"/>
   </target>
 
   <target name="tearDown">
-    <delete dir="${dir}" />
-    <delete file="${zip}" />
-    <delete file="${jar}" deleteonexit="true" />
-    <delete file="${file}" />
+    <delete dir="${dir}"/>
+    <delete file="${zip}"/>
+    <delete file="${jar}" deleteonexit="true"/>
+    <delete file="${file}"/>
   </target>
 
   <target name="testfiles1" depends="setUp">
     <au:assertTrue>
       <resourcecount count="26">
         <files>
-          <include name="${dir}/foo/" />
-          <include name="${dir}/bar/" />
+          <include name="${dir}/foo/"/>
+          <include name="${dir}/bar/"/>
         </files>
       </resourcecount>
     </au:assertTrue>
@@ -85,9 +85,9 @@
     <au:assertTrue>
       <resourcecount count="8">
         <files>
-          <include name="${dir}/foo/" />
-          <include name="${dir}/bar/" />
-          <type type="dir" />
+          <include name="${dir}/foo/"/>
+          <include name="${dir}/bar/"/>
+          <type type="dir"/>
         </files>
       </resourcecount>
     </au:assertTrue>
@@ -97,9 +97,9 @@
     <au:assertTrue>
       <resourcecount count="18">
         <files>
-          <include name="${dir}/foo/" />
-          <include name="${dir}/bar/" />
-          <type type="file" />
+          <include name="${dir}/foo/"/>
+          <include name="${dir}/bar/"/>
+          <type type="file"/>
         </files>
       </resourcecount>
     </au:assertTrue>
@@ -110,13 +110,13 @@
       <resourcecount count="27"><!-- include duplicates! -->
         <resources>
           <files>
-            <include name="${dir}/foo/" />
-            <include name="${dir}/bar/" />
-            <type type="file" />
+            <include name="${dir}/foo/"/>
+            <include name="${dir}/bar/"/>
+            <type type="file"/>
           </files>
           <files>
-            <include name="${dir}/foo/" />
-            <type type="file" />
+            <include name="${dir}/foo/"/>
+            <type type="file"/>
           </files>
         </resources>
       </resourcecount>
@@ -125,13 +125,13 @@
 
   <target name="testresourcesref" depends="setUp">
     <files id="files">
-      <include name="${dir}/foo/" />
-      <include name="${dir}/bar/" />
-      <type type="file" />
+      <include name="${dir}/foo/"/>
+      <include name="${dir}/bar/"/>
+      <type type="file"/>
     </files>
     <au:assertTrue>
       <resourcecount count="18">
-        <resources refid="files" />
+        <resources refid="files"/>
       </resourcecount>
     </au:assertTrue>
   </target>
@@ -139,7 +139,7 @@
   <target name="testfileset" depends="setUp">
     <au:assertTrue>
       <resourcecount count="9">
-        <fileset dir="${dir}/foo" />
+        <fileset dir="${dir}/foo"/>
       </resourcecount>
     </au:assertTrue>
   </target>
@@ -147,7 +147,7 @@
   <target name="testdirset" depends="setUp">
     <au:assertTrue>
       <resourcecount count="4">
-        <dirset dir="${dir}/foo" />
+        <dirset dir="${dir}/foo"/>
       </resourcecount>
     </au:assertTrue>
   </target>
@@ -155,7 +155,7 @@
   <target name="testfilelist">
     <au:assertTrue>
       <resourcecount count="5">
-        <filelist dir="${dir}/foo" files="1,2,3,4,5" />
+        <filelist dir="${dir}/foo" files="1,2,3,4,5"/>
       </resourcecount>
     </au:assertTrue>
   </target>
@@ -165,11 +165,11 @@
       <resourcecount count="24">
         <path>
           <path id="p">
-            <fileset id="fs" dir="${foo.a}" /> <!-- 3 -->
-            <dirset id="ds" dir="${foo}" /> <!-- 4 -->
+            <fileset id="fs" dir="${foo.a}"/> <!-- 3 -->
+            <dirset id="ds" dir="${foo}"/> <!-- 4 -->
           </path>
-          <pathelement id="pe" location="${dir}" /> <!-- 1 -->
-          <filelist id="fl" dir="${bar}" files="1,2,3,a,b,c" /> <!-- 6 -->
+          <pathelement id="pe" location="${dir}"/> <!-- 1 -->
+          <filelist id="fl" dir="${bar}" files="1,2,3,a,b,c"/> <!-- 6 -->
           <files id="f"> <!-- 13; 3 overlap fl -->
             <include name="${bar}/"/>
           </files>
@@ -179,31 +179,31 @@
   </target>
 
   <target name="createzip" depends="setUp">
-    <zip destfile="${zip}" basedir="${dir}" />
+    <zip destfile="${zip}" basedir="${dir}"/>
   </target>
 
   <target name="testzipfileset" depends="createzip">
     <au:assertTrue>
       <resourcecount count="9">
-        <zipfileset src="${zip}" includes="foo/" />
+        <zipfileset src="${zip}" includes="foo/"/>
       </resourcecount>
     </au:assertTrue>
   </target>
 
   <target name="testpropertyset">
-    <property name="testpropertyset.a" value="a" />
-    <property name="testpropertyset.aa" value="aa" />
-    <property name="testpropertyset.aaa" value="aaa" />
+    <property name="testpropertyset.a" value="a"/>
+    <property name="testpropertyset.aa" value="aa"/>
+    <property name="testpropertyset.aaa" value="aaa"/>
     <propertyset id="testpropertyset">
-      <propertyref prefix="testpropertyset." />
+      <propertyref prefix="testpropertyset."/>
     </propertyset>
     <au:assertTrue>
       <and>
-        <resourcecount refid="testpropertyset" count="3" />
+        <resourcecount refid="testpropertyset" count="3"/>
         <length length="12">
           <resources>
-            <resources refid="testpropertyset" />
-            <propertyset refid="testpropertyset" />
+            <resources refid="testpropertyset"/>
+            <propertyset refid="testpropertyset"/>
           </resources>
         </length>
       </and>
@@ -218,8 +218,8 @@
             <include name="${foo.a}/w"/>
             <include name="${foo.a}/x"/>
           </files>
-          <fileset dir="${foo.a}" includes="x,y" /> <!-- 2; net 1 -->
-          <filelist dir="${foo.a}" files="v" /> <!-- 1 -->
+          <fileset dir="${foo.a}" includes="x,y"/> <!-- 2; net 1 -->
+          <filelist dir="${foo.a}" files="v"/> <!-- 1 -->
           <files>  <!-- 2; net 1 -->
             <include name="${foo.a}/y"/>
             <include name="${foo.a}/z"/>
@@ -233,9 +233,9 @@
     <au:assertTrue>
       <resourcecount count="3">
         <intersect>
-          <filelist dir="${dir}" files="1,2,3,4,5" />
-          <filelist dir="${dir}" files="2,3,4,5,6" />
-          <filelist dir="${dir}" files="3,4,5,6,7" />
+          <filelist dir="${dir}" files="1,2,3,4,5"/>
+          <filelist dir="${dir}" files="2,3,4,5,6"/>
+          <filelist dir="${dir}" files="3,4,5,6,7"/>
         </intersect>
       </resourcecount>
     </au:assertTrue>
@@ -245,9 +245,9 @@
     <au:assertTrue>
       <resourcecount count="2">
         <difference id="diff">
-          <filelist dir="${dir}" files="1,2,3,4,5" />
-          <filelist dir="${dir}" files="2,3,4,5,6" />
-          <filelist dir="${dir}" files="3,4,5,6,7" />
+          <filelist dir="${dir}" files="1,2,3,4,5"/>
+          <filelist dir="${dir}" files="2,3,4,5,6"/>
+          <filelist dir="${dir}" files="3,4,5,6,7"/>
         </difference>
       </resourcecount>
     </au:assertTrue>
@@ -256,16 +256,16 @@
   <target name="testfileurl">
     <au:assertTrue>
       <length when="greater" length="0">
-        <url file="${ant.file}" />
+        <url file="${ant.file}"/>
       </length>
     </au:assertTrue>
   </target>
 
   <target name="testfileurlref">
-    <url id="fileurl" file="${ant.file}" />
+    <url id="fileurl" file="${ant.file}"/>
     <au:assertTrue>
       <length when="greater" length="0">
-        <url refid="fileurl" />
+        <url refid="fileurl"/>
       </length>
     </au:assertTrue>
   </target>
@@ -273,38 +273,38 @@
   <target name="testhttpurl1" unless="offline">
     <au:assertTrue>
       <length when="greater" length="0">
-        <url url="http://www.w3.org/MarkUp/" />
+        <url url="http://www.w3.org/MarkUp/"/>
       </length>
     </au:assertTrue>
   </target>
 
   <target name="testhttpurl2" unless="offline">
     <concat destfile="${file}" force="true" append="false">
-      <url id="httpurl" url="http://ant.apache.org/index.html" />
-      <url refid="httpurl" />
+      <url id="httpurl" url="http://ant.apache.org/index.html"/>
+      <url refid="httpurl"/>
     </concat>
     <length property="httpurl.length">
-      <url refid="httpurl" />
+      <url refid="httpurl"/>
     </length>
     <length property="file.length">
       <file file="${file}"/>
     </length>
     <au:assertTrue message="length of url ${httpurl.length} length of file ${file.length} file should be twice as big">
-      <length file="${file}" when="greater" length="${httpurl.length}" />
+      <length file="${file}" when="greater" length="${httpurl.length}"/>
     </au:assertTrue>
   </target>
 
   <target name="createjar" depends="setUp">
-    <jar destfile="${jar}" basedir="${dir}" />
+    <jar destfile="${jar}" basedir="${dir}"/>
   </target>
 
   <target name="testjarurl" depends="createjar">
     <pathconvert property="jarurl">
-      <url file="${jar}" />
+      <url file="${jar}"/>
     </pathconvert>
     <au:assertTrue>
       <length when="greater" length="0">
-        <url url="jar:${jarurl}!/META-INF/MANIFEST.MF" />
+        <url url="jar:${jarurl}!/META-INF/MANIFEST.MF"/>
       </length>
     </au:assertTrue>
   </target>
@@ -313,7 +313,7 @@
     <echo file="${file}">This is a test.</echo>
     <au:assertTrue>
       <length length="15">
-        <file file="${file}" />
+        <file file="${file}"/>
       </length>
     </au:assertTrue>
   </target>
@@ -321,7 +321,7 @@
   <target name="testzipentry" depends="createjar">
     <au:assertTrue>
       <length when="greater" length="0">
-        <zipentry zipfile="${jar}" name="META-INF/MANIFEST.MF" />
+        <zipentry zipfile="${jar}" name="META-INF/MANIFEST.MF"/>
       </length>
     </au:assertTrue>
   </target>
@@ -329,16 +329,16 @@
   <target name="teststring1">
     <au:assertTrue>
       <length length="15">
-        <string value="This is a test." />
+        <string value="This is a test."/>
       </length>
     </au:assertTrue>
   </target>
 
   <target name="teststring2">
-    <property name="test" value="foo" />
+    <property name="test" value="foo"/>
     <au:assertTrue>
       <length length="14">
-        <string value="This is a ${test}." />
+        <string value="This is a ${test}."/>
       </length>
     </au:assertTrue>
   </target>
@@ -346,26 +346,26 @@
   <target name="testresource">
     <au:assertTrue>
       <length length="4096">
-        <resource size="4096" />
+        <resource size="4096"/>
       </length>
     </au:assertTrue>
   </target>
 
   <target name="testproperty">
-    <property name="testproperty" value="abcdefghij" />
+    <property name="testproperty" value="abcdefghij"/>
     <au:assertTrue>
       <length length="10">
-        <propertyresource name="testproperty" />
+        <propertyresource name="testproperty"/>
       </length>
     </au:assertTrue>
   </target>
 
   <target name="testPropertyResolvedAsResource">
-    <string id="s" value="abcdefghij" />
+    <string id="s" value="abcdefghij"/>
     <au:assertTrue>
       <resourcesmatch>
-        <resource refid="s" />
-        <propertyresource name="ant.refid:s" />
+        <resource refid="s"/>
+        <propertyresource name="ant.refid:s"/>
       </resourcesmatch>
     </au:assertTrue>
   </target>
@@ -374,7 +374,7 @@
     <au:assertTrue>
       <resourcecount count="0">
         <first count="0">
-          <filelist dir="${dir}" files="1,2,3,4,5" />
+          <filelist dir="${dir}" files="1,2,3,4,5"/>
         </first>
       </resourcecount>
     </au:assertTrue>
@@ -384,7 +384,7 @@
     <au:assertTrue>
       <resourcecount count="1">
         <first>
-          <filelist dir="${dir}" files="1,2,3,4,5" />
+          <filelist dir="${dir}" files="1,2,3,4,5"/>
         </first>
       </resourcecount>
     </au:assertTrue>
@@ -394,7 +394,7 @@
     <au:assertTrue>
       <resourcecount count="2">
         <first count="2">
-          <filelist dir="${dir}" files="1,2,3,4,5" />
+          <filelist dir="${dir}" files="1,2,3,4,5"/>
         </first>
       </resourcecount>
     </au:assertTrue>
@@ -418,11 +418,11 @@
     <loadresource property="actual">
       <javaconstant name="org.apache.tools.ant.Main.DEFAULT_BUILD_FILENAME"/>
     </loadresource>
-    <au:assertEquals message="could not read java constant" expected="build.xml" actual="${actual}" />
+    <au:assertEquals message="could not read java constant" expected="build.xml" actual="${actual}"/>
 
-    <!-- 
-    We can't test for special error messages using built-in tasks 
-    because they catch these messages 
+    <!--
+    We can't test for special error messages using built-in tasks
+    because they catch these messages
     -->
     <au:expectfailure>
       <loadresource property="p">
@@ -453,7 +453,7 @@
         <javaconstant name="SomeClass.NOT_STATIC"/>
       </loadresource>
      </au:expectfailure>
-    
+
     <delete dir="${test.tmp.dir}"/>
   </target>
 
diff --git a/src/tests/antunit/types/resources/tokens-test.xml b/src/tests/antunit/types/resources/tokens-test.xml
index 26a300d4c..47840ffca 100644
--- a/src/tests/antunit/types/resources/tokens-test.xml
+++ b/src/tests/antunit/types/resources/tokens-test.xml
@@ -18,12 +18,12 @@
 <project name="test-tokens" default="antunit"
          xmlns:au="antlib:org.apache.ant.antunit">
 
-  <property name="eol" value="${line.separator}" />
+  <property name="eol" value="${line.separator}"/>
 
   <target name="antunit">
     <au:antunit>
-      <au:plainlistener />
-      <file file="${ant.file}" />
+      <au:plainlistener/>
+      <file file="${ant.file}"/>
     </au:antunit>
   </target>
 
@@ -32,12 +32,12 @@
       <resourcecount count="0">
         <difference>
           <tokens>
-            <string value="foo${eol}bar${eol}baz" />
+            <string value="foo${eol}bar${eol}baz"/>
           </tokens>
           <resources>
-            <string value="foo" />
-            <string value="bar" />
-            <string value="baz" />
+            <string value="foo"/>
+            <string value="bar"/>
+            <string value="baz"/>
           </resources>
         </difference>
       </resourcecount>
@@ -53,7 +53,7 @@
             <string>one two three $${bz-62147-four} $${bz-62417-nonexistent-prop}</string>
           </tokens>
           <resources>
-            <string value="one two three $${bz-62147-four} $${bz-62417-nonexistent-prop}" />
+            <string value="one two three $${bz-62147-four} $${bz-62417-nonexistent-prop}"/>
           </resources>
         </difference>
       </resourcecount>
@@ -65,13 +65,13 @@
       <resourcecount count="0">
         <difference>
           <tokens>
-            <string value="foo${eol}bar${eol}baz" />
-            <linetokenizer />
+            <string value="foo${eol}bar${eol}baz"/>
+            <linetokenizer/>
           </tokens>
           <resources>
-            <string value="foo" />
-            <string value="bar" />
-            <string value="baz" />
+            <string value="foo"/>
+            <string value="bar"/>
+            <string value="baz"/>
           </resources>
         </difference>
       </resourcecount>
@@ -83,10 +83,10 @@
       <resourcecount count="1">
         <tokens>
           <resources>
-            <string value="foo${eol}bar${eol}baz" />
-            <file file="${ant.file}" />
+            <string value="foo${eol}bar${eol}baz"/>
+            <file file="${ant.file}"/>
           </resources>
-          <filetokenizer />
+          <filetokenizer/>
         </tokens>
       </resourcecount>
     </au:assertTrue>
@@ -97,13 +97,13 @@
       <resourcecount count="0">
         <difference>
           <tokens>
-            <string value="foo bar baz " />
-            <stringtokenizer />
+            <string value="foo bar baz "/>
+            <stringtokenizer/>
           </tokens>
           <resources>
-            <string value="foo" />
-            <string value="bar" />
-            <string value="baz" />
+            <string value="foo"/>
+            <string value="bar"/>
+            <string value="baz"/>
           </resources>
         </difference>
       </resourcecount>
@@ -115,12 +115,12 @@
       <resourcecount count="0">
         <difference>
           <tokens encoding="utf-16">
-            <file file="utf-16.in" />
+            <file file="utf-16.in"/>
           </tokens>
           <resources>
-            <string value="foo" />
-            <string value="bar" />
-            <string value="baz" />
+            <string value="foo"/>
+            <string value="bar"/>
+            <string value="baz"/>
           </resources>
         </difference>
       </resourcecount>
@@ -131,13 +131,13 @@
     <pathconvert property="sorted" pathsep="${eol}">
       <sort>
         <tokens>
-          <string value="foo bar etc baz" />
-          <stringtokenizer />
+          <string value="foo bar etc baz"/>
+          <stringtokenizer/>
         </tokens>
     </sort>
     </pathconvert>
     <au:assertTrue>
-      <equals arg1="bar${eol}baz${eol}etc${eol}foo" arg2="${sorted}" />
+      <equals arg1="bar${eol}baz${eol}etc${eol}foo" arg2="${sorted}"/>
     </au:assertTrue>
   </target>
 
diff --git a/src/tests/antunit/types/selectors/depend-test.xml b/src/tests/antunit/types/selectors/depend-test.xml
index e868f6a65..a1aa81340 100644
--- a/src/tests/antunit/types/selectors/depend-test.xml
+++ b/src/tests/antunit/types/selectors/depend-test.xml
@@ -17,17 +17,17 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
-  <property name="output.dir" location="output" />
-  <property name="foo.file" location="${output.dir}/foo" />
+  <property name="output.dir" location="output"/>
+  <property name="foo.file" location="${output.dir}/foo"/>
 
   <target name="setUp">
-    <touch file="${foo.file}" mkdirs="true" />
+    <touch file="${foo.file}" mkdirs="true"/>
   </target>
 
   <target name="tearDown">
-    <delete dir="${output.dir}" />
+    <delete dir="${output.dir}"/>
   </target>
 
   <target name="testMapperByTypedef" depends="setUp">
@@ -35,7 +35,7 @@
       <resourcecount count="1">
         <fileset file="${foo.file}">
           <depend targetdir="${basedir}"><!-- dummy targetdir -->
-            <mergemapper to="${ant.file}" />
+            <mergemapper to="${ant.file}"/>
           </depend>
         </fileset>
       </resourcecount>
diff --git a/src/tests/antunit/types/selectors/different-test.xml b/src/tests/antunit/types/selectors/different-test.xml
index c2542d2f9..d032cf478 100644
--- a/src/tests/antunit/types/selectors/different-test.xml
+++ b/src/tests/antunit/types/selectors/different-test.xml
@@ -17,10 +17,10 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
-  <property name="output.dir" location="output" />
-  <property name="foo.file" location="${output.dir}/foo" />
+  <property name="output.dir" location="output"/>
+  <property name="foo.file" location="${output.dir}/foo"/>
 
   <target name="setUp">
     <mkdir dir="${output.dir}"/>
@@ -28,7 +28,7 @@
   </target>
 
   <target name="tearDown">
-    <delete dir="${output.dir}" />
+    <delete dir="${output.dir}"/>
   </target>
 
   <target name="testMapperByTypedef" depends="setUp">
@@ -36,7 +36,7 @@
       <resourcecount count="1">
         <fileset file="${foo.file}">
           <different targetdir="${basedir}"><!-- dummy targetdir -->
-            <mergemapper to="${ant.file}" />
+            <mergemapper to="${ant.file}"/>
           </different>
         </fileset>
       </resourcecount>
diff --git a/src/tests/antunit/types/selectors/executable-test.xml b/src/tests/antunit/types/selectors/executable-test.xml
index 45cbeeb6f..e113ff4ff 100644
--- a/src/tests/antunit/types/selectors/executable-test.xml
+++ b/src/tests/antunit/types/selectors/executable-test.xml
@@ -17,7 +17,7 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <property name="file" value="testfile"/>
 
diff --git a/src/tests/antunit/types/selectors/filename-test.xml b/src/tests/antunit/types/selectors/filename-test.xml
index 3f28e11e4..6ea9f976a 100644
--- a/src/tests/antunit/types/selectors/filename-test.xml
+++ b/src/tests/antunit/types/selectors/filename-test.xml
@@ -17,7 +17,7 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <property name="file" value="testfile"/>
 
diff --git a/src/tests/antunit/types/selectors/modified-test.xml b/src/tests/antunit/types/selectors/modified-test.xml
index a4c43e043..b1fc2377e 100644
--- a/src/tests/antunit/types/selectors/modified-test.xml
+++ b/src/tests/antunit/types/selectors/modified-test.xml
@@ -17,7 +17,7 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <target name="tearDown" depends="antunit-base.tearDown">
     <delete file="cache.properties" quiet="true"/>
diff --git a/src/tests/antunit/types/selectors/ownedby-test.xml b/src/tests/antunit/types/selectors/ownedby-test.xml
index 5ec438190..91c5d1aae 100644
--- a/src/tests/antunit/types/selectors/ownedby-test.xml
+++ b/src/tests/antunit/types/selectors/ownedby-test.xml
@@ -17,7 +17,7 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <property name="file" value="testfile"/>
 
diff --git a/src/tests/antunit/types/selectors/present-test.xml b/src/tests/antunit/types/selectors/present-test.xml
index e31c722dd..4c3021bf1 100644
--- a/src/tests/antunit/types/selectors/present-test.xml
+++ b/src/tests/antunit/types/selectors/present-test.xml
@@ -17,17 +17,17 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
-  <property name="output.dir" location="output" />
-  <property name="foo.file" location="${output.dir}/foo" />
+  <property name="output.dir" location="output"/>
+  <property name="foo.file" location="${output.dir}/foo"/>
 
   <target name="setUp">
-    <touch file="${foo.file}" mkdirs="true" />
+    <touch file="${foo.file}" mkdirs="true"/>
   </target>
 
   <target name="tearDown">
-    <delete dir="${output.dir}" />
+    <delete dir="${output.dir}"/>
   </target>
 
   <target name="testMapperByTypedef" depends="setUp">
@@ -35,7 +35,7 @@
       <resourcecount count="1">
         <fileset file="${foo.file}">
           <present targetdir="${basedir}"><!-- dummy targetdir -->
-            <mergemapper to="${ant.file}" />
+            <mergemapper to="${ant.file}"/>
           </present>
         </fileset>
       </resourcecount>
diff --git a/src/tests/antunit/types/selectors/readwrite-test.xml b/src/tests/antunit/types/selectors/readwrite-test.xml
index 62dc05237..5344a5db1 100644
--- a/src/tests/antunit/types/selectors/readwrite-test.xml
+++ b/src/tests/antunit/types/selectors/readwrite-test.xml
@@ -17,7 +17,7 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <property name="file" value="testfile"/>
 
diff --git a/src/tests/antunit/types/selectors/select-test.xml b/src/tests/antunit/types/selectors/select-test.xml
index f5f5b99e1..0c825f16e 100644
--- a/src/tests/antunit/types/selectors/select-test.xml
+++ b/src/tests/antunit/types/selectors/select-test.xml
@@ -17,7 +17,7 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <target name="setUp">
     <mkdir dir="${input}"/>
diff --git a/src/tests/antunit/types/selectors/symlink-test.xml b/src/tests/antunit/types/selectors/symlink-test.xml
index 0c47326c1..831660332 100644
--- a/src/tests/antunit/types/selectors/symlink-test.xml
+++ b/src/tests/antunit/types/selectors/symlink-test.xml
@@ -17,7 +17,7 @@
 -->
 <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
 
-  <import file="../../antunit-base.xml" />
+  <import file="../../antunit-base.xml"/>
 
   <property name="file" value="testfile"/>
   <property name="link" value="testlink"/>
diff --git a/src/tests/antunit/types/zipfileset-test.xml b/src/tests/antunit/types/zipfileset-test.xml
index c8bb022b1..9ed815a1e 100644
--- a/src/tests/antunit/types/zipfileset-test.xml
+++ b/src/tests/antunit/types/zipfileset-test.xml
@@ -21,8 +21,7 @@
   <target name="test-refid-modify">
     <fileset id="modify-refid-1"
              dir="${basedir}"
-             includes="*.xml"
-             />
+             includes="*.xml"/>
     <zipfileset id="modify-refid-2"
                 refid="modify-refid-1"
                 prefix="WEB-INF/lib/"/>
diff --git a/src/tests/junit/org/example/tasks/antlib.xml b/src/tests/junit/org/example/tasks/antlib.xml
index b920da7eb..d1c286fde 100644
--- a/src/tests/junit/org/example/tasks/antlib.xml
+++ b/src/tests/junit/org/example/tasks/antlib.xml
@@ -23,4 +23,3 @@
    </sequential>
 </macrodef>
 </antlib>
-      
diff --git a/src/tests/junit/org/example/tasks/antlib2.xml b/src/tests/junit/org/example/tasks/antlib2.xml
index b920da7eb..d1c286fde 100644
--- a/src/tests/junit/org/example/tasks/antlib2.xml
+++ b/src/tests/junit/org/example/tasks/antlib2.xml
@@ -23,4 +23,3 @@
    </sequential>
 </macrodef>
 </antlib>
-      
diff --git a/src/tutorial/tasks-filesets-properties/01-propertyaccess/build.xml b/src/tutorial/tasks-filesets-properties/01-propertyaccess/build.xml
index b217c22ce..2ac51b4bb 100644
--- a/src/tutorial/tasks-filesets-properties/01-propertyaccess/build.xml
+++ b/src/tutorial/tasks-filesets-properties/01-propertyaccess/build.xml
@@ -62,8 +62,8 @@
     </target>
 
     <target name="junit" description="Runs the unit tests" depends="jar">
-        <delete dir="${junit.out.dir.xml}" />
-        <mkdir  dir="${junit.out.dir.xml}" />
+        <delete dir="${junit.out.dir.xml}"/>
+        <mkdir  dir="${junit.out.dir.xml}"/>
         <junit printsummary="yes" haltonfailure="no">
             <classpath refid="classpath.test"/>
             <formatter type="xml"/>
@@ -74,7 +74,7 @@
     </target>
 
     <target name="junitreport" description="Create a report for the rest result">
-        <mkdir dir="${junit.out.dir.html}" />
+        <mkdir dir="${junit.out.dir.html}"/>
         <junitreport todir="${junit.out.dir.html}">
             <fileset dir="${junit.out.dir.xml}">
                 <include name="*.xml"/>
diff --git a/src/tutorial/tasks-filesets-properties/02-fileset/build.xml b/src/tutorial/tasks-filesets-properties/02-fileset/build.xml
index a3b3cd71c..7a9519381 100644
--- a/src/tutorial/tasks-filesets-properties/02-fileset/build.xml
+++ b/src/tutorial/tasks-filesets-properties/02-fileset/build.xml
@@ -75,8 +75,8 @@
     </target>
 
     <target name="junit" description="Runs the unit tests" depends="jar">
-        <delete dir="${junit.out.dir.xml}" />
-        <mkdir  dir="${junit.out.dir.xml}" />
+        <delete dir="${junit.out.dir.xml}"/>
+        <mkdir  dir="${junit.out.dir.xml}"/>
         <junit printsummary="yes" haltonfailure="no">
             <classpath refid="classpath.test"/>
             <sysproperty key="ant.home" value="${ant.home}"/>
@@ -88,7 +88,7 @@
     </target>
 
     <target name="junitreport" description="Create a report for the rest result">
-        <mkdir dir="${junit.out.dir.html}" />
+        <mkdir dir="${junit.out.dir.html}"/>
         <junitreport todir="${junit.out.dir.html}">
             <fileset dir="${junit.out.dir.xml}">
                 <include name="*.xml"/>
diff --git a/src/tutorial/tasks-filesets-properties/03-paths/build.xml b/src/tutorial/tasks-filesets-properties/03-paths/build.xml
index 27ff98061..0a6553ed2 100644
--- a/src/tutorial/tasks-filesets-properties/03-paths/build.xml
+++ b/src/tutorial/tasks-filesets-properties/03-paths/build.xml
@@ -82,8 +82,8 @@
     </target>
 
     <target name="junit" description="Runs the unit tests" depends="jar">
-        <delete dir="${junit.out.dir.xml}" />
-        <mkdir  dir="${junit.out.dir.xml}" />
+        <delete dir="${junit.out.dir.xml}"/>
+        <mkdir  dir="${junit.out.dir.xml}"/>
         <junit printsummary="yes" haltonfailure="no">
             <classpath refid="classpath.test"/>
             <sysproperty key="ant.home" value="${ant.home}"/>
@@ -95,7 +95,7 @@
     </target>
 
     <target name="junitreport" description="Create a report for the rest result">
-        <mkdir dir="${junit.out.dir.html}" />
+        <mkdir dir="${junit.out.dir.html}"/>
         <junitreport todir="${junit.out.dir.html}">
             <fileset dir="${junit.out.dir.xml}">
                 <include name="*.xml"/>
diff --git a/src/tutorial/tasks-filesets-properties/04-lists/build.xml b/src/tutorial/tasks-filesets-properties/04-lists/build.xml
index 40a333030..71a2cf10b 100644
--- a/src/tutorial/tasks-filesets-properties/04-lists/build.xml
+++ b/src/tutorial/tasks-filesets-properties/04-lists/build.xml
@@ -134,8 +134,8 @@
     </target>
 
     <target name="junit" description="Runs the unit tests" depends="jar">
-        <delete dir="${junit.out.dir.xml}" />
-        <mkdir  dir="${junit.out.dir.xml}" />
+        <delete dir="${junit.out.dir.xml}"/>
+        <mkdir  dir="${junit.out.dir.xml}"/>
         <junit printsummary="yes" haltonfailure="no">
             <classpath refid="classpath.test"/>
             <sysproperty key="ant.home" value="${ant.home}"/>
@@ -147,7 +147,7 @@
     </target>
 
     <target name="junitreport" description="Create a report for the rest result">
-        <mkdir dir="${junit.out.dir.html}" />
+        <mkdir dir="${junit.out.dir.html}"/>
         <junitreport todir="${junit.out.dir.html}">
             <fileset dir="${junit.out.dir.xml}">
                 <include name="*.xml"/>
diff --git a/src/tutorial/tasks-filesets-properties/final/build.xml b/src/tutorial/tasks-filesets-properties/final/build.xml
index ee695df8c..91c43fc99 100644
--- a/src/tutorial/tasks-filesets-properties/final/build.xml
+++ b/src/tutorial/tasks-filesets-properties/final/build.xml
@@ -134,8 +134,8 @@
     </target>
 
     <target name="junit" description="Runs the unit tests" depends="jar">
-        <delete dir="${junit.out.dir.xml}" />
-        <mkdir  dir="${junit.out.dir.xml}" />
+        <delete dir="${junit.out.dir.xml}"/>
+        <mkdir  dir="${junit.out.dir.xml}"/>
         <junit printsummary="yes" haltonfailure="no">
             <classpath refid="classpath.test"/>
             <sysproperty key="ant.home" value="${ant.home}"/>
@@ -147,7 +147,7 @@
     </target>
 
     <target name="junitreport" description="Create a report for the rest result">
-        <mkdir dir="${junit.out.dir.html}" />
+        <mkdir dir="${junit.out.dir.html}"/>
         <junitreport todir="${junit.out.dir.html}">
             <fileset dir="${junit.out.dir.xml}">
                 <include name="*.xml"/>
diff --git a/src/tutorial/tasks-start-writing/build.xml b/src/tutorial/tasks-start-writing/build.xml
index 3d5789c7b..db5a3a182 100644
--- a/src/tutorial/tasks-start-writing/build.xml
+++ b/src/tutorial/tasks-start-writing/build.xml
@@ -88,8 +88,8 @@
 
 
     <target name="junit" description="Runs the unit tests" depends="jar">
-        <delete dir="${junit.out.dir.xml}" />
-        <mkdir  dir="${junit.out.dir.xml}" />
+        <delete dir="${junit.out.dir.xml}"/>
+        <mkdir  dir="${junit.out.dir.xml}"/>
         <junit printsummary="yes" haltonfailure="no">
             <classpath refid="classpath.test"/>
             <formatter type="xml"/>
@@ -100,7 +100,7 @@
     </target>
 
     <target name="junitreport" description="Create a report for the rest result">
-        <mkdir dir="${junit.out.dir.html}" />
+        <mkdir dir="${junit.out.dir.html}"/>
         <junitreport todir="${junit.out.dir.html}">
             <fileset dir="${junit.out.dir.xml}">
                 <include name="*.xml"/>