Point taken. Apologies for comments that could be considered lousy or
snarky.

Any opinions on code quality checks (Checkstyle/JaCoCo/SpotBugs/Simian etc)
in nightlies and doing something to improve their scores?

Gintas

On Thu, 13 Sep 2018 at 15:00, Nicolas Lalevée <nicolas.lale...@hibnet.org>
wrote:

>
> > [1] https://github.com/apache/ant/pull/66/files
> > [2]
> >
> https://github.com/apache/ant/commit/54b6df2f44c5cb4f9573f99330c2d2908f1bf506
> <
> https://github.com/apache/ant/commit/54b6df2f44c5cb4f9573f99330c2d2908f1bf506
> >
>
> At the *first* line of the diff presented on github, I can tell the commit
> is not only about check spelling.
>
> Not knowing if we have the same presentation, let’s be precise:
>
> https://github.com/apache/ant/commit/54b6df2f44c5cb4f9573f99330c2d2908f1bf506#diff-9ad784be5493fb9473c8d4e8a26aadedL25
> <
> https://github.com/apache/ant/commit/54b6df2f44c5cb4f9573f99330c2d2908f1bf506#diff-9ad784be5493fb9473c8d4e8a26aadedL25
> >
>
> Nicolas
>
> >
> > -Jaikiran
> >
> >
> > On 11/09/18 12:17 PM, Gintautas Grigelionis wrote:
> >> How was this different from PR #66?
> >>
> >> Gintas
> >>
> >> On Tue, 11 Sep 2018 at 06:55, Jaikiran Pai <jaiki...@apache.org> wrote:
> >>
> >>> Things haven't changed (nor do I expect any changes anymore). To say
> the
> >>> least - it's followed the same pattern:
> >>>
> >>> - do changes like these
> >>>
> >>> - when requested not to do such changes, argue over it and move it to
> >>> some abstract discussion
> >>>
> >>> - then give an impression it won't be repeated
> >>>
> >>> - few days down the line push changes like these and repeat the whole
> >>> cycle again.
> >>>
> >>> Although I stay silent with these commits these days it's because I
> have
> >>> nothing good or new to say about this behaviour and am fully exhausted
> >>> with this exercise to the extent that I just delete such commit
> >>> notifications instead of reviewing them, to avoid it ruining any energy
> >>> I might have to contribute anything in my spare time.
> >>>
> >>> Committer rights is a privilege as well as a responsibility, but this
> >>> behaviour is nothing but an abuse of it and no different than being a
> >>> troll.
> >>>
> >>> -Jaikiran
> >>>
> >>>
> >>> On 10/09/18 5:12 AM, Nicolas Lalevée wrote:
> >>>> I have been away from the project out of boredom. Still curious, I
> came
> >>> to read some emails. It seems things didn’t changed much: yet another
> >>> unreadable commit with a log which doesn’t indicate what it actually
> do.
> >>>>
> >>>>> Le 9 sept. 2018 à 09:09, gin...@apache.org a écrit :
> >>>>>
> >>>>> Repository: ant
> >>>>> Updated Branches:
> >>>>> refs/heads/master fde6b0e94 -> 54b6df2f4
> >>>>>
> >>>>>
> >>>>> Check spelling
> >>>>>
> >>>>> Project: http://git-wip-us.apache.org/repos/asf/ant/repo
> >>>>> Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/54b6df2f
> >>>>> Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/54b6df2f
> >>>>> Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/54b6df2f
> >>>>>
> >>>>> Branch: refs/heads/master
> >>>>> Commit: 54b6df2f44c5cb4f9573f99330c2d2908f1bf506
> >>>>> Parents: fde6b0e
> >>>>> Author: Gintas Grigelionis <gin...@apache.org>
> >>>>> Authored: Sat Sep 8 22:12:24 2018 +0200
> >>>>> Committer: Gintas Grigelionis <gin...@apache.org>
> >>>>> Committed: Sun Sep 9 09:07:18 2018 +0200
> >>>>>
> >>>>>
> ----------------------------------------------------------------------
> >>>>> .../checkstyle-frames-sortby-check.xsl          | 194
> >>> +++++++++----------
> >>>>> src/etc/jdepend-frames.xsl                      |  18 +-
> >>>>> src/etc/jdepend.xsl                             |  48 +++--
> >>>>> src/etc/testcases/taskdefs/exec/exec.xml        |   4 +-
> >>>>> .../taskdefs/optional/unix/symlink.xml          |  78 ++++----
> >>>>> .../optional/xml/endpiece-noSchema-invalid.xml  |   9 +-
> >>>>> .../taskdefs/optional/xml/endpiece-noSchema.xml |   7 +-
> >>>>> src/etc/testcases/types/assertions.xml          | 178
> +++++++++--------
> >>>>> src/etc/testcases/types/selectors.xml           | 104 +++++-----
> >>>>> src/main/org/apache/tools/ant/Diagnostics.java  |   2 +-
> >>>>> src/main/org/apache/tools/ant/taskdefs/Ant.java |   2 +-
> >>>>> .../org/apache/tools/ant/taskdefs/Checksum.java |   2 +-
> >>>>> .../org/apache/tools/ant/taskdefs/Exec.java     |   2 +-
> >>>>> .../org/apache/tools/ant/taskdefs/SignJar.java  |   2 +-
> >>>>> src/main/org/apache/tools/ant/taskdefs/Zip.java |   2 +-
> >>>>> .../ant/taskdefs/condition/IsReachable.java     |   4 +-
> >>>>> .../optional/ejb/GenericDeploymentTool.java     |   4 +-
> >>>>> .../optional/ejb/JonasDeploymentTool.java       |   4 +-
> >>>>> .../tools/ant/taskdefs/optional/jsp/WLJspc.java |   2 +-
> >>>>> .../junitlauncher/JUnitLauncherTask.java        |   2 +-
> >>>>> .../optional/junitlauncher/TestRequest.java     |   8 +-
> >>>>> .../tools/ant/taskdefs/optional/net/FTP.java    |   4 +-
> >>>>> .../optional/net/FTPTaskMirrorImpl.java         |   4 +-
> >>>>> .../tools/ant/taskdefs/optional/vss/MSVSS.java  |   2 +-
> >>>>> .../ant/taskdefs/optional/vss/MSVSSCHECKIN.java |   2 +-
> >>>>> .../org/apache/tools/ant/types/XMLCatalog.java  |   2 +-
> >>>>> .../org/apache/tools/ant/util/FileUtils.java    |   2 +-
> >>>>> .../org/apache/tools/ant/util/ProxySetup.java   |   2 +-
> >>>>> .../org/apache/tools/zip/ZipOutputStream.java   |   4 +-
> >>>>> src/script/antenv.cmd                           |   2 +-
> >>>>> src/script/envset.cmd                           |   2 +-
> >>>>> src/tests/antunit/taskdefs/echoxml-test.xml     |   2 +-
> >>>>> .../apache/tools/ant/taskdefs/UnzipTest.java    |   2 +-
> >>>>> .../ant/taskdefs/optional/TraXLiaisonTest.java  |   2 +-
> >>>>> .../tools/ant/util/ReaderInputStreamTest.java   |   4 +-
> >>>>> 35 files changed, 350 insertions(+), 362 deletions(-)
> >>>>>
> ----------------------------------------------------------------------
> >>>>>
> >>>>>
> >>>>>
> >>>
> http://git-wip-us.apache.org/repos/asf/ant/blob/54b6df2f/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl
> >>>>>
> ----------------------------------------------------------------------
> >>>>> diff --git a/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl
> >>> b/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl
> >>>>> index 060f878..1f02b90 100644
> >>>>> --- a/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl
> >>>>> +++ b/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl
> >>>>> @@ -22,7 +22,7 @@
> >>>>> -->
> >>>>>
> >>>>>    <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
> >>>>> -    <xsl:decimal-format decimal-separator="."
> grouping-separator="," />
> >>>>> +    <xsl:decimal-format decimal-separator="."
> grouping-separator=","/>
> >>>>>
> >>>>>    <xsl:param name="output.dir" select="'.'"/>
> >>>>>    <xsl:param name="basedir" select="'.'"/>
> >>>>> @@ -43,7 +43,7 @@
> >>>>>            <xsl:call-template name="sorted.css"/>
> >>>>>        </redirect:write>
> >>>>>
> >>>>> -        <!-- create the switch.js for collepsing the data -->
> >>>>> +        <!-- create the switch.js for collapsing the data -->
> >>>>>        <redirect:write file="{$output.dir}/switch.js">
> >>>>>            <xsl:call-template name="switch.js"/>
> >>>>>        </redirect:write>
> >>>>> @@ -76,15 +76,15 @@
> >>>>>
> >>>>>
> >>>>>    <!--
> >>>>> -    Key for detecting duplicate CheckModules
> >>>>> +    Key for detecting duplicate CheckModules
> >>>>>    -->
> >>>>>    <xsl:key name="module" match="file/error" use="@source"/>
> >>>>>
> >>>>>
> >>>>>
> >>>>>    <!--
> >>>>> -    Generates the navagation bar.
> >>>>> -    -->
> >>>>> +    Generates the navigation bar.
> >>>>> +    -->
> >>>>>    <xsl:template match="checkstyle" mode="navigation">
> >>>>>        <ul id="navigation">
> >>>>>            <xsl:for-each select="file/error[generate-id() =
> >>> generate-id(key('module',@source))]">
> >>>>> @@ -100,13 +100,13 @@
> >>>>>                </a></li>
> >>>>>            </xsl:for-each>
> >>>>>        </ul>
> >>>>> -    </xsl:template>
> >>>>> +    </xsl:template>
> >>>>>
> >>>>>
> >>>>>
> >>>>>    <!--
> >>>>>    Generates the data part.
> >>>>> -    -->
> >>>>> +    -->
> >>>>>    <xsl:template match="checkstyle" mode="data">
> >>>>>        <div id="content">
> >>>>>            <xsl:for-each select="file/error[generate-id() =
> >>> generate-id(key('module',@source))]">
> >>>>> @@ -120,13 +120,13 @@
> >>>>>                </div>
> >>>>>            </xsl:for-each>
> >>>>>        </div>
> >>>>> -    </xsl:template>
> >>>>> +    </xsl:template>
> >>>>>
> >>>>>
> >>>>>
> >>>>>    <!--
> >>>>>    Generates the content table for the given check module.
> >>>>> -    @param filter full qualified module name
> >>>>> +    @param filter full qualified module name
> >>>>>    -->
> >>>>>    <xsl:template name="data">
> >>>>>        <xsl:param name="filter"/>
> >>>>> @@ -157,7 +157,7 @@
> >>>>>    Generates the data rows for the current check module.
> >>>>>    Ignores errors in the current file from other modules.
> >>>>>    @param node the file with the errors
> >>>>> -    @param filter full qualified module name
> >>>>> +    @param filter full qualified module name
> >>>>>    -->
> >>>>>    <xsl:template name="data-rows">
> >>>>>        <xsl:param name="node"/>
> >>>>> @@ -180,68 +180,68 @@
> >>>>>
> >>>>>
> >>>>>
> >>>>> -    <!--
> >>>>> +    <!--
> >>>>>    Generates the CSS with the layout instructions.
> >>>>>    Generated so this XSL is the single source of the whole report.
> >>>>>    -->
> >>>>>    <xsl:template name="sorted.css">
> >>>>> -        body {
> >>>>> +        body {
> >>>>>          font:normal 80% arial,helvetica,sanserif;
> >>>>> -          color: black;
> >>>>> -          background-color: white;
> >>>>> -          margin: 0;
> >>>>> -          padding: 1em;
> >>>>> +          color: black;
> >>>>> +          background-color: white;
> >>>>> +          margin: 0;
> >>>>> +          padding: 1em;
> >>>>>          min-width: 41em;
> >>>>> -        }
> >>>>> -        h1 {
> >>>>> +        }
> >>>>> +        h1 {
> >>>>>          font-weight:bold;
> >>>>>          font-size:140%;
> >>>>> -          margin: 0 0 0.7em;
> >>>>> -          padding: 0.3em;
> >>>>> -          text-align: center;
> >>>>> -          background-color: #eee;
> >>>>> -          border: 2px ridge silver;
> >>>>> -        }
> >>>>> -        html<xsl:text
> >>> disable-output-escaping="yes">&gt;</xsl:text>body h1 {
> >>>>> +          margin: 0 0 0.7em;
> >>>>> +          padding: 0.3em;
> >>>>> +          text-align: center;
> >>>>> +          background-color: #eee;
> >>>>> +          border: 2px ridge silver;
> >>>>> +        }
> >>>>> +        html<xsl:text
> >>> disable-output-escaping="yes">&gt;</xsl:text>body h1 {
> >>>>>          border-color: gray;
> >>>>> -        }
> >>>>> -
> >>>>> -        ul#navigation {
> >>>>> -          font-size: 0.83em;
> >>>>> -          float: left; width: 18em;
> >>>>> -          margin: 0 0 1.2em; padding: 0;
> >>>>> -          border: 1px dashed silver;
> >>>>> -        }
> >>>>> -        ul#navigation li {
> >>>>> -          list-style: none;
> >>>>> -          margin: 0; padding: 0.2em;
> >>>>> -        }
> >>>>> -        ul#navigation a {
> >>>>> -          display: block;
> >>>>> -          padding: 0.2em;
> >>>>> -          font-weight: bold;
> >>>>> -        }
> >>>>> -        ul#navigation a:link {
> >>>>> -          color: black; background-color: #eee;
> >>>>> -        }
> >>>>> -        ul#navigation a:visited {
> >>>>> -          color: #666; background-color: #eee;
> >>>>> -        }
> >>>>> -        ul#navigation a:hover {
> >>>>> -          color: red; background-color: white;
> >>>>> -        }
> >>>>> -        ul#navigation a:active {
> >>>>> -          color: white; background-color: gray;
> >>>>>        }
> >>>>>
> >>>>> -        div#content {
> >>>>> -          margin: 0 1em 1em 16em;
> >>>>> -          padding: 0 1em;
> >>>>> -        }
> >>>>> -        * html div#content {
> >>>>> -          height: 1em;  /* Workaround 3-Pixel-Bug of Internet
> >>> Explorers */
> >>>>> -        }
> >>>>> -        div#content h2 {
> >>>>> +        ul#navigation {
> >>>>> +          font-size: 0.83em;
> >>>>> +          float: left; width: 18em;
> >>>>> +          margin: 0 0 1.2em; padding: 0;
> >>>>> +          border: 1px dashed silver;
> >>>>> +        }
> >>>>> +        ul#navigation li {
> >>>>> +          list-style: none;
> >>>>> +          margin: 0; padding: 0.2em;
> >>>>> +        }
> >>>>> +        ul#navigation a {
> >>>>> +          display: block;
> >>>>> +          padding: 0.2em;
> >>>>> +          font-weight: bold;
> >>>>> +        }
> >>>>> +        ul#navigation a:link {
> >>>>> +          color: black; background-color: #eee;
> >>>>> +        }
> >>>>> +        ul#navigation a:visited {
> >>>>> +          color: #666; background-color: #eee;
> >>>>> +        }
> >>>>> +        ul#navigation a:hover {
> >>>>> +          color: red; background-color: white;
> >>>>> +        }
> >>>>> +        ul#navigation a:active {
> >>>>> +          color: white; background-color: gray;
> >>>>> +        }
> >>>>> +
> >>>>> +        div#content {
> >>>>> +          margin: 0 1em 1em 16em;
> >>>>> +          padding: 0 1em;
> >>>>> +        }
> >>>>> +        * html div#content {
> >>>>> +          height: 1em;  /* Workaround 3-Pixel-Bug of Internet
> >>> Explorers */
> >>>>> +        }
> >>>>> +        div#content h2 {
> >>>>>          font-size:100%;
> >>>>>          font-weight:bold;
> >>>>>          background: #525D76;
> >>>>> @@ -251,11 +251,11 @@
> >>>>>          margin-right: 2px;
> >>>>>          margin-left: 2px;
> >>>>>          margin-bottom: 0;
> >>>>> -        }
> >>>>> -        div#content p {
> >>>>> -          font-size: 1em;
> >>>>> -          margin: 1em 0;
> >>>>> -        }
> >>>>> +        }
> >>>>> +        div#content p {
> >>>>> +          font-size: 1em;
> >>>>> +          margin: 1em 0;
> >>>>> +        }
> >>>>>        table {
> >>>>>          width:100%;
> >>>>>          border-collapse:collapse;
> >>>>> @@ -275,62 +275,62 @@
> >>>>>        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>
> >>>>>
> >>>>>
> >>>>>
> >>>>>    <!--
> >>>>> -    Calculates the index of the last occurence of a substring in a
> >>> string.
> >>>>> +    Calculates the index of the last occurrence of a substring in a
> >>> string.
> >>>>>    @param txt the whole string in which to search
> >>>>>    @delimiter the substring to search
> >>>>>    -->
> >>>>>
> >>>>>
> >>>
> http://git-wip-us.apache.org/repos/asf/ant/blob/54b6df2f/src/etc/jdepend-frames.xsl
> >>>>>
> ----------------------------------------------------------------------
> >>>>> diff --git a/src/etc/jdepend-frames.xsl b/src/etc/jdepend-frames.xsl
> >>>>> index 8028734..45af8db 100644
> >>>>> --- a/src/etc/jdepend-frames.xsl
> >>>>> +++ b/src/etc/jdepend-frames.xsl
> >>>>> @@ -19,7 +19,7 @@
> >>>>>   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> >>> implied.
> >>>>>   See the License for the specific language governing permissions and
> >>>>>   limitations under the License.
> >>>>> -
> >>>>> +
> >>>>> -->
> >>>>> <!--
> >>>>>
> >>>>> @@ -271,7 +271,7 @@
> >>>>>            </xsl:if>
> >>>>>            <xsl:for-each select="UsedBy/Package">
> >>>>>              <a>
> >>>>> -                        <xsl:attribute
> >>> name="href">overview-packages.html#PK<xsl:value-of
> >>> select="node()"/></xsl:attribute>
> >>>>> +                <xsl:attribute
> >>> name="href">overview-packages.html#PK<xsl:value-of
> >>> select="node()"/></xsl:attribute>
> >>>>>                <xsl:value-of select="node()"/>
> >>>>>              </a><br/>
> >>>>>            </xsl:for-each>
> >>>>> @@ -282,7 +282,7 @@
> >>>>>            </xsl:if>
> >>>>>            <xsl:for-each select="DependsUpon/Package">
> >>>>>              <a>
> >>>>> -                        <xsl:attribute
> >>> name="href">overview-packages.html#PK<xsl:value-of
> >>> select="node()"/></xsl:attribute>
> >>>>> +                <xsl:attribute
> >>> name="href">overview-packages.html#PK<xsl:value-of
> >>> select="node()"/></xsl:attribute>
> >>>>>                <xsl:value-of select="node()"/>
> >>>>>              </a><br/>
> >>>>>            </xsl:for-each>
> >>>>> @@ -325,7 +325,7 @@
> >>>>>  </td></tr></table> -->
> >>>>>
> >>>>>  <xsl:if test="count(Cycles/Package) = 0">
> >>>>> -    <p>There are no cyclic dependancies.</p>
> >>>>> +    <p>There are no cyclic dependencies.</p>
> >>>>>  </xsl:if>
> >>>>>  <xsl:for-each select="Cycles/Package">
> >>>>>     <h3><a><xsl:attribute name="name">#CY<xsl:value-of
> >>> select="@Name"/></xsl:attribute><xsl:value-of
> select="@Name"/></a></h3><p>
> >>>>> @@ -373,10 +373,10 @@
> >>>>>    <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>
> >>>>>    <p>The ratio of efferent coupling (Ce) to total coupling (Ce / (Ce
> >>> + Ca)). This metric is an indicator of the package's resilience to
> change.
> >>> </p>
> >>>>> -    <p>The range for this metric is 0 to 1, with I=0 indicating a
> >>> completely stable package and I=1 indicating a completely instable
> package.
> >>> </p>
> >>>>> +    <p>The range for this metric is 0 to 1, with I=0 indicating a
> >>> completely stable package and I=1 indicating a completely unstable
> package.
> >>> </p>
> >>>>>  <h3><a name="EXdistance">Distance</a></h3>
> >>>>>    <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>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
> >>> unstable (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>
> >>>>> @@ -416,7 +416,7 @@ Creates an html file that contains a link to all
> >>> package links in overview-packa
> >>>>> <xsl:template match="JDepend/Packages/Package"
> mode="all.packages.link">
> >>>>>  <tr>
> >>>>>    <td nowrap="nowrap">
> >>>>> -         <a href="overview-packages.html#PK{@name}"
> >>> target="classFrame">
> >>>>> +      <a href="overview-packages.html#PK{@name}"
> target="classFrame">
> >>>>>        <xsl:value-of select="@name"/>
> >>>>>      </a>
> >>>>>    </td>
> >>>>> @@ -465,7 +465,7 @@ Creates an html file that contains a link to all
> >>> package links in overview-cycle
> >>>>> <xsl:template match="JDepend/Cycles/Package" mode="all.cycles">
> >>>>>  <tr>
> >>>>>    <td nowrap="nowrap">
> >>>>> -         <a href="overview-cycles.html#CY{@Name}"
> >>> target="classFrame"><xsl:value-of select="@Name"/></a>
> >>>>> +      <a href="overview-cycles.html#CY{@Name}"
> >>> target="classFrame"><xsl:value-of select="@Name"/></a>
> >>>>>    </td>
> >>>>>  </tr>
> >>>>> </xsl:template>
> >>>>> @@ -476,7 +476,7 @@ Creates an html file that contains a link to all
> >>> package links in overview-cycle
> >>>>>  <table width="100%">
> >>>>>  <tr>
> >>>>>    <td align="left"></td>
> >>>>> -      <td 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>.</td>
> >>>>> +    <td 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>.</td>
> >>>>>  </tr>
> >>>>>  </table>
> >>>>>  <hr size="1"/>
> >>>>>
> >>>>>
> >>>
> http://git-wip-us.apache.org/repos/asf/ant/blob/54b6df2f/src/etc/jdepend.xsl
> >>>>>
> ----------------------------------------------------------------------
> >>>>> diff --git a/src/etc/jdepend.xsl b/src/etc/jdepend.xsl
> >>>>> index b3a3778..abec6c5 100644
> >>>>> --- a/src/etc/jdepend.xsl
> >>>>> +++ b/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,22 +76,21 @@
> >>>>>        text-align:right;
> >>>>>      }
> >>>>>      </style>
> >>>>> -
> >>>>> -
> >>>>> +
> >>>>>    </head>
> >>>>>    <body>
> >>>>>    <!--h1>JDepend Report</h1>
> >>>>>    <ul>
> >>>>>    <xsl:for-each select="./Packages/Package">
> >>>>> -                <xsl:sort select="@name"/>
> >>>>> +      <xsl:sort select="@name"/>
> >>>>>        <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" />
> >>>>> -
> >>>>> +    <hr size="2"/>
> >>>>> +
> >>>>>    <table width="100%"><tr><td>
> >>>>>    <a name="NVsummary"><h2>Summary</h2></a>
> >>>>>    </td><td align="right">
> >>>>> @@ -100,7 +99,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 +111,6 @@
> >>>>>            <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,8 +130,6 @@
> >>>>>                <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>
> >>>>>    </xsl:for-each>
> >>>>> @@ -148,7 +144,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 +153,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 +166,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 +217,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 +226,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 +236,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,26 +245,26 @@
> >>>>>    [<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>
> >>>>>        <p>The ratio of efferent coupling (Ce) to total coupling (Ce /
> >>> (Ce + Ca)). This metric is an indicator of the package's resilience to
> >>> change. </p>
> >>>>> -        <p>The range for this metric is 0 to 1, with I=0 indicating
> a
> >>> completely stable package and I=1 indicating a completely instable
> package.
> >>> </p>
> >>>>> +        <p>The range for this metric is 0 to 1, with I=0 indicating
> a
> >>> completely stable package and I=1 indicating a completely unstable
> package.
> >>> </p>
> >>>>>    <h3><a name="EXdistance">Distance</a></h3>
> >>>>>        <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>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
> >>> unstable (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>
> >>>>>
> >>>>>
> >>>
> http://git-wip-us.apache.org/repos/asf/ant/blob/54b6df2f/src/etc/testcases/taskdefs/exec/exec.xml
> >>>>>
> ----------------------------------------------------------------------
> >>>>> diff --git a/src/etc/testcases/taskdefs/exec/exec.xml
> >>> b/src/etc/testcases/taskdefs/exec/exec.xml
> >>>>> index 20e5656..a04c621 100644
> >>>>> --- a/src/etc/testcases/taskdefs/exec/exec.xml
> >>>>> +++ b/src/etc/testcases/taskdefs/exec/exec.xml
> >>>>> @@ -20,9 +20,9 @@
> >>>>>
> >>>>>  <target name="setUp">
> >>>>>    <mkdir dir="${output}"/>
> >>>>> -     <!-- this property can be overriden programatically in the Java
> >>> test case -->
> >>>>> +     <!-- this property can be overridden programmatically in the
> Java
> >>> test case -->
> >>>>>    <property name="timeToWait" value="10"/>
> >>>>> -    <!-- this property can be overriden programatically in the Java
> >>> test case -->
> >>>>> +    <!-- this property can be overridden programmatically in the
> Java
> >>> test case -->
> >>>>>    <property name="logFile" value="${output}/spawn.log"/>
> >>>>>    <property environment="env"/>
> >>>>>    <!-- UNIX -->
> >>>>>
> >>>>>
> >>>
> http://git-wip-us.apache.org/repos/asf/ant/blob/54b6df2f/src/etc/testcases/taskdefs/optional/unix/symlink.xml
> >>>>>
> ----------------------------------------------------------------------
> >>>>> diff --git a/src/etc/testcases/taskdefs/optional/unix/symlink.xml
> >>> b/src/etc/testcases/taskdefs/optional/unix/symlink.xml
> >>>>> index 134f29f..2a55fe0 100644
> >>>>> --- a/src/etc/testcases/taskdefs/optional/unix/symlink.xml
> >>>>> +++ b/src/etc/testcases/taskdefs/optional/unix/symlink.xml
> >>>>> @@ -19,11 +19,11 @@
> >>>>> <!--
> >>>>>
> >>>>> /*
> >>>>> - * Since the initial version of this file was deveolped on the
> clock on
> >>>>> + * Since the initial version of this file was developed on the
> clock on
> >>>>> * an NSF grant I should say the following boilerplate:
> >>>>> *
> >>>>> * This material is based upon work supported by the National Science
> >>>>> - * Foundaton under Grant No. EIA-0196404. Any opinions, findings,
> and
> >>>>> + * Foundation under Grant No. EIA-0196404. Any opinions, findings,
> and
> >>>>> * conclusions or recommendations expressed in this material are those
> >>>>> * of the author and do not necessarily reflect the views of the
> >>>>> * National Science Foundation.
> >>>>> @@ -33,44 +33,44 @@
> >>>>>
> >>>>> <project name="symlink-test" basedir="." default="all">
> >>>>>
> >>>>> -  <!--
> >>>>> +  <!--
> >>>>>       Since the symlink task and some of these targets rely on
> >>>>> -       calls to exec, it may be possible for the JVM to outrun the
> >>>>> +       calls to exec, it may be possible for the JVM to outrun the
> >>>>>       execution of the command line  system calls, so this value is
> >>>>>       the number of seconds we give the operating system to
> >>>>> -       catch up before executing a task that depends on the
> >>>>> +       catch up before executing a task that depends on the
> >>>>>       completion of previous tasks. This delay is also added to
> >>>>>       the end of each target so junit doesn't go testing things
> >>>>> -       before they have finnished (hopefully). Tweak if needed.
> >>>>> +       before they have finished (hopefully). Tweak if needed.
> >>>>>  -->
> >>>>>
> >>>>>  <property name="delay" value="0"/>
> >>>>> -
> >>>>> +
> >>>>>  <import file="../../../buildfiletest-base.xml"/>
> >>>>>
> >>>>>  <target name="setUp">
> >>>>> -    <mkdir dir="${output}" />
> >>>>> +    <mkdir dir="${output}"/>
> >>>>>  </target>
> >>>>>
> >>>>>
> >>>>>  <target name="all"
> >>>>>              depends="setUp, test-single, test-delete, test-record,
> >>> test-recreate, tearDown"/>
> >>>>> -
> >>>>> +
> >>>>>  <!-- test for action = single -->
> >>>>> -  <!--
> >>>>> +  <!--
> >>>>>    Creates:
> >>>>>         File: ${output}/symlink.test
> >>>>>         Link: ${output}/singletest
> >>>>>  -->
> >>>>>  <target name="test-single">
> >>>>>    <touch file="${output}/symlink.test"/>
> >>>>> -    <symlink resource="${output}/symlink.test"
> >>>>> -             link="${output}/singletest"
> >>>>> +    <symlink resource="${output}/symlink.test"
> >>>>> +             link="${output}/singletest"
> >>>>>             failonerror="yes"/>
> >>>>>    <sleep seconds="${delay}"/> <!-- make sure OS has time to catch up
> >>> -->
> >>>>> -    <available file="${output}/symlink.test"
> >>>>> +    <available file="${output}/symlink.test"
> >>>>>               property="test.single.file.created"/>
> >>>>> -    <available file="${output}/singletest"
> >>>>> +    <available file="${output}/singletest"
> >>>>>               property="test.single.link.created"/>
> >>>>>  </target>
> >>>>>
> >>>>> @@ -78,7 +78,7 @@
> >>>>>
> >>>>>  <!-- test for action = delete  (no calls to command line so no
> sleep)
> >>> -->
> >>>>> -  <!--
> >>>>> +  <!--
> >>>>>    Creates:
> >>>>>         (none)
> >>>>>    Deletes:
> >>>>> @@ -87,8 +87,8 @@
> >>>>>
> >>>>>  <target name="test-delete">
> >>>>>    <touch file="${output}/symlink.test"/>
> >>>>> -    <symlink resource="${output}/symlink.test"
> >>>>> -             link="${output}/singletest"
> >>>>> +    <symlink resource="${output}/symlink.test"
> >>>>> +             link="${output}/singletest"
> >>>>>             failonerror="yes"/>
> >>>>>    <sleep seconds="${delay}"/> <!-- make sure OS has time to catch up
> >>> -->
> >>>>> @@ -96,19 +96,19 @@
> >>>>>    <symlink action="delete" link="${output}/symlink.test"
> >>> failonerror="no"/>
> >>>>>    <sleep seconds="${delay}"/> <!-- make sure OS has time to catch up
> >>> -->
> >>>>> -    <available file="${output}/symlink.test"
> >>>>> +    <available file="${output}/symlink.test"
> >>>>>               property="test.delete.file.still.there"/>
> >>>>> -    <available file="${output}/singletest"
> >>>>> +    <available file="${output}/singletest"
> >>>>>               property="test.delete.link.still.there"
> >>>>>               value="ERROR: link deletion failed"/>
> >>>>> -
> >>>>> +
> >>>>>  </target>
> >>>>>
> >>>>>
> >>>>>
> >>>>>  <!-- test for action = record -->
> >>>>>
> >>>>> -  <!--
> >>>>> +  <!--
> >>>>>    Creates:
> >>>>>         Dir:  ${output}/symtest1
> >>>>>         Dir:  ${output}/symtest1/symtest2
> >>>>> @@ -143,22 +143,22 @@
> >>>>>    <touch file="${output}/symtest1/symtest3/fileB"/>
> >>>>>    <touch file="${output}/symtest1/symtest3/fileC"/>
> >>>>>
> >>>>> -    <symlink resource="${output}/symtest1/file1"
> >>>>> -             link="${output}/symtest1/link1"
> >>>>> -             failonerror="no" />
> >>>>> -    <symlink resource="${output}/symtest1/symtest2/file2"
> >>>>> -             link="${output}/symtest1/link2"
> >>>>> -             failonerror="no" />
> >>>>> -    <symlink resource="${output}/symtest1/symtest2/file2"
> >>>>> -             link="${output}/symtest1/symtest2/link3"
> >>>>> -             failonerror="no" />
> >>>>> +    <symlink resource="${output}/symtest1/file1"
> >>>>> +             link="${output}/symtest1/link1"
> >>>>> +             failonerror="no"/>
> >>>>> +    <symlink resource="${output}/symtest1/symtest2/file2"
> >>>>> +             link="${output}/symtest1/link2"
> >>>>> +             failonerror="no"/>
> >>>>> +    <symlink resource="${output}/symtest1/symtest2/file2"
> >>>>> +             link="${output}/symtest1/symtest2/link3"
> >>>>> +             failonerror="no"/>
> >>>>>    <symlink resource="${output}/symtest1/symtest3"
> >>>>>             link="${output}/symtest1/dirlink"
> >>>>> -             failonerror="no" />
> >>>>> -    <symlink resource="${output}/symtest1/symtest3"
> >>>>> +             failonerror="no"/>
> >>>>> +    <symlink resource="${output}/symtest1/symtest3"
> >>>>>             link="${output}/symtest1/dirlink2"
> >>>>>             failonerror="no"/>
> >>>>> -    <symlink resource="${output}/symtest1/symtest3"
> >>>>> +    <symlink resource="${output}/symtest1/symtest3"
> >>>>>             link="${output}/symtest1/dirlink3"
> >>>>>             failonerror="no"/>
> >>>>>
> >>>>> @@ -217,7 +217,7 @@
> >>>>>
> >>>>>    <!-- this is redundant for this test, but used in the recreate
> test
> >>> -->
> >>>>> -    <available file="${output}/symtest1/dirlink2"
> >>>>> +    <available file="${output}/symtest1/dirlink2"
> >>>>>               property="test.record.dirlink2.created"/>
> >>>>>
> >>>>>    <!-- Test to see if the linkfiles were created -->
> >>>>> @@ -239,7 +239,7 @@
> >>>>>
> >>>>>  <!-- test for action = recreate -->
> >>>>>
> >>>>> -  <!--
> >>>>> +  <!--
> >>>>>    Deletes:
> >>>>>         Link: ${output}/symtest1/link1==>${output}/symtest1/file1
> >>>>>         Link:
> >>> ${output}/symtest1/link2==>${output}/symtest1/symtest2/file2
> >>>>> @@ -278,7 +278,7 @@
> >>>>>
> >>>>>    <sleep seconds="${delay}"/>  <!-- make sure OS has time to catch
> up
> >>> -->
> >>>>> -    <symlink resource="${output}/symtest1/symtest2"
> >>>>> +    <symlink resource="${output}/symtest1/symtest2"
> >>>>>             link="${output}/symtest1/dirlink3"
> >>>>>             failonerror="no"/>
> >>>>>
> >>>>> @@ -321,7 +321,7 @@
> >>>>>               property="test.recreate.dirlink.recreated"/>
> >>>>>
> >>>>>    <!-- this should not get set -->
> >>>>> -    <available file="${output}/symtest1/symtest3/symtest3"
> >>>>> +    <available file="${output}/symtest1/symtest3/symtest3"
> >>>>>               property="test.recreate.dirlink2.recreated.twice"
> >>>>>               value="ERROR: dirlink2 was created a second time (bug
> >>> 25181)"/>
> >>>>> @@ -329,13 +329,13 @@
> >>>>>
> >>>>>    <sleep seconds="${delay}"/>  <!-- make sure OS has time to do the
> >>> execs -->
> >>>>> -    <available file="${output}/symtest1/symtest3/WhereAmI"
> >>>>> +    <available file="${output}/symtest1/symtest3/WhereAmI"
> >>>>>               property="test.recreate.dirlink3.was.altered"/>
> >>>>>  </target>
> >>>>>
> >>>>>
> >>>>>  <!-- actually tests the symlink methods in FileUtils, but this
> >>>>> -       testfixture already has all the necessary envirnment in place
> >>>>> +       test fixture already has all the necessary environment in
> place
> >>>>>       -->
> >>>>>  <target name="test-fileutils" depends="setUp">
> >>>>>      <mkdir dir="${output}/dir1"/>
> >>>>>
> >>>>>
> >>>
> http://git-wip-us.apache.org/repos/asf/ant/blob/54b6df2f/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema-invalid.xml
> >>>>>
> ----------------------------------------------------------------------
> >>>>> diff --git
> >>> a/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema-invalid.xml
> >>> b/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema-invalid.xml
> >>>>> index ec58085..7cfa0f5 100644
> >>>>> ---
> >>> a/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema-invalid.xml
> >>>>> +++
> >>> b/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema-invalid.xml
> >>>>> @@ -16,15 +16,14 @@
> >>>>>  limitations under the License.
> >>>>> -->
> >>>>>
> >>>>> -<!--
> >>>>> -    Invalid test XML file without any schema refeferences
> >>>>> +<!--
> >>>>> +    Invalid test XML file without any schema references
> >>>>> -->
> >>>>> <doc>
> >>>>>    <section title="endpiece">
> >>>>> -        With a little luck, the network will pick me up.
> >>>>> +        With a little luck, the network will pick me up.
> >>>>>        This is Ripley - last survivor of The Nostromo - signing off.
> >>>>>    </section>
> >>>>> -
> >>>>> +
> >>>>>    <invalidelement/>
> >>>>> -
> >>>>> </doc>
> >>>>>
> >>>>>
> >>>
> http://git-wip-us.apache.org/repos/asf/ant/blob/54b6df2f/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema.xml
> >>>>>
> ----------------------------------------------------------------------
> >>>>> diff --git
> >>> a/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema.xml
> >>> b/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema.xml
> >>>>> index 7ae559d..99f9606 100644
> >>>>> --- a/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema.xml
> >>>>> +++ b/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema.xml
> >>>>> @@ -16,13 +16,12 @@
> >>>>>  limitations under the License.
> >>>>> -->
> >>>>>
> >>>>> -<!--
> >>>>> -    Test XML file without any schema refeferences
> >>>>> +<!--
> >>>>> +    Test XML file without any schema references
> >>>>> -->
> >>>>> <doc>
> >>>>>    <section title="endpiece">
> >>>>> -        With a little luck, the network will pick me up.
> >>>>> +        With a little luck, the network will pick me up.
> >>>>>        This is Ripley - last survivor of The Nostromo - signing off.
> >>>>>    </section>
> >>>>> -
> >>>>> </doc>
> >>>>>
> >>>>>
> >>>
> http://git-wip-us.apache.org/repos/asf/ant/blob/54b6df2f/src/etc/testcases/types/assertions.xml
> >>>>>
> ----------------------------------------------------------------------
> >>>>> diff --git a/src/etc/testcases/types/assertions.xml
> >>> b/src/etc/testcases/types/assertions.xml
> >>>>> index a849a0b..dfe0de4 100644
> >>>>> --- a/src/etc/testcases/types/assertions.xml
> >>>>> +++ b/src/etc/testcases/types/assertions.xml
> >>>>> @@ -27,175 +27,171 @@
> >>>>>           includes="*.java"
> >>>>>           source="${source}"
> >>>>>           debug="true"
> >>>>> -           destdir="${output}"
> >>>>> -        />
> >>>>> +           destdir="${output}"/>
> >>>>>  </target>
> >>>>>
> >>>>>  <property name="src.dir" location="assertions"/>
> >>>>>  <property name="classname" value="AssertionMain"/>
> >>>>>  <property name="test.classname" value="AssertionTest"/>
> >>>>> -
> >>>>> +
> >>>>>  <path id="assert.classpath">
> >>>>>    <pathelement location="${output}"/>
> >>>>> -  </path>
> >>>>> -
> >>>>> -
> >>>>> +  </path>
> >>>>> +
> >>>>> +
> >>>>>  <!-- if per-class assertions work, this run asserts -->
> >>>>>  <target name="test-classname" depends="setUp">
> >>>>>    <java fork="true" failonerror="true"
> >>>>> -      classname="${classname}"
> >>>>> -      classpathref="assert.classpath">
> >>>>> +          classname="${classname}"
> >>>>> +          classpathref="assert.classpath">
> >>>>>      <assertions enablesystemassertions="true">
> >>>>> -        <enable class="${classname}" />
> >>>>> +        <enable class="${classname}"/>
> >>>>>      </assertions>
> >>>>>    </java>
> >>>>>  </target>
> >>>>> -
> >>>>> +
> >>>>>  <!-- if package works, this run asserts -->
> >>>>>  <target name="test-package" depends="setUp">
> >>>>> -    <java fork="true"  failonerror="true"
> >>>>> -      classname="${classname}"
> >>>>> -      classpathref="assert.classpath">
> >>>>> -      <assertions enableSystemAssertions="false" >
> >>>>> -        <enable package="..." />
> >>>>> +    <java fork="true" failonerror="true"
> >>>>> +          classname="${classname}"
> >>>>> +          classpathref="assert.classpath">
> >>>>> +      <assertions enableSystemAssertions="false">
> >>>>> +        <enable package="..."/>
> >>>>>      </assertions>
> >>>>>    </java>
> >>>>>  </target>
> >>>>>
> >>>>>  <!-- this test should run the app successfully -->
> >>>>>  <target name="test-empty-assertions" depends="setUp">
> >>>>> -    <java fork="true"  failonerror="true"
> >>>>> -      classname="${classname}"
> >>>>> -      classpathref="assert.classpath">
> >>>>> +    <java fork="true" failonerror="true"
> >>>>> +          classname="${classname}"
> >>>>> +          classpathref="assert.classpath">
> >>>>>      <assertions/>
> >>>>>    </java>
> >>>>> -  </target>
> >>>>> +  </target>
> >>>>>
> >>>>>  <!-- this test should run the app successfully -->
> >>>>>  <target name="test-disable" depends="setUp">
> >>>>>    <java fork="true" failonerror="true"
> >>>>> -      classname="${classname}"
> >>>>> -      classpathref="assert.classpath">
> >>>>> -      <assertions enableSystemAssertions="false" >
> >>>>> -        <enable package="..." />
> >>>>> -        <disable class="${classname}" />
> >>>>> +          classname="${classname}"
> >>>>> +          classpathref="assert.classpath">
> >>>>> +      <assertions enableSystemAssertions="false">
> >>>>> +        <enable package="..."/>
> >>>>> +        <disable class="${classname}"/>
> >>>>>      </assertions>
> >>>>>    </java>
> >>>>> -  </target>
> >>>>> +  </target>
> >>>>>
> >>>>> -  <!-- repeated settigns result in the last declaration winning
> >>>>> -    except that the rule 'classes win over packages takes priority
> >>>>> -    this run will assert -->
> >>>>> +  <!-- repeated settings result in the last declaration winning
> >>>>> +       except that the rule 'classes win over packages takes
> priority
> >>>>> +       this run will assert -->
> >>>>>  <target name="test-override" depends="setUp">
> >>>>>    <java fork="true" failonerror="true"
> >>>>> -      classname="${classname}"
> >>>>> -      classpathref="assert.classpath">
> >>>>> -      <assertions enableSystemAssertions="false" >
> >>>>> -        <enable package="..." />
> >>>>> -        <disable class="${classname}" />
> >>>>> -        <enable class="${classname}" />
> >>>>> -        <disable package="..." />
> >>>>> +          classname="${classname}"
> >>>>> +          classpathref="assert.classpath">
> >>>>> +      <assertions enableSystemAssertions="false">
> >>>>> +        <enable package="..."/>
> >>>>> +        <disable class="${classname}"/>
> >>>>> +        <enable class="${classname}"/>
> >>>>> +        <disable package="..."/>
> >>>>>      </assertions>
> >>>>>    </java>
> >>>>> -  </target>
> >>>>> +  </target>
> >>>>>
> >>>>> -  <!-- repeated settigns result in the last declaration winning;
> >>>>> -    this run will not assert -->
> >>>>> +  <!-- repeated settings result in the last declaration winning;
> >>>>> +       this run will not assert -->
> >>>>>  <target name="test-override2" depends="setUp">
> >>>>>    <java fork="true" failonerror="true"
> >>>>> -      classname="${classname}"
> >>>>> -      classpathref="assert.classpath">
> >>>>> -      <assertions enableSystemAssertions="false" >
> >>>>> -        <enable package="..." />
> >>>>> -        <enable class="${classname}" />
> >>>>> -        <disable class="${classname}" />
> >>>>> +          classname="${classname}"
> >>>>> +          classpathref="assert.classpath">
> >>>>> +      <assertions enableSystemAssertions="false">
> >>>>> +        <enable package="..."/>
> >>>>> +        <enable class="${classname}"/>
> >>>>> +        <disable class="${classname}"/>
> >>>>>      </assertions>
> >>>>>    </java>
> >>>>> -  </target>
> >>>>> -
> >>>>> +  </target>
> >>>>> +
> >>>>>  <!-- if references work, this run asserts -->
> >>>>>  <target name="test-references">
> >>>>> -  <assertions id="project.assertions" >
> >>>>> -    <enable package="org.apache.test" />
> >>>>> -    <disable package="org.apache.log4j"/>
> >>>>> -    <enable package="..."/>
> >>>>> -  </assertions>
> >>>>> +    <assertions id="project.assertions">
> >>>>> +      <enable package="org.apache.test"/>
> >>>>> +      <disable package="org.apache.log4j"/>
> >>>>> +      <enable package="..."/>
> >>>>> +    </assertions>
> >>>>>    <java fork="true" failonerror="true"
> >>>>> -      classname="${classname}"
> >>>>> -      classpathref="assert.classpath">
> >>>>> +          classname="${classname}"
> >>>>> +          classpathref="assert.classpath">
> >>>>>      <assertions refid="project.assertions"/>
> >>>>>    </java>
> >>>>>  </target>
> >>>>> -
> >>>>> +
> >>>>>  <!-- when fork=false; we need to reject the construct -->
> >>>>>  <target name="test-nofork" depends="setUp">
> >>>>>    <java fork="false" failonerror="true"
> >>>>> -      classname="${classname}"
> >>>>> -      classpathref="assert.classpath">
> >>>>> +          classname="${classname}"
> >>>>> +          classpathref="assert.classpath">
> >>>>>      <assertions enablesystemassertions="true">
> >>>>> -        <enable class="${classname}" />
> >>>>> +        <enable class="${classname}"/>
> >>>>>      </assertions>
> >>>>>    </java>
> >>>>> -  </target>
> >>>>> +  </target>
> >>>>>
> >>>>>  <!-- this throws a build error -->
> >>>>>  <target name="test-multiple-assertions" depends="setUp">
> >>>>>    <java fork="true" failonerror="true"
> >>>>> -      classname="${classname}"
> >>>>> -      classpathref="assert.classpath">
> >>>>> +          classname="${classname}"
> >>>>> +          classpathref="assert.classpath">
> >>>>>      <assertions enablesystemassertions="true">
> >>>>> -

Reply via email to