From a586b0e0a3ead8a51254a7c464018eb8530bc1a4 Mon Sep 17 00:00:00 2001
From: Steve Loughran <stevel@apache.org>
Date: Wed, 1 Mar 2006 15:33:07 +0000
Subject: [PATCH] minor layout tweaks to make it slightly more readable,
 updated year and corrected an old URL

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@382058 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/junit-frames.xsl | 120 ++++++++++++++++++++-------------------
 src/etc/log.xsl          |   6 +-
 2 files changed, 64 insertions(+), 62 deletions(-)

diff --git a/src/etc/junit-frames.xsl b/src/etc/junit-frames.xsl
index 5240b693b..48a890847 100644
--- a/src/etc/junit-frames.xsl
+++ b/src/etc/junit-frames.xsl
@@ -65,19 +65,19 @@
 
     <!-- create the alltests-fails.html at the root -->
     <redirect:write file="{$output.dir}/alltests-fails.html">
-        <xsl:apply-templates select="." mode="all.tests">
-	    <xsl:with-param name="type" select="'fails'"/>
-	</xsl:apply-templates>
+      <xsl:apply-templates select="." mode="all.tests">
+        <xsl:with-param name="type" select="'fails'"/>
+      </xsl:apply-templates>
     </redirect:write>
 
-    <!-- create the alltests-errors.html at the root -->
+  <!-- create the alltests-errors.html at the root -->
     <redirect:write file="{$output.dir}/alltests-errors.html">
-        <xsl:apply-templates select="." mode="all.tests">
-	    <xsl:with-param name="type" select="'errors'"/>
-	</xsl:apply-templates>
+      <xsl:apply-templates select="." mode="all.tests">
+        <xsl:with-param name="type" select="'errors'"/>
+      </xsl:apply-templates>
     </redirect:write>
 
-    <!-- process all packages -->
+  <!-- process all packages -->
     <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
         <xsl:call-template name="package">
             <xsl:with-param name="name" select="@package"/>
@@ -109,35 +109,35 @@
 
     <!-- for each class, creates a @name.html -->
     <!-- @bug there will be a problem with inner classes having the same name, it will be overwritten -->
-    <xsl:for-each select="/testsuites/testsuite[@package = $name]">
-        <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}.html">
-            <xsl:apply-templates select="." mode="class.details"/>
-        </redirect:write>
-        <xsl:if test="string-length(./system-out)!=0">
-            <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-out.txt">
-                <xsl:value-of disable-output-escaping="yes" select="./system-out" />
-            </redirect:write>
-        </xsl:if>
-        <xsl:if test="string-length(./system-err)!=0">
-            <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-err.txt">
-                <xsl:value-of disable-output-escaping="yes" select="./system-err" />
-            </redirect:write>
-        </xsl:if>
-	<xsl:if test="@failures != 0">
-	    <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-fails.html">
-		<xsl:apply-templates select="." mode="class.details">
-		    <xsl:with-param name="type" select="'fails'"/>
-		</xsl:apply-templates>
-	    </redirect:write>
-	</xsl:if>
-	<xsl:if test="@errors != 0">
-	    <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-errors.html">
-		<xsl:apply-templates select="." mode="class.details">
-		    <xsl:with-param name="type" select="'errors'"/>
-		</xsl:apply-templates>
-	    </redirect:write>
-	</xsl:if>
-    </xsl:for-each>
+  <xsl:for-each select="/testsuites/testsuite[@package = $name]">
+    <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}.html">
+      <xsl:apply-templates select="." mode="class.details"/>
+    </redirect:write>
+    <xsl:if test="string-length(./system-out)!=0">
+      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-out.txt">
+        <xsl:value-of disable-output-escaping="yes" select="./system-out"/>
+      </redirect:write>
+    </xsl:if>
+    <xsl:if test="string-length(./system-err)!=0">
+      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-err.txt">
+        <xsl:value-of disable-output-escaping="yes" select="./system-err"/>
+      </redirect:write>
+    </xsl:if>
+    <xsl:if test="@failures != 0">
+      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-fails.html">
+        <xsl:apply-templates select="." mode="class.details">
+          <xsl:with-param name="type" select="'fails'"/>
+        </xsl:apply-templates>
+      </redirect:write>
+    </xsl:if>
+    <xsl:if test="@errors != 0">
+      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-errors.html">
+        <xsl:apply-templates select="." mode="class.details">
+          <xsl:with-param name="type" select="'errors'"/>
+        </xsl:apply-templates>
+      </redirect:write>
+    </xsl:if>
+  </xsl:for-each>
 </xsl:template>
 
 <xsl:template name="index.html">
@@ -248,28 +248,30 @@ h6 {
                 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>
-                    </tr>
-                </xsl:if>
-		<xsl:choose>
-		    <xsl:when test="$type = 'fails'">
-			<xsl:apply-templates select=".//testcase[failure]" mode="print.test">
-			    <xsl:with-param name="show.class" select="'yes'"/>
-			</xsl:apply-templates>
-		    </xsl:when>
-		    <xsl:when test="$type = 'errors'">
-			<xsl:apply-templates select=".//testcase[error]" mode="print.test">
-			    <xsl:with-param name="show.class" select="'yes'"/>
-			</xsl:apply-templates>
-		    </xsl:when>
-		    <xsl:otherwise>
-			<xsl:apply-templates select=".//testcase" mode="print.test">
-			    <xsl:with-param name="show.class" select="'yes'"/>
-			</xsl:apply-templates>
-		    </xsl:otherwise>
-		</xsl:choose>
+              <xsl:if test="./error">
+                <tr class="Error">
+                  <td colspan="4">
+                    <xsl:apply-templates select="./error"/>
+                  </td>
+                </tr>
+              </xsl:if>
+              <xsl:choose>
+                <xsl:when test="$type = 'fails'">
+                  <xsl:apply-templates select=".//testcase[failure]" mode="print.test">
+                    <xsl:with-param name="show.class" select="'yes'"/>
+                  </xsl:apply-templates>
+                </xsl:when>
+                <xsl:when test="$type = 'errors'">
+                  <xsl:apply-templates select=".//testcase[error]" mode="print.test">
+                    <xsl:with-param name="show.class" select="'yes'"/>
+                  </xsl:apply-templates>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:apply-templates select=".//testcase" mode="print.test">
+                    <xsl:with-param name="show.class" select="'yes'"/>
+                  </xsl:apply-templates>
+                </xsl:otherwise>
+              </xsl:choose>
             </table>
         </body>
     </html>
diff --git a/src/etc/log.xsl b/src/etc/log.xsl
index 227279027..4a243ff11 100644
--- a/src/etc/log.xsl
+++ b/src/etc/log.xsl
@@ -1,7 +1,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
 <!--
-    Copyright  2000-2004 The Apache Software Foundation
+    Copyright  2000-2006 The Apache Software Foundation
    
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -112,7 +112,7 @@
         </a>
       </td>
       <td style="text-align:right;vertical-align:bottom">
-        <a href="http://jakarta.apache.org/ant">Apache Ant</a>
+        <a href="http://ant.apache.org/">Apache Ant</a>
       </td>
     </tr>
     </table>
@@ -128,7 +128,7 @@
       <tr><td><hr noshade="yes" size="1"/></td></tr>
       <tr><td>
       <div align="center"><font color="#525D76" size="-1"><em>
-      Copyright &#169; 2000-2002, Apache Software Foundation
+      Copyright &#169; 2000-2006, Apache Software Foundation
       </em></font></div>
       </td></tr>
     </table>