bodewig 2004/06/25 06:42:10
Modified: . WHATSNEW build.xml
docs faq.html
docs/manual/OptionalTasks junitreport.html
src/etc junit-frames.xsl
src/main/org/apache/tools/ant/taskdefs/optional/junit
Xalan1Executor.java Xalan2Executor.java
XalanExecutor.java
xdocs faq.xml
Added: src/etc junit-frames-xalan1.xsl
Log:
Make <junitreport> work with JDK 1.5.
PR: 27541
Most of the work has been done by Stephane, I just provided the
finishing touches.
Revision Changes Path
1.632 +14 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.631
retrieving revision 1.632
diff -u -r1.631 -r1.632
--- WHATSNEW 24 Jun 2004 19:30:03 -0000 1.631
+++ WHATSNEW 25 Jun 2004 13:42:07 -0000 1.632
@@ -44,6 +44,17 @@
* Nested elements for namespaced tasks and types may belong to the
Ant default namespace as well as the task's or type's namespace.
+* <junitreport> will very likely no longer work with Xalan-J 1.
+
+ Note that Xalan-J 1 has been deprecated for a very long time and we
+ highly recommend that you upgrade.
+
+ If you really need to continue using Xalan-J 1, please copy the
+ junit-frames-xalan1.xsl from the distributions etc directory as
+ junit-frames.xsl into a new directory and use the tasks styledir
+ attribute to point to. This is the last version of the XSLT
+ stylesheet that is expected to be compatible with Xalan-J 1.
+
Fixed bugs:
-----------
@@ -244,6 +255,9 @@
* <apply> has a new ignoremissing attribute (default true for BC)
which will allow nonexistent files specified via <filelist>s to
be passed to the executable. Bugzilla Report 29585.
+
+* <junitreport> now also works with Xalan XSLTC and/or JDK 1.5.
+ Bugzilla Report 27541.
Changes from Ant 1.6.0 to Ant 1.6.1
=============================================
1.423 +1 -0 ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- build.xml 2 Jun 2004 12:09:45 -0000 1.422
+++ build.xml 25 Jun 2004 13:42:08 -0000 1.423
@@ -1032,6 +1032,7 @@
<fileset dir="${etc.dir}">
<include name="junit-frames.xsl"/>
<include name="junit-noframes.xsl"/>
+ <include name="junit-frames-xalan1.xsl"/>
<include name="coverage-frames.xsl"/>
<include name="maudit-frames.xsl"/>
<include name="mmetrics-frames.xsl"/>
1.101 +2 -2 ant/docs/faq.html
Index: faq.html
===================================================================
RCS file: /home/cvs/ant/docs/faq.html,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- faq.html 16 Jun 2004 14:25:33 -0000 1.100
+++ faq.html 25 Jun 2004 13:42:08 -0000 1.101
@@ -1693,8 +1693,8 @@
extensions for its internal stylesheet, Ant doesn't support
XSLTC yet. This means that you have to install <a
href="http://xml.apache.org/xalan-j/";>Xalan-J 2</a> in order
to use this task with JDK 1.5.</p>
- <p>If you want to follow progress on this, <a
href="http://issues.apache.org/bugzilla/show_bug.cgi?id=27541";>here</a>
- is the relevant bug report.</p>
+ <p>Starting with Ant 1.6.2
<code><junitreport></code>
+ will support JDK 1.5.</p>
</div>
</div>
1.14 +18 -14 ant/docs/manual/OptionalTasks/junitreport.html
Index: junitreport.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/junitreport.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- junitreport.html 2 Jun 2004 12:31:18 -0000 1.13
+++ junitreport.html 25 Jun 2004 13:42:09 -0000 1.14
@@ -14,21 +14,25 @@
Library Dependencies</a> for more information.</p>
<h3>Requirements</h3>
-<p>The task needs <a href="http://xml.apache.org/xalan-j/";>Xalan
-2.x</a>; although <a
+
+<p>The task needs Apache <a
+href="http://xml.apache.org/xalan-j/";>Xalan 2.x or Xalan XSLTC</a>
+(JDK 1.4 contains a version of Xalan-J 2.x while JDK 1.5 ships with a
+version of XSLTC). Versions prior to Ant 1.6.2 worked with Apache <a
href="http://xml.apache.org/dist/xalan-j/old/xalan-j_1_2_2.zip";>Xalan
-1.2.2</a> does work, but as Xalan1 is not supported, we do not
-recommend this. While JDK 1.4.x contains a version of Xalan-J 2, JDK
-1.5 and later have <a
-href="http://java.sun.com/j2se/1.5.0/compatibility.html#4959783";>moved
-to XSLTC</a>. Since this task uses Xalan's redirect extensions for
-its internal stylesheet, Ant doesn't support XSLTC yet. This means
-that you have to install Xalan-J 2 in order to use this task with JDK
-1.5.</p>
-<p>
-If you do you use Xalan 1.2.2 you will need a compatible (older) version of
Xerces.
-as well as BSF(bsf.jar). Again, using Xalan 2 is simpler and supported.
-</i></p>
+1.2.2</a>, but as Xalan1 is no longer supported, we do not recommend
+this. With Ant 1.6.2 we had to decide between supporting Xalan-J 1
+and XSLTC, since there was no way to support both at the same
+time.</p>
+
+<p>If you want to use Xalan 1.2.2, the noframes report is still
+supposed to work. If you want the frames support, copy the file
+junit-frames-xalan1.xsl from the Ant distribution's etc directory to a
+new directory, change its name to junit-frames.xsl and use the task's
+styledir attribute to point to it. You will also need a compatible
+(older) version of Xerces. as well as BSF(bsf.jar). Again, using
+Xalan 2 is simpler and supported.</p>
+
<h3>Parameters</h3>
<table border="1" cellpadding="2" cellspacing="0">
<tr>
1.21 +1 -1 ant/src/etc/junit-frames.xsl
Index: junit-frames.xsl
===================================================================
RCS file: /home/cvs/ant/src/etc/junit-frames.xsl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- junit-frames.xsl 8 Jun 2004 13:52:22 -0000 1.20
+++ junit-frames.xsl 25 Jun 2004 13:42:09 -0000 1.21
@@ -1,6 +1,6 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt";
- xmlns:redirect="org.apache.xalan.lib.Redirect"
+ 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"/>
1.1 ant/src/etc/junit-frames-xalan1.xsl
Index: junit-frames-xalan1.xsl
===================================================================
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt";
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:decimal-format decimal-separator="." grouping-separator=","/>
<!--
Copyright 2001-2004 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
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.
-->
<!--
Sample stylesheet to be used with Ant JUnitReport output.
It creates a set of HTML files a la javadoc where you can browse easily
through all packages and classes.
-->
<xsl:param name="output.dir" select="'.'"/>
<xsl:template match="testsuites">
<!-- create the index.html -->
<redirect:write file="{$output.dir}/index.html">
<xsl:call-template name="index.html"/>
</redirect:write>
<!-- create the stylesheet.css -->
<redirect:write file="{$output.dir}/stylesheet.css">
<xsl:call-template name="stylesheet.css"/>
</redirect:write>
<!-- create the overview-packages.html at the root -->
<redirect:write file="{$output.dir}/overview-summary.html">
<xsl:apply-templates select="." mode="overview.packages"/>
</redirect:write>
<!-- create the all-packages.html at the root -->
<redirect:write file="{$output.dir}/overview-frame.html">
<xsl:apply-templates select="." mode="all.packages"/>
</redirect:write>
<!-- create the all-classes.html at the root -->
<redirect:write file="{$output.dir}/allclasses-frame.html">
<xsl:apply-templates select="." mode="all.classes"/>
</redirect:write>
<!-- 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"/>
</xsl:call-template>
</xsl:for-each>
</xsl:template>
<xsl:template name="package">
<xsl:param name="name"/>
<xsl:variable name="package.dir">
<xsl:if test="not($name = '')"><xsl:value-of
select="translate($name,'.','/')"/></xsl:if>
<xsl:if test="$name = ''">.</xsl:if>
</xsl:variable>
<!--Processing package <xsl:value-of select="@name"/> in <xsl:value-of
select="$output.dir"/> -->
<!-- create a classes-list.html in the package directory -->
<redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
<xsl:call-template name="classes.list">
<xsl:with-param name="name" select="$name"/>
</xsl:call-template>
</redirect:write>
<!-- create a package-summary.html in the package directory -->
<redirect:write file="{$output.dir}/{$package.dir}/package-summary.html">
<xsl:call-template name="package.summary">
<xsl:with-param name="name" select="$name"/>
</xsl:call-template>
</redirect:write>
<!-- 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/[EMAIL PROTECTED] = $name]">
<redirect:write file="{$output.dir}/{$package.dir}/[EMAIL PROTECTED]">
<xsl:apply-templates select="." mode="class.details"/>
</redirect:write>
<xsl:if test="string-length(./system-out)!=0">
<redirect:write file="{$output.dir}/{$package.dir}/[EMAIL
PROTECTED]">
<xsl:value-of select="./system-out" />
</redirect:write>
</xsl:if>
<xsl:if test="string-length(./system-err)!=0">
<redirect:write file="{$output.dir}/{$package.dir}/[EMAIL
PROTECTED]">
<xsl:value-of select="./system-err" />
</redirect:write>
</xsl:if>
</xsl:for-each>
</xsl:template>
<xsl:template name="index.html">
<html>
<head>
<title>Unit Test Results.</title>
</head>
<frameset cols="20%,80%">
<frameset rows="30%,70%">
<frame src="overview-frame.html" name="packageListFrame"/>
<frame src="allclasses-frame.html" name="classListFrame"/>
</frameset>
<frame src="overview-summary.html" name="classFrame"/>
<noframes>
<h2>Frame Alert</h2>
<p>
This document is designed to be viewed using the frames
feature. If you see this message, you are using a non-frame-capable web client.
</p>
</noframes>
</frameset>
</html>
</xsl:template>
<!-- this is the stylesheet css to use for nearly everything -->
<xsl:template name="stylesheet.css">
body {
font:normal 68% verdana,arial,helvetica;
color:#000000;
}
table tr td, table tr th {
font-size: 68%;
}
table.details tr th{
font-weight: bold;
text-align:left;
background:#a6caf0;
}
table.details tr td{
background:#eeeee0;
}
p {
line-height:1.5em;
margin-top:0.5em; margin-bottom:1.0em;
}
h1 {
margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
}
h2 {
margin-top: 1em; margin-bottom: 0.5em; font: bold 125%
verdana,arial,helvetica
}
h3 {
margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
}
h4 {
margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
}
h5 {
margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
}
h6 {
margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
}
.Error {
font-weight:bold; color:red;
}
.Failure {
font-weight:bold; color:purple;
}
.Properties {
text-align:right;
}
</xsl:template>
<!-- ======================================================================
This page is created for every testsuite class.
It prints a summary of the testsuite and detailed information about
testcase methods.
======================================================================
-->
<xsl:template match="testsuite" mode="class.details">
<xsl:variable name="package.name" select="@package"/>
<xsl:variable name="class.name"><xsl:if test="not($package.name =
'')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of
select="@name"/></xsl:variable>
<html>
<head>
<title>Unit Test Results: <xsl:value-of
select="$class.name"/></title>
<xsl:call-template name="create.stylesheet.link">
<xsl:with-param name="package.name" select="$package.name"/>
</xsl:call-template>
<script type="text/javascript" language="JavaScript">
var TestCases = new Array();
var cur;
<xsl:apply-templates select="properties"/>
</script>
<script type="text/javascript" language="JavaScript"><![CDATA[
function displayProperties (name) {
var win =
window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
var doc = win.document.open();
doc.write("<html><head><title>Properties of " + name + "</title>");
doc.write("<style type=\"text/css\">");
doc.write("body {font:normal 68% verdana,arial,helvetica;
color:#000000; }");
doc.write("table tr td, table tr th { font-size: 68%; }");
doc.write("table.properties { border-collapse:collapse;
border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
doc.write("table.properties th { text-align:left;
border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc;
background-color:#eeeeee; }");
doc.write("table.properties td { font:normal; text-align:left;
border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc;
background-color:#fffffff; }");
doc.write("h3 { margin-bottom: 0.5em; font: bold 115%
verdana,arial,helvetica }");
doc.write("</style>");
doc.write("</head><body>");
doc.write("<h3>Properties of " + name + "</h3>");
doc.write("<div align=\"right\"><a
href=\"javascript:window.close();\">Close</a></div>");
doc.write("<table class='properties'>");
doc.write("<tr><th>Name</th><th>Value</th></tr>");
for (prop in TestCases[name]) {
doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop]
+ "</td></tr>");
}
doc.write("</table>");
doc.write("</body></html>");
doc.close();
win.focus();
}
]]>
</script>
</head>
<body>
<xsl:call-template name="pageHeader"/>
<h3>Class <xsl:value-of select="$class.name"/></h3>
<table class="details" border="0" cellpadding="5" cellspacing="2"
width="95%">
<xsl:call-template name="testsuite.test.header"/>
<xsl:apply-templates select="." mode="print.test"/>
</table>
<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:if test="./error">
<tr class="Error">
<td colspan="4"><xsl:apply-templates
select="./error"/></td>
</tr>
</xsl:if>
<xsl:apply-templates select="./testcase" mode="print.test"/>
</table>
<div class="Properties">
<a>
<xsl:attribute
name="href">javascript:displayProperties('<xsl:value-of
select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>
Properties »
</a>
</div>
<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>
System.out »
</a>
</div>
</xsl:if>
<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>
System.err »
</a>
</div>
</xsl:if>
</body>
</html>
</xsl:template>
<!--
Write properties into a JavaScript data structure.
This is based on the original idea by Erik Hatcher ([EMAIL PROTECTED])
-->
<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>
<!-- ======================================================================
This page is created for every package.
It prints the name of all classes that belongs to this package.
@param name the package name to print classes.
======================================================================
-->
<!-- list of classes in a package -->
<xsl:template name="classes.list">
<xsl:param name="name"/>
<html>
<head>
<title>Unit Test Classes: <xsl:value-of select="$name"/></title>
<xsl:call-template name="create.stylesheet.link">
<xsl:with-param name="package.name" select="$name"/>
</xsl:call-template>
</head>
<body>
<table width="100%">
<tr>
<td nowrap="nowrap">
<h2><a href="package-summary.html"
target="classFrame">
<xsl:value-of select="$name"/>
<xsl:if test="$name = ''"><none></xsl:if>
</a></h2>
</td>
</tr>
</table>
<h2>Classes</h2>
<table width="100%">
<xsl:for-each select="/testsuites/testsuite[./@package =
$name]">
<xsl:sort select="@name"/>
<tr>
<td nowrap="nowrap">
<a href="[EMAIL PROTECTED]"
target="classFrame"><xsl:value-of select="@name"/></a>
</td>
</tr>
</xsl:for-each>
</table>
</body>
</html>
</xsl:template>
<!--
Creates an all-classes.html file that contains a link to all
package-summary.html
on each class.
-->
<xsl:template match="testsuites" mode="all.classes">
<html>
<head>
<title>All Unit Test Classes</title>
<xsl:call-template name="create.stylesheet.link">
<xsl:with-param name="package.name"/>
</xsl:call-template>
</head>
<body>
<h2>Classes</h2>
<table width="100%">
<xsl:apply-templates select="testsuite" mode="all.classes">
<xsl:sort select="@name"/>
</xsl:apply-templates>
</table>
</body>
</html>
</xsl:template>
<xsl:template match="testsuite" mode="all.classes">
<xsl:variable name="package.name" select="@package"/>
<tr>
<td nowrap="nowrap">
<a target="classFrame">
<xsl:attribute name="href">
<xsl:if test="not($package.name='')">
<xsl:value-of
select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
</xsl:if><xsl:value-of
select="@name"/><xsl:text>.html</xsl:text>
</xsl:attribute>
<xsl:value-of select="@name"/>
</a>
</td>
</tr>
</xsl:template>
<!--
Creates an html file that contains a link to all package-summary.html
files on
each package existing on testsuites.
@bug there will be a problem here, I don't know yet how to handle unnamed
package :(
-->
<xsl:template match="testsuites" mode="all.packages">
<html>
<head>
<title>All Unit Test Packages</title>
<xsl:call-template name="create.stylesheet.link">
<xsl:with-param name="package.name"/>
</xsl:call-template>
</head>
<body>
<h2><a href="overview-summary.html"
target="classFrame">Home</a></h2>
<h2>Packages</h2>
<table width="100%">
<xsl:apply-templates select="testsuite[not(./@package =
preceding-sibling::testsuite/@package)]" mode="all.packages">
<xsl:sort select="@package"/>
</xsl:apply-templates>
</table>
</body>
</html>
</xsl:template>
<xsl:template match="testsuite" mode="all.packages">
<tr>
<td nowrap="nowrap">
<a href="./{translate(@package,'.','/')}/package-summary.html"
target="classFrame">
<xsl:value-of select="@package"/>
<xsl:if test="@package = ''"><none></xsl:if>
</a>
</td>
</tr>
</xsl:template>
<xsl:template match="testsuites" mode="overview.packages">
<html>
<head>
<title>Unit Test Results: Summary</title>
<xsl:call-template name="create.stylesheet.link">
<xsl:with-param name="package.name"/>
</xsl:call-template>
</head>
<body>
<xsl:attribute
name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute>
<xsl:call-template name="pageHeader"/>
<h2>Summary</h2>
<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="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%">
<tr valign="top">
<th>Tests</th>
<th>Failures</th>
<th>Errors</th>
<th>Success rate</th>
<th>Time</th>
</tr>
<tr valign="top">
<xsl:attribute name="class">
<xsl:choose>
<xsl:when test="$errorCount > 0">Error</xsl:when>
<xsl:when test="$failureCount > 0">Failure</xsl:when>
<xsl:otherwise>Pass</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<td><xsl:value-of select="$testCount"/></td>
<td><xsl:value-of select="$failureCount"/></td>
<td><xsl:value-of select="$errorCount"/></td>
<td>
<xsl:call-template name="display-percent">
<xsl:with-param name="value" select="$successRate"/>
</xsl:call-template>
</td>
<td>
<xsl:call-template name="display-time">
<xsl:with-param name="value" select="$timeCount"/>
</xsl:call-template>
</td>
</tr>
</table>
<table border="0" width="95%">
<tr>
<td style="text-align: justify;">
Note: <em>failures</em> are anticipated and checked for with
assertions while <em>errors</em> are unanticipated.
</td>
</tr>
</table>
<h2>Packages</h2>
<table class="details" border="0" cellpadding="5" cellspacing="2"
width="95%">
<xsl:call-template name="testsuite.test.header"/>
<xsl:for-each select="testsuite[not(./@package =
preceding-sibling::testsuite/@package)]">
<xsl:sort select="@package" order="ascending"/>
<!-- get the node set containing all testsuites that have the
same package -->
<xsl:variable name="insamepackage"
select="/testsuites/testsuite[./@package = current()/@package]"/>
<tr valign="top">
<!-- display a failure if there is any failure/error in
the package -->
<xsl:attribute name="class">
<xsl:choose>
<xsl:when test="sum($insamepackage/@errors) >
0">Error</xsl:when>
<xsl:when test="sum($insamepackage/@failures)
> 0">Failure</xsl:when>
<xsl:otherwise>Pass</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<td><a
href="./{translate(@package,'.','/')}/package-summary.html">
<xsl:value-of select="@package"/>
<xsl:if test="@package = ''"><none></xsl:if>
</a></td>
<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:call-template name="display-time">
<xsl:with-param name="value"
select="sum($insamepackage/@time)"/>
</xsl:call-template>
</td>
<td><xsl:value-of
select="$insamepackage/@timestamp"/></td>
<td><xsl:value-of select="$insamepackage/@hostname"/></td>
</tr>
</xsl:for-each>
</table>
</body>
</html>
</xsl:template>
<xsl:template name="package.summary">
<xsl:param name="name"/>
<html>
<head>
<xsl:call-template name="create.stylesheet.link">
<xsl:with-param name="package.name" select="$name"/>
</xsl:call-template>
</head>
<body>
<xsl:attribute
name="onload">open('package-frame.html','classListFrame')</xsl:attribute>
<xsl:call-template name="pageHeader"/>
<h3>Package <xsl:value-of select="$name"/></h3>
<!--table border="0" cellpadding="5" cellspacing="2" width="95%">
<xsl:call-template name="class.metrics.header"/>
<xsl:apply-templates select="." mode="print.metrics"/>
</table-->
<xsl:variable name="insamepackage"
select="/testsuites/testsuite[./@package = $name]"/>
<xsl:if test="count($insamepackage) > 0">
<h2>Classes</h2>
<p>
<table class="details" border="0" cellpadding="5"
cellspacing="2" width="95%">
<xsl:call-template name="testsuite.test.header"/>
<xsl:apply-templates select="$insamepackage"
mode="print.test">
<xsl:sort select="@name"/>
</xsl:apply-templates>
</table>
</p>
</xsl:if>
</body>
</html>
</xsl:template>
<!--
transform string like a.b.c to ../../../
@param path the path to transform into a descending directory path
-->
<xsl:template name="path">
<xsl:param name="path"/>
<xsl:if test="contains($path,'.')">
<xsl:text>../</xsl:text>
<xsl:call-template name="path">
<xsl:with-param name="path"><xsl:value-of
select="substring-after($path,'.')"/></xsl:with-param>
</xsl:call-template>
</xsl:if>
<xsl:if test="not(contains($path,'.')) and not($path = '')">
<xsl:text>../</xsl:text>
</xsl:if>
</xsl:template>
<!-- create the link to the stylesheet based on the package name -->
<xsl:template name="create.stylesheet.link">
<xsl:param name="package.name"/>
<link rel="stylesheet" type="text/css" title="Style"><xsl:attribute
name="href"><xsl:if test="not($package.name = 'unnamed
package')"><xsl:call-template name="path"><xsl:with-param name="path"
select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></link>
</xsl:template>
<!-- Page HEADER -->
<xsl:template name="pageHeader">
<h1>Unit Test Results</h1>
<table width="100%">
<tr>
<td align="left"></td>
<td align="right">Designed for use with <a
href="http://www.junit.org/";>JUnit</a> and <a
href="http://jakarta.apache.org/";>Ant</a>.</td>
</tr>
</table>
<hr size="1"/>
</xsl:template>
<!-- class header -->
<xsl:template name="testsuite.test.header">
<tr valign="top">
<th width="80%">Name</th>
<th>Tests</th>
<th>Errors</th>
<th>Failures</th>
<th nowrap="nowrap">Time(s)</th>
<th nowrap="nowrap">Time Stamp</th>
<th>Host</th>
</tr>
</xsl:template>
<!-- method header -->
<xsl:template name="testcase.test.header">
<tr valign="top">
<th>Name</th>
<th>Status</th>
<th width="80%">Type</th>
<th nowrap="nowrap">Time(s)</th>
</tr>
</xsl:template>
<!-- class information -->
<xsl:template match="testsuite" mode="print.test">
<tr valign="top">
<xsl:attribute name="class">
<xsl:choose>
<xsl:when test="@errors[.> 0]">Error</xsl:when>
<xsl:when test="@failures[.> 0]">Failure</xsl:when>
<xsl:otherwise>Pass</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<td><a href="[EMAIL PROTECTED]"><xsl:value-of
select="@name"/></a></td>
<td><xsl:apply-templates select="@tests"/></td>
<td><xsl:apply-templates select="@errors"/></td>
<td><xsl:apply-templates select="@failures"/></td>
<td><xsl:call-template name="display-time">
<xsl:with-param name="value" select="@time"/>
</xsl:call-template>
</td>
<td><xsl:apply-templates select="@timestamp"/></td>
<td><xsl:apply-templates select="@hostname"/></td>
</tr>
</xsl:template>
<xsl:template match="testcase" mode="print.test">
<tr valign="top">
<xsl:attribute name="class">
<xsl:choose>
<xsl:when test="error">Error</xsl:when>
<xsl:when test="failure">Failure</xsl:when>
<xsl:otherwise>TableRowColor</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<td><xsl:value-of select="@name"/></td>
<xsl:choose>
<xsl:when test="failure">
<td>Failure</td>
<td><xsl:apply-templates select="failure"/></td>
</xsl:when>
<xsl:when test="error">
<td>Error</td>
<td><xsl:apply-templates select="error"/></td>
</xsl:when>
<xsl:otherwise>
<td>Success</td>
<td></td>
</xsl:otherwise>
</xsl:choose>
<td>
<xsl:call-template name="display-time">
<xsl:with-param name="value" select="@time"/>
</xsl:call-template>
</td>
</tr>
</xsl:template>
<!-- Note : the below template error and failure are the same style
so just call the same style store in the toolkit template -->
<xsl:template match="failure">
<xsl:call-template name="display-failures"/>
</xsl:template>
<xsl:template match="error">
<xsl:call-template name="display-failures"/>
</xsl:template>
<!-- Style for the error and failure in the testcase template -->
<xsl:template name="display-failures">
<xsl:choose>
<xsl:when test="not(@message)">N/A</xsl:when>
<xsl:otherwise>
<xsl:value-of select="@message"/>
</xsl:otherwise>
</xsl:choose>
<!-- display the stacktrace -->
<br/><br/>
<code>
<xsl:call-template name="br-replace">
<xsl:with-param name="word" select="."/>
</xsl:call-template>
</code>
<!-- the latter is better but might be problematic for non-21"
monitors... -->
<!--pre><xsl:value-of select="."/></pre-->
</xsl:template>
<xsl:template name="JS-escape">
<xsl:param name="string"/>
<xsl:param name="tmp1"
select="stringutils:replace(string($string),'\','\\')"/>
<xsl:param name="tmp2"
select="stringutils:replace(string($tmp1),"'","\'")"/>
<xsl:value-of select="$tmp2"/>
</xsl:template>
<!--
template that will convert a carriage return into a br tag
@param word the text from which to convert CR to BR tag
-->
<xsl:template name="br-replace">
<xsl:param name="word"/>
<xsl:param name="br"><br/></xsl:param>
<xsl:value-of select='stringutils:replace(string($word),"
",$br)'/>
</xsl:template>
<xsl:template name="display-time">
<xsl:param name="value"/>
<xsl:value-of select="format-number($value,'0.000')"/>
</xsl:template>
<xsl:template name="display-percent">
<xsl:param name="value"/>
<xsl:value-of select="format-number($value,'0.00%')"/>
</xsl:template>
</xsl:stylesheet>
1.14 +27 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java
Index: Xalan1Executor.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Xalan1Executor.java 9 Feb 2004 21:05:32 -0000 1.13
+++ Xalan1Executor.java 25 Jun 2004 13:42:10 -0000 1.14
@@ -30,10 +30,35 @@
* @ant.task ignore="true"
*/
public class Xalan1Executor extends XalanExecutor {
+
+ private static final String xsltP =
"org.apache.xalan.xslt.XSLTProcessor";
+
+ private XSLTProcessor processor = XSLTProcessorFactory.getProcessor();
+
+ protected String getImplementation() {
+ return processor.getClass().getName();
+ }
+
+ protected String getProcVersion(String classNameImpl)
+ throws BuildException {
+ try {
+ // xalan 1
+ if (classNameImpl.equals(xsltP)){
+ return getXalanVersion(xsltP + "Version");
+ }
+ throw new BuildException("Could not find a valid processor
version"
+ + " implementation from "
+ + classNameImpl);
+ } catch (ClassNotFoundException e){
+ throw new BuildException("Could not find processor version "
+ + "implementation", e);
+ }
+ }
+
void execute() throws Exception {
- XSLTProcessor processor = XSLTProcessorFactory.getProcessor();
// need to quote otherwise it breaks because of "extra illegal
tokens"
- processor.setStylesheetParam("output.dir", "'" +
caller.toDir.getAbsolutePath() + "'");
+ processor.setStylesheetParam("output.dir", "'"
+ + caller.toDir.getAbsolutePath() + "'");
XSLTInputSource xml_src = new XSLTInputSource(caller.document);
String system_id = caller.getStylesheetSystemId();
XSLTInputSource xsl_src = new XSLTInputSource(system_id);
1.11 +41 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java
Index: Xalan2Executor.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Xalan2Executor.java 9 Feb 2004 21:05:32 -0000 1.10
+++ Xalan2Executor.java 25 Jun 2004 13:42:10 -0000 1.11
@@ -25,6 +25,8 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+import org.apache.tools.ant.BuildException;
+
/**
* Xalan executor via JAXP. Nothing special must exists in the classpath
* besides of course, a parser, jaxp and xalan.
@@ -32,8 +34,46 @@
* @ant.task ignore="true"
*/
public class Xalan2Executor extends XalanExecutor {
+
+ private static final String aPack = "org.apache.xalan.";
+ private static final String sPack = "com.sun.org.apache.xalan.";
+
+ private TransformerFactory tfactory = TransformerFactory.newInstance();
+
+ protected String getImplementation() throws BuildException {
+ return tfactory.getClass().getName();
+ }
+
+ protected String getProcVersion(String classNameImpl)
+ throws BuildException {
+ try {
+ // xalan 2
+ if (classNameImpl.equals(aPack +
"processor.TransformerFactoryImpl")
+ ||
+ classNameImpl.equals(aPack + "xslt.XSLTProcessorFactory")) {
+ return getXalanVersion(aPack +
"processor.XSLProcessorVersion");
+ }
+ // xalan xsltc
+ if (classNameImpl.equals(aPack
+ + "xsltc.trax.TransformerFactoryImpl")){
+ return getXSLTCVersion(aPack +"xsltc.ProcessorVersion");
+ }
+ // jdk 1.5 xsltc
+ if (classNameImpl
+ .equals(sPack +
"internal.xsltc.trax.TransformerFactoryImpl")){
+ return getXSLTCVersion(sPack
+ + "internal.xsltc.ProcessorVersion");
+ }
+ throw new BuildException("Could not find a valid processor
version"
+ + " implementation from "
+ + classNameImpl);
+ } catch (ClassNotFoundException e){
+ throw new BuildException("Could not find processor version "
+ + "implementation", e);
+ }
+ }
+
void execute() throws Exception {
- TransformerFactory tfactory = TransformerFactory.newInstance();
String system_id = caller.getStylesheetSystemId();
Source xsl_src = new StreamSource(system_id);
Transformer tformer = tfactory.newTransformer(xsl_src);
1.16 +59 -36
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java
Index: XalanExecutor.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XalanExecutor.java 2 Jun 2004 12:31:18 -0000 1.15
+++ XalanExecutor.java 25 Jun 2004 13:42:10 -0000 1.16
@@ -33,9 +33,12 @@
* Command class that encapsulate specific behavior for each
* Xalan version. The right executor will be instantiated at
* runtime via class lookup. For instance, it will check first
- * for Xalan2, then for Xalan1.
+ * for Xalan2/XSLTC, then for Xalan1.
*/
abstract class XalanExecutor {
+ private static final String pack =
+ "org.apache.tools.ant.taskdefs.optional.junit.";
+
/** the transformer caller */
protected AggregateTransformer caller;
@@ -45,7 +48,7 @@
}
/** get the appropriate stream based on the format (frames/noframes) */
- protected OutputStream getOutputStream() throws IOException {
+ protected final OutputStream getOutputStream() throws IOException {
if (AggregateTransformer.FRAMES.equals(caller.format)) {
// dummy output for the framed report
// it's all done by extension...
@@ -66,53 +69,73 @@
* @throws BuildException thrown if it could not find a valid xalan
* executor.
*/
- static XalanExecutor newInstance(AggregateTransformer caller) throws
BuildException {
- Class procVersion = null;
+ static XalanExecutor newInstance(AggregateTransformer caller)
+ throws BuildException {
XalanExecutor executor = null;
try {
- procVersion =
Class.forName("org.apache.xalan.processor.XSLProcessorVersion");
- executor = (XalanExecutor) Class.forName(
-
"org.apache.tools.ant.taskdefs.optional.junit.Xalan2Executor").newInstance();
- } catch (Exception xalan2missing) {
- StringWriter swr = new StringWriter();
- xalan2missing.printStackTrace(new PrintWriter(swr));
- caller.task.log("Didn't find Xalan2.", Project.MSG_DEBUG);
- caller.task.log(swr.toString(), Project.MSG_DEBUG);
+ Class clazz = Class.forName(pack + "Xalan2Executor");
+ executor = (XalanExecutor)clazz.newInstance();
+ } catch (Exception xsltcApacheMissing){
+ caller.task.log(xsltcApacheMissing.toString());
try {
- procVersion =
Class.forName("org.apache.xalan.xslt.XSLProcessorVersion");
- executor = (XalanExecutor) Class.forName(
-
"org.apache.tools.ant.taskdefs.optional.junit.Xalan1Executor").newInstance();
- } catch (Exception xalan1missing) {
- swr = new StringWriter();
- xalan1missing.printStackTrace(new PrintWriter(swr));
- caller.task.log("Didn't find Xalan1.", Project.MSG_DEBUG);
- caller.task.log(swr.toString(), Project.MSG_DEBUG);
- String msg = "Could not find xalan2 nor xalan1 "
- + "in the classpath. Check
http://xml.apache.org/xalan-j/";;
- if (!JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)
- && !JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2)
- && !JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_3)
- && !JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_4)) {
- msg += "\r\nStarting with JDK 1.5, the built-in
processor "
- + "of the JDK is no longer Xalan\r\nbut XSLTC which
is "
- + "not (yet) supported by the junitreport task.";
- }
- throw new BuildException(msg);
+ Class clazz = Class.forName(pack + "Xalan1Executor");
+ executor = (XalanExecutor) clazz.newInstance();
+ } catch (Exception xalan1Missing){
+ caller.task.log(xalan1Missing.toString());
+ throw new BuildException("Could not find xstlc nor xalan2
nor "
+ + "xalan1 in the classpath. Check "
+ + "http://xml.apache.org/xalan-j";);
}
}
- String version = getXalanVersion(procVersion);
- caller.task.log("Using Xalan version: " + version);
+ String classNameImpl = executor.getImplementation();
+ String version = executor.getProcVersion(classNameImpl);
+ caller.task.log("Using " + version, Project.MSG_VERBOSE);
executor.setCaller(caller);
return executor;
}
+ /**
+ * This methods should return the classname implementation of the
+ * underlying xslt processor
+ * @return the classname of the implementation, for example:
+ * org.apache.xalan.processor.TransformerFactoryImpl
+ * @see #getProcVersion(String)
+ */
+ protected abstract String getImplementation();
+
+ /**
+ * Try to discover the xslt processor version based on the
+ * className. There is nothing carved in stone and it can change
+ * anytime, so this is just for the sake of giving additional
+ * information if we can find it.
+ * @param classNameImpl the classname of the underlying xslt processor
+ * @return a string representing the implementation version.
+ * @throws BuildException
+ */
+ protected abstract String getProcVersion(String classNameImpl)
+ throws BuildException;
+
+ /** a bit simplistic but xsltc data are conveniently private non final */
+ protected final String getXSLTCVersion(String procVersionClassName)
+ throws ClassNotFoundException {
+ // there's a convenient xsltc class version but data are
+ // private so use package information
+ Class procVersion = Class.forName(procVersionClassName);
+ Package pkg = procVersion.getPackage();
+ return pkg.getName() + " " + pkg.getImplementationTitle()
+ + " " + pkg.getImplementationVersion();
+ }
+
/** pretty useful data (Xalan version information) to display. */
- private static String getXalanVersion(Class procVersion) {
+ protected final String getXalanVersion(String procVersionClassName)
+ throws ClassNotFoundException {
+ Class procVersion = Class.forName(procVersionClassName);
+ String pkg = procVersion.getPackage().getName();
try {
Field f = procVersion.getField("S_VERSION");
- return f.get(null).toString();
+ return pkg + " " + f.get(null).toString();
} catch (Exception e) {
- return "?";
+ return pkg + " ?.?";
}
}
}
1.56 +2 -3 ant/xdocs/faq.xml
Index: faq.xml
===================================================================
RCS file: /home/cvs/ant/xdocs/faq.xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- faq.xml 2 Jun 2004 12:31:18 -0000 1.55
+++ faq.xml 25 Jun 2004 13:42:10 -0000 1.56
@@ -1507,9 +1507,8 @@
href="http://xml.apache.org/xalan-j/";>Xalan-J 2</a> in order
to use this task with JDK 1.5.</p>
- <p>If you want to follow progress on this, <a
-
href="http://issues.apache.org/bugzilla/show_bug.cgi?id=27541";>here</a>
- is the relevant bug report.</p>
+ <p>Starting with Ant 1.6.2 <code><junitreport></code>
+ will support JDK 1.5.</p>
</answer>
</faq>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
