Author: jglick
Date: Mon Jun 14 14:29:36 2010
New Revision: 954484
URL: http://svn.apache.org/viewvc?rev=954484&view=rev
Log:
#49418: produce HTML output for stdout/stderr from <junitreport> to declare
encoding.
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/etc/junit-frames-xalan1.xsl
ant/core/trunk/src/etc/junit-frames.xsl
ant/core/trunk/src/etc/junit-noframes.xsl
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=954484&r1=954483&r2=954484&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Mon Jun 14 14:29:36 2010
@@ -57,6 +57,9 @@ Fixed bugs:
* <javac> failed for long command lines on OS/2.
Bugzilla Report 49425.
+ * <junitreport> did not handle encodings well for stdout/stderr.
+ Bugzilla Report 49418.
+
Other changes:
--------------
Modified: ant/core/trunk/src/etc/junit-frames-xalan1.xsl
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/junit-frames-xalan1.xsl?rev=954484&r1=954483&r2=954484&view=diff
==============================================================================
--- ant/core/trunk/src/etc/junit-frames-xalan1.xsl (original)
+++ ant/core/trunk/src/etc/junit-frames-xalan1.xsl Mon Jun 14 14:29:36 2010
@@ -4,7 +4,7 @@
xmlns:redirect="org.apache.xalan.lib.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 or more
@@ -97,14 +97,28 @@
<xsl:apply-templates select="." mode="class.details"/>
</redirect:write>
<xsl:if test="string-length(./system-out)!=0">
- <redirect:write
file="{$output.dir}/{$package.dir}/{...@name}-out.txt">
- <xsl:value-of select="./system-out" />
- </redirect:write>
+ <redirect:write
file="{$output.dir}/{$package.dir}/{...@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}/{$package.dir}/{...@name}-err.txt">
- <xsl:value-of select="./system-err" />
- </redirect:write>
+ <redirect:write
file="{$output.dir}/{$package.dir}/{...@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:for-each>
</xsl:template>
@@ -264,7 +278,7 @@ h6 {
<xsl:if test="string-length(./system-out)!=0">
<div class="Properties">
<a>
- <xsl:attribute name="href">./<xsl:value-of
select="@name"/>-out.txt</xsl:attribute>
+ <xsl:attribute name="href">./<xsl:value-of
select="@name"/>-out.html</xsl:attribute>
System.out »
</a>
</div>
@@ -272,7 +286,7 @@ h6 {
<xsl:if test="string-length(./system-err)!=0">
<div class="Properties">
<a>
- <xsl:attribute name="href">./<xsl:value-of
select="@name"/>-err.txt</xsl:attribute>
+ <xsl:attribute name="href">./<xsl:value-of
select="@name"/>-err.html</xsl:attribute>
System.err »
</a>
</div>
Modified: ant/core/trunk/src/etc/junit-frames.xsl
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/junit-frames.xsl?rev=954484&r1=954483&r2=954484&view=diff
==============================================================================
--- ant/core/trunk/src/etc/junit-frames.xsl (original)
+++ ant/core/trunk/src/etc/junit-frames.xsl Mon Jun 14 14:29:36 2010
@@ -4,7 +4,7 @@
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 or more
@@ -117,13 +117,27 @@
<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
file="{$output.dir}/{$package.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}/{$package.dir}/{...@id}_{@name}-err.txt">
- <xsl:value-of disable-output-escaping="yes" select="./system-err"/>
+ <redirect:write
file="{$output.dir}/{$package.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 != 0">
@@ -384,7 +398,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 +406,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/core/trunk/src/etc/junit-noframes.xsl
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/junit-noframes.xsl?rev=954484&r1=954483&r2=954484&view=diff
==============================================================================
--- ant/core/trunk/src/etc/junit-noframes.xsl (original)
+++ ant/core/trunk/src/etc/junit-noframes.xsl Mon Jun 14 14:29:36 2010
@@ -2,7 +2,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="," />
<!--
