Revert "Trailing whitespace (cherry-pick 2f64e0b)"

This reverts commit 7df9120ebc.
Discussion in ant dev mailing list https://www.mail-archive.com/dev@ant.apache.org/msg47356.html

src/etc/ant-update.xsl

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 <xsl:output method="xml" indent="yes"/>
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
@@ -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>

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>

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; 
         }
 
-        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 {
+        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>
 

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>
+</xsl:stylesheet>

src/etc/checkstyle/checkstyle-text.xsl

@@ -31,3 +31,4 @@
         <xsl:value-of select="@message"/>
     </xsl:template>
 </xsl:stylesheet>
+

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,3 +127,4 @@
         </xsl:attribute>
     </xsl:template>
 </xsl:stylesheet>
+

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,3 +70,4 @@
 
 
 </xsl:stylesheet>
+

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

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.
-
+   
 -->
 <!--
 

src/etc/jdepend.xsl

@@ -18,13 +18,13 @@
    limitations under the License.
 -->
 
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
+<xsl:output method="html" indent="yes"  encoding="US-ASCII"/>
 
 <xsl:template match="JDepend">
     <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="https://ant.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="http://jakarta.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>

src/etc/junit-frames-xalan1.xsl

@@ -257,11 +257,11 @@ h6 {
 
             <h2>Tests</h2>
             <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
-                <xsl:call-template name="testcase.test.header"/>
-                <!--
-                    test can even not be started at all (failure to load the class)
-                    so report the error directly
-                -->
+        <xsl:call-template name="testcase.test.header"/>
+              <!--
+              test can even not be started at all (failure to load the class)
+              so report the error directly
+              -->
                 <xsl:if test="./error">
                     <tr class="Error">
                         <td colspan="4"><xsl:apply-templates select="./error"/></td>
@@ -295,17 +295,17 @@ h6 {
     </html>
 </xsl:template>
 
-<!--
+  <!--
    Write properties into a JavaScript data structure.
    This is based on the original idea by Erik Hatcher (ehatcher@apache.org)
--->
-<xsl:template match="properties">
+   -->
+  <xsl:template match="properties">
     cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array();
     <xsl:for-each select="property">
     <xsl:sort select="@name"/>
         cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>';
     </xsl:for-each>
-</xsl:template>
+  </xsl:template>
 
 
 <!-- ======================================================================
@@ -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>
@@ -667,8 +667,8 @@ h6 {
                 <td><xsl:apply-templates select="error"/></td>
             </xsl:when>
             <xsl:when test="skipped">
-                <td>Skipped</td>
-                <td><xsl:apply-templates select="skipped"/></td>
+            	<td>Skipped</td>
+            	<td><xsl:apply-templates select="skipped"/></td>
             </xsl:when>
             <xsl:otherwise>
                 <td>Success</td>

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)"/>

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"/>
@@ -405,8 +405,8 @@
                 <td><xsl:apply-templates select="error"/></td>
             </xsl:when>
             <xsl:when test="skipped">
-                <td>Skipped</td>
-                <td><xsl:apply-templates select="skipped"/></td>
+            	<td>Skipped</td>
+            	<td><xsl:apply-templates select="skipped"/></td>
             </xsl:when>
             <xsl:otherwise>
                 <td>Success</td>

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>

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

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

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"/>

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

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.9.13-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.9.13-SNAPSHOT</version>

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>

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>

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.9.13-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.9.13-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>

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>

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>

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.9.13-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.9.13-SNAPSHOT</version>
@@ -56,7 +56,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
       <version>1.1.1</version>
       <scope>compile</scope>
     </dependency>
-  </dependencies>
+  </dependencies> 
   <build>
     <plugins>
       <plugin>

src/etc/poms/ant-jdepend/pom.xml

@@ -30,7 +30,7 @@
     <version>1.9.13-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.9.13-SNAPSHOT</version>

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.9.13-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.9.13-SNAPSHOT</version>

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.9.13-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.9.13-SNAPSHOT</version>

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.9.13-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.9.13-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>

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.9.13-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.9.13-SNAPSHOT</version>

src/etc/poms/ant-swing/pom.xml

@@ -30,7 +30,7 @@
     <version>1.9.13-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.9.13-SNAPSHOT</version>
@@ -62,5 +62,5 @@
     <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>
   </build>
-
+  
 </project>

src/etc/poms/ant-testutil/pom.xml

@@ -30,7 +30,7 @@
     <version>1.9.13-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.9.13-SNAPSHOT</version>
@@ -70,5 +70,5 @@
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>
   </build>
-
+  
 </project>

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>

src/etc/testcases/buildfiletest-base.xml

@@ -7,5 +7,5 @@
     <delete dir="${input}"/>
     <delete dir="${output}"/>
   </target>
-
+  
 </project>

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"/>

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>

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>

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>

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>
 

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"

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>
+</project>

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>

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>

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>

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>

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>

src/etc/testcases/filters/build.xml

@@ -18,7 +18,7 @@
 <project default="tearDown" basedir=".">
   <import file="../buildfiletest-base.xml"/>
   <target name="setUp">
-    <mkdir dir="${output}"/>
+    <mkdir dir="${output}" />
   </target>
 
 
@@ -34,7 +34,7 @@
       </filterchain>
     </copy>
   </target>
-
+  
   <target name="testNegateLineContains" depends="setUp">
     <copy file="input/linecontains.test"
           tofile="${output}/negatelinecontains.test">
@@ -49,12 +49,12 @@
       <condition>
         <not>
           <filesmatch file1="${output}/negatelinecontains.test"
-                      file2="expected/negatelinecontains.test"/>
+                      file2="expected/negatelinecontains.test" />
         </not>
       </condition>
     </fail>
   </target>
-
+  
   <target name="testEscapeUnicode" depends="setUp">
     <copy todir="${output}" encoding="UTF-8">
       <fileset dir="input">
@@ -71,16 +71,16 @@
 
   <target name="testStripJavaComments" depends="setUp">
     <copy todir="${output}">
-      <fileset dir="input" includes="stripjavacomments.test"/>
+      <fileset dir="input" includes="stripjavacomments.test" />
       <filterchain>
-        <filterreader classname="org.apache.tools.ant.filters.StripJavaComments"/>
+        <filterreader classname="org.apache.tools.ant.filters.StripJavaComments" />
       </filterchain>
     </copy>
   </target>
 
   <target name="testReplaceTokens" depends="setUp">
     <copy todir="${output}">
-      <fileset dir="input" includes="replacetokens.test"/>
+      <fileset dir="input" includes="replacetokens.test" />
       <filterchain>
         <replacetokens>
           <token key="foo" value=""/>
@@ -91,18 +91,18 @@
 
   <target name="testReplaceTokensPropertyFile" depends="setUp">
     <copy tofile="${output}/replacetokensPropertyFile.test">
-      <fileset dir="input" includes="replacetokens.test"/>
+      <fileset dir="input" includes="replacetokens.test" />
       <filterchain>
-        <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
+      	<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
           <param type="propertiesfile" value="${basedir}/input/sample.properties"/>
-          </filterreader>
+    	  </filterreader>
       </filterchain>
     </copy>
   </target>
 
   <target name="testReplaceTokensDoubleEncoded" depends="setUp">
     <copy todir="${output}">
-      <fileset dir="input" includes="replacetokens.double.test"/>
+      <fileset dir="input" includes="replacetokens.double.test" />
       <filterchain>
         <replacetokens>
           <token key="foo" value=""/>
@@ -113,7 +113,7 @@
 
   <target name="testReplaceTokensDoubleEncodedToSimple" depends="setUp">
     <copy todir="${output}">
-      <fileset dir="input" includes="replacetokens.double.test"/>
+      <fileset dir="input" includes="replacetokens.double.test" />
       <filterchain>
         <replacetokens begintoken="@@" endtoken="@@">
           <token key="foo" value=""/>
@@ -124,7 +124,7 @@
 
   <target name="testReplaceTokensMustacheStyle" depends="setUp">
     <copy todir="${output}">
-      <fileset dir="input" includes="replacetokens.mustache.test"/>
+      <fileset dir="input" includes="replacetokens.mustache.test" />
       <filterchain>
         <replacetokens begintoken="{{" endtoken="}}">
           <token key="foo" value=""/>

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"/>

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>

src/etc/testcases/filters/head-tail.xml

@@ -20,7 +20,7 @@
   <import file="../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}"/>
+    <mkdir dir="${output}" />
   </target>
 
 
@@ -59,7 +59,7 @@
   </target>
 
   <target name="testFilterReaderHeadLinesSkip" depends="setUp">
-    <copy file="input/head-tail.test"
+    <copy file="input/head-tail.test" 
           tofile="${output}/head-tail.filterReaderHeadLinesSkip.test">
       <filterchain>
         <filterreader classname="org.apache.tools.ant.filters.HeadFilter">
@@ -113,7 +113,7 @@
   </target>
 
   <target name="testFilterReaderTailLinesSkip" depends="setUp">
-    <copy file="input/head-tail.test"
+    <copy file="input/head-tail.test" 
           tofile="${output}/head-tail.filterReaderTailLinesSkip.test">
       <filterchain>
         <filterreader classname="org.apache.tools.ant.filters.TailFilter">

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,14 +344,14 @@
       i = 1;
     </script>
   </target>
-
+  
   <target name="hasregex">
     <concat destfile="${output}/replaceregexp">
       hello world
     </concat>
     <replaceregexp file="${output}/replaceregexp"
-                   match="hello( )world"
-                   replace="bye\1world"/>
+                  match="hello( )world"
+                  replace="bye\1world"/>
   </target>
 
 </project>

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}"

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>
 

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>
+</project>

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"/>

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>
+  
+</project>

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>

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>

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">

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">

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>

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>

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>

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>
 

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.9.13"/>
+                                        <antversion exactly="1.9.13" />
                                 </not>
                         </condition>
                         Should be exactly 1.9.13
@@ -41,11 +41,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.13"/>
+                                        <antversion atleast="1.9.13" />
                                 </not>
                         </condition>
                 Should be at least 1.9.13
@@ -53,11 +53,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.13"/>
+                                        <antversion exactly="1.9.13" />
                                 </not>
                         </condition>
                   Should be exactly 1.9.13

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>

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>

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,13 +61,14 @@
       <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>
@@ -77,7 +78,7 @@
       Expected unsupported property.
     </fail>
   </target>
-
+  
   <target name="testXercesProperty">
     <fail>
       <condition>
@@ -90,5 +91,5 @@
       Expected XSD support on Xerces.
     </fail>
   </target>
-
-</project>
+  
+</project>

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>
+</project>

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>

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>

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>
 

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>

src/etc/testcases/taskdefs/cvspass.xml

@@ -21,21 +21,23 @@
   <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 -->
@@ -43,15 +45,18 @@
     <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 -->
@@ -59,18 +64,21 @@
     <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>
 

src/etc/testcases/taskdefs/delete.xml

@@ -20,7 +20,8 @@
 
   <import file="../buildfiletest-base.xml"/>
 
-  <property name="dir" location="${output}"/>
+
+  <property name="dir" location="${output}" />
   <basename property="dirname" file="${output}"/>
 
   <macrodef name="expectabsent">
@@ -29,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>
@@ -41,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>
@@ -56,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>
@@ -88,81 +89,81 @@
   </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">
     <delete>
       <files>
-        <include name="${dir}/**"/>
+          <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}"/>
-    </delete>
+	<delete quiet="false">
+		<fileset dir="${dir}" />
+		<fileset dir="${dir}" />
+	</delete>
   </target>
 
   <target name="test15" depends="init">
-    <delete quiet="true">
-      <fileset dir="${dir}"/>
-      <fileset dir="${dir}"/>
-    </delete>
+	<delete quiet="true">
+		<fileset dir="${dir}" />
+		<fileset dir="${dir}" />
+	</delete>
   </target>
   <!-- Bugzilla 40313 -->
   <target name="test16.init">
@@ -188,4 +189,6 @@
     <expectabsent target="${dir}/subdir"/>
   </target>
 
+
+
 </project>

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"/>

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>

src/etc/testcases/taskdefs/email/mail.xml

@@ -21,18 +21,20 @@
   <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>

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">

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>

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>

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>

src/etc/testcases/taskdefs/get.xml

@@ -41,13 +41,13 @@
   <target name="test6">
     <get src="http://www.apache.org/" dest="get.tmp" userAgent="Apache Ant/test"/>
 
-    <fileset id="t6" file="get.tmp"/>
-    <pathconvert property="t6" refid="t6" setonempty="false"/>
+    <fileset id="t6" file="get.tmp" />
+    <pathconvert property="t6" refid="t6" setonempty="false" />
 
     <fail message="get failed">
       <condition>
         <not>
-          <isset property="t6"/>
+          <isset property="t6" />
         </not>
       </condition>
     </fail>
@@ -57,42 +57,42 @@
      <get src="" dest="" userAgent=""/>
   </target>
 
-  <target name="testUseTimestamp" depends="-90s,-timestamp"/>
+  <target name="testUseTimestamp" depends="-90s,-timestamp" />
 
   <target name="-90s">
-    <property name="off" value="-90"/>
-    <property name="unit" value="second"/>
+    <property name="off" value="-90" />
+    <property name="unit" value="second" />
   </target>
 
-  <target name="testUseTomorrow" depends="+1d,-timestamp"/>
+  <target name="testUseTomorrow" depends="+1d,-timestamp" />
 
   <target name="+1d">
-    <property name="off" value="1"/>
-    <property name="unit" value="day"/>
+    <property name="off" value="1" />
+    <property name="unit" value="day" />
   </target>
 
   <target name="-timestamp">
-    <property name="pat" value="yyyyMMddHHmm"/>
+    <property name="pat" value="yyyyMMddHHmm" />
 
     <tstamp>
-      <format property="dt" pattern="${pat}" offset="${off}" unit="${unit}"/>
+      <format property="dt" pattern="${pat}" offset="${off}" unit="${unit}" />
     </tstamp>
 
-    <touch file="get.tmp" datetime="${dt}" pattern="${pat}"/>
+    <touch file="get.tmp" datetime="${dt}" pattern="${pat}" />
 
     <get src="http://www.w3.org/MarkUp" dest="get.tmp"
-         usetimestamp="true" verbose="true"/>
+         usetimestamp="true" verbose="true" />
 
     <fileset id="ts" file="get.tmp">
-      <date when="equal" datetime="${dt}" pattern="${pat}"/>
+      <date when="equal" datetime="${dt}" pattern="${pat}" />
     </fileset>
 
-    <pathconvert property="ts" refid="ts" setonempty="false"/>
+    <pathconvert property="ts" refid="ts" setonempty="false" />
 
     <fail message="get w/ timestamp should have failed.">
       <condition>
         <not>
-          <isset property="ts"/>
+          <isset property="ts" />
         </not>
       </condition>
     </fail>
@@ -100,7 +100,7 @@
 
   <target name="cleanup">
     <delete>
-      <fileset dir="${basedir}" includes="get.tmp"/>
+      <fileset dir="${basedir}" includes="get.tmp" />
     </delete>
   </target>
 

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">

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>

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">

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>

src/etc/testcases/taskdefs/import/subdir/serial.xml

@@ -19,3 +19,4 @@
   <import file="../unnamed1.xml"/>
   <import file="../unnamed2.xml"/>
 </project>
+

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>

src/etc/testcases/taskdefs/input.xml

@@ -23,32 +23,35 @@
   </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>
@@ -56,12 +59,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>
@@ -69,13 +72,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>
@@ -83,13 +86,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>
@@ -97,17 +100,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>

src/etc/testcases/taskdefs/jar.xml

@@ -21,7 +21,7 @@
   <import file="../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}"/>
+    <mkdir dir="${output}" />
   </target>
 
   <property name="tmp.jar" location="${output}/tmp.jar"/>
@@ -35,26 +35,34 @@
   </target>
 
   <target name="test2">
-    <jar jarfile="jar.tmp"
-         manifest="none"/>
+    <jar
+    	jarfile="jar.tmp"
+    	manifest="none"
+    />
   </target>
 
   <target name="test3">
-    <jar destfile="jar.tmp"
-         whenempty="format C: /y"/>
+    <jar
+    	destfile="jar.tmp"
+	whenempty="format C: /y" 
+    />
   </target>
 
   <target name="test4">
-    <jar destfile="${tmp.jar}"
-         basedir="."
-         includes="jar.xml"/>
+   <jar
+    	destfile="${tmp.jar}"
+	basedir="."
+	includes="jar.xml"
+    />
   </target>
 
   <target name="testNoRecreateWithUpdate">
-    <jar destfile="${tmp.jar}"
+    <jar
+         destfile="${tmp.jar}"
          basedir="."
          includes="jar.xml"
-         update="true"/>
+         update="true"
+    />
   </target>
 
   <target name="testRecreateNewerFileSetup" depends="test4">
@@ -62,29 +70,37 @@
   </target>
 
   <target name="testRecreateWithoutUpdateAdditionalFiles">
-    <jar destfile="${tmp.jar}"
+    <jar
+         destfile="${tmp.jar}"
          includes="*.xml"
-         basedir="."/>
+         basedir="."
+    />
   </target>
 
   <target name="testRecreateWithUpdateAdditionalFiles">
-    <jar destfile="${tmp.jar}"
+    <jar
+         destfile="${tmp.jar}"
          basedir="."
          includes="*.xml"
-         update="true"/>
+         update="true"
+    />
   </target>
 
   <target name="testRecreateWithoutUpdateNewerFile">
-    <jar destfile="${tmp.jar}"
+    <jar
+         destfile="${tmp.jar}"
          basedir="."
-         includes="jar.xml"/>
+         includes="jar.xml"
+    />
   </target>
 
   <target name="testRecreateWithUpdateNewerFile">
-    <jar destfile="${tmp.jar}"
+    <jar
+         destfile="${tmp.jar}"
          basedir="."
          includes="jar.xml"
-         update="true"/>
+         update="true"
+    />
   </target>
 
   <target name="testManifestStaysIntact">
@@ -98,21 +114,25 @@
     <jar destfile="${tmp.jar}" basedir="." includes="jar.xml"
          update="true"/>
     <unjar src="${tmp.jar}" dest="${tmp.dir}"/>
-  </target>
+  </target>    
 
   <target name="testNoRecreateBasedirExcludesWithUpdate">
-    <jar destfile="${tmp.jar}"
+    <jar
+         destfile="${tmp.jar}"
          basedir="."
          includes="j*.xml"
          excludes="java.xml"
-         update="true"/>
+         update="true"
+    />
   </target>
 
   <target name="testNoRecreateBasedirExcludesWithoutUpdate">
-    <jar destfile="${tmp.jar}"
+    <jar
+         destfile="${tmp.jar}"
          basedir="."
          includes="j*.xml"
-         excludes="java.xml"/>
+         excludes="java.xml"
+    />
   </target>
 
   <target name="makezip">
@@ -205,7 +225,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"/>
@@ -228,28 +248,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">
@@ -259,6 +279,7 @@
         <attribute name="Implementation-Vendor"  value="Apache Software Foundation"/>
       </manifest>
     </jar>
-  </target>
+  </target>  
 
+    
 </project>

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,38 +85,40 @@
   </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>
 
@@ -129,34 +131,36 @@
 
   <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}"/>
@@ -164,14 +168,15 @@
 
    <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}"
@@ -186,16 +191,18 @@
 
     <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>
@@ -203,7 +210,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>
 
@@ -217,28 +224,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">
@@ -256,22 +263,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}:
@@ -279,7 +286,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">
@@ -297,28 +304,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>
@@ -334,19 +341,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}:
@@ -354,7 +361,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>
@@ -374,35 +381,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}:
@@ -412,9 +419,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>

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>
 

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,8 +48,9 @@
     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>
 
@@ -62,10 +63,11 @@
 
   <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>
@@ -82,7 +84,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"/>
@@ -113,7 +115,7 @@ public class test1 {
     private static final String GREETING="*/Hello/*";
     private static final String GREETING1="/*Hello*/";
 
-    public static void main(String args[]) {
+    public static void main( String args[] ) {
     }
 }</echo>
       <echo file="nocomments.tmp">
@@ -124,16 +126,16 @@ public class test1 {
     private static final String GREETING="*/Hello/*";
     private static final String GREETING1="/*Hello*/";
 
-    public static void main(String args[]) {
+    public static void main( String args[] ) {
     }
 }</echo>
-      <loadfile srcFile="loadfile1.tmp"
+      <loadfile srcFile="loadfile1.tmp" 
         property="testStripJavaComments">
         <filterchain>
           <stripjavacomments/>
         </filterchain>
       </loadfile>
-      <loadfile srcFile="nocomments.tmp"
+      <loadfile srcFile="nocomments.tmp" 
         property="expected"/>
   </target>
 
@@ -141,7 +143,8 @@ 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>
@@ -157,4 +160,4 @@ public class test1 {
     <delete file="nocomments.tmp"/>
   </target>
 
-</project>
+  </project>

src/etc/testcases/taskdefs/makeurl.xml

@@ -15,7 +15,8 @@
   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/>
@@ -28,36 +29,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>
 
@@ -67,11 +68,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>
 

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"/>

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,88 +134,86 @@
     <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}"/>

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">

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>

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
        -->