Author: bodewig
Date: Mon Jun 14 16:13:56 2010
New Revision: 954537
URL: http://svn.apache.org/viewvc?rev=954537&view=rev
Log:
merge err/out changes from Ant's trunk (output to HTML rather than plain text)
Modified:
ant/antlibs/antunit/trunk/changes.xml
ant/antlibs/antunit/trunk/src/etc/junit-frames.xsl
ant/antlibs/antunit/trunk/src/etc/junit-noframes.xsl (contents, props
changed)
Modified: ant/antlibs/antunit/trunk/changes.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/changes.xml?rev=954537&r1=954536&r2=954537&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/changes.xml (original)
+++ ant/antlibs/antunit/trunk/changes.xml Mon Jun 14 16:13:56 2010
@@ -38,6 +38,11 @@
</properties>
<release version="1.2" date="not-released">
+ <action type="fix" breaks-bwc="true">
+ The XSLT stylesheets now create HTML files instead of plain text
+ for logs sent to System.err and System.out. You can always get
+ back to your own reporting by providing custom stylesheets.
+ </action>
<action type="add" issue="49168">
It is now possible to pass references from the build file
containing the <antunit> task to the build files under
Modified: ant/antlibs/antunit/trunk/src/etc/junit-frames.xsl
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/etc/junit-frames.xsl?rev=954537&r1=954536&r2=954537&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/src/etc/junit-frames.xsl (original)
+++ ant/antlibs/antunit/trunk/src/etc/junit-frames.xsl Mon Jun 14 16:13:56 2010
@@ -1,9 +1,10 @@
+<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt";
xmlns:redirect="http://xml.apache.org/xalan/redirect";
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
+<xsl:output method="html" indent="yes" encoding="UTF-8"/>
<xsl:decimal-format decimal-separator="." grouping-separator=","/>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -117,13 +118,27 @@ under the License.
<xsl:apply-templates select="." mode="project.details"/>
</redirect:write>
<xsl:if test="string-length(./system-out)!=0">
- <redirect:write
file="{$output.dir}/{$directory.dir}/{...@id}_{@name}-out.txt">
- <xsl:value-of disable-output-escaping="yes" select="./system-out"/>
+ <redirect:write
file="{$output.dir}/{$directory.dir}/{...@id}_{@name}-out.html">
+ <html>
+ <head>
+ <title>Standard Output from <xsl:value-of select="@name"/></title>
+ </head>
+ <body>
+ <pre><xsl:value-of select="./system-out"/></pre>
+ </body>
+ </html>
</redirect:write>
</xsl:if>
<xsl:if test="string-length(./system-err)!=0">
- <redirect:write
file="{$output.dir}/{$directory.dir}/{...@id}_{@name}-err.txt">
- <xsl:value-of disable-output-escaping="yes" select="./system-err"/>
+ <redirect:write
file="{$output.dir}/{$directory.dir}/{...@id}_{@name}-err.html">
+ <html>
+ <head>
+ <title>Standard Error from <xsl:value-of select="@name"/></title>
+ </head>
+ <body>
+ <pre><xsl:value-of select="./system-err"/></pre>
+ </body>
+ </html>
</redirect:write>
</xsl:if>
<xsl:if test="failures/text() != 0">
@@ -384,7 +399,7 @@ h6 {
<xsl:if test="string-length(./system-out)!=0">
<div class="Properties">
<a>
- <xsl:attribute name="href">./<xsl:value-of
select="@id"/>_<xsl:value-of select="@name"/>-out.txt</xsl:attribute>
+ <xsl:attribute name="href">./<xsl:value-of
select="@id"/>_<xsl:value-of select="@name"/>-out.html</xsl:attribute>
System.out »
</a>
</div>
@@ -392,7 +407,7 @@ h6 {
<xsl:if test="string-length(./system-err)!=0">
<div class="Properties">
<a>
- <xsl:attribute name="href">./<xsl:value-of
select="@id"/>_<xsl:value-of select="@name"/>-err.txt</xsl:attribute>
+ <xsl:attribute name="href">./<xsl:value-of
select="@id"/>_<xsl:value-of select="@name"/>-err.html</xsl:attribute>
System.err »
</a>
</div>
Modified: ant/antlibs/antunit/trunk/src/etc/junit-noframes.xsl
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/etc/junit-noframes.xsl?rev=954537&r1=954536&r2=954537&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/src/etc/junit-noframes.xsl (original)
+++ ant/antlibs/antunit/trunk/src/etc/junit-noframes.xsl Mon Jun 14 16:13:56
2010
@@ -1,7 +1,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt";
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"
+<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="," />
<!--
Propchange: ant/antlibs/antunit/trunk/src/etc/junit-noframes.xsl
------------------------------------------------------------------------------
svn:mergeinfo = /ant/core/trunk/src/etc/junit-noframes.xsl:954484
