You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2003/11/08 13:07:52 UTC
cvs commit: jakarta-cactus/integration/maven/xdocs changes.xml properties.xml
vmassol 2003/11/08 04:07:52
Modified: integration/maven plugin.properties plugin.jelly
integration/maven/xdocs changes.xml properties.xml
Log:
Fixed bug <a href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-1000">MAVEN-1000</a>. Cactus tests are now automatically started by default when the site is generated. This feature can be turned off.
Revision Changes Path
1.3 +5 -0 jakarta-cactus/integration/maven/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.properties 29 Oct 2003 18:30:01 -0000 1.2
+++ plugin.properties 8 Nov 2003 12:07:52 -0000 1.3
@@ -48,6 +48,11 @@
# "printsummary" attribute of the JUnit Ant task.
cactus.printsummary = withOutAndErr
+# Should Cactus tests be run whenever cactus:report is called (e.g. when
+# the web site is generated). Default to true. If you wish to optimize build
+# speed, you can turn this off.
+cactus.execute.during.report = true
+
# (optional) Temporary directory where the containers are setup/executed
#cactus.tmp.dir =
1.5 +40 -6 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 7 Nov 2003 15:17:02 -0000 1.4
+++ plugin.jelly 8 Nov 2003 12:07:52 -0000 1.5
@@ -741,12 +741,46 @@
<goal name="cactus:report"
description="Generate a report from the test results">
- <doc:jsl
- input="${cactus.reports.dir}/TESTS-TestSuites-Cactus.xml"
- output="cactus-report.xml"
- stylesheet="${plugin.resources}/cactus.jsl"
- outputMode="xml"
- prettyPrint="true"/>
+ <j:if test="${context.getVariable('cactus.execute.during.report') == 'true'}">
+ <attainGoal name="cactus:test"/>
+ </j:if>
+
+ <!-- Before running the report, check the required test suite xml file has
+ been generated -->
+ <util:file var="inputAsFile"
+ name="${cactus.reports.dir}/TESTS-TestSuites-Cactus.xml}"/>
+ <j:choose>
+ <j:when test="${inputAsFile.exists()}">
+
+ <doc:jsl
+ input="${cactus.reports.dir}/TESTS-TestSuites-Cactus.xml"
+ output="cactus-report.xml"
+ stylesheet="${plugin.resources}/cactus.jsl"
+ outputMode="xml"
+ prettyPrint="true"/>
+
+ </j:when>
+ <j:otherwise>
+ <ant:mkdir dir="${maven.gen.docs}"/>
+ <j:file name="${maven.gen.docs}/cactus-report.xml" prettyPrint="true"
+ xmlns="cactus">
+ <document>
+ <properties>
+ <title>Cactus Test Results</title>
+ </properties>
+ <body>
+ <section name="Cactus test results">
+ <p>
+ No Cactus results to report. Make sure the Cactus tests are
+ run before the report is generated.
+ </p>
+ </section>
+ </body>
+ </document>
+ </j:file>
+ <echo>You need to run Cactus tests before generating the report.</echo>
+ </j:otherwise>
+ </j:choose>
</goal>
1.5 +6 -0 jakarta-cactus/integration/maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/changes.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- changes.xml 7 Nov 2003 15:17:01 -0000 1.4
+++ changes.xml 8 Nov 2003 12:07:52 -0000 1.5
@@ -9,6 +9,12 @@
<release version="1.6dev" date="in CVS">
<action dev="vmassol" type="fix">
+ Fixed bug
+ <a href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-1000">MAVEN-1000</a>.
+ Cactus tests are now automatically started by default when the site is
+ generated. This feature can be turned off.
+ </action>
+ <action dev="vmassol" type="fix">
Fixed bug
<a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24447">24447</a>.
The plugin now correctly uses the <code>${maven.war.final.name}</code>
1.7 +11 -0 jakarta-cactus/integration/maven/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/properties.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- properties.xml 29 Oct 2003 21:49:00 -0000 1.6
+++ properties.xml 8 Nov 2003 12:07:52 -0000 1.7
@@ -145,6 +145,17 @@
</p>
</td>
</tr>
+ <tr>
+ <td>cactus.execute.during.report</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Should Cactus tests be run whenever cactus:report is called
+ (e.g. when the web site is generated). Default value is
+ <code>true</code>.
+ </p>
+ </td>
+ </tr>
</table>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org