dion 2003/08/07 10:00:29
Modified: src/plugins-build/runner Tag: MAVEN_RC1_STABLE plugin.jelly
src/plugins-build/jxr/src/main/org/apache/maven/jxr Tag:
MAVEN_RC1_STABLE JxrBean.java JXR.java
src/plugins-build/plexus Tag: MAVEN_RC1_STABLE project.xml
plugin.jelly
src/plugins-build/statcvs Tag: MAVEN_RC1_STABLE plugin.jelly
src/plugins-build/multiproject Tag: MAVEN_RC1_STABLE
project.xml plugin.properties plugin.jelly
src/plugins-build/linkcheck Tag: MAVEN_RC1_STABLE maven.xml
src/plugins-build/shell Tag: MAVEN_RC1_STABLE plugin.jelly
src/plugins-build/latka Tag: MAVEN_RC1_STABLE project.xml
src/plugins-build/junit-report/src/plugin-resources Tag:
MAVEN_RC1_STABLE junit.jsl
src/plugins-build/simian Tag: MAVEN_RC1_STABLE project.xml
maven.xml
src/plugins-build/pmd/src/plugin-resources Tag:
MAVEN_RC1_STABLE pmd.jsl
src/plugins-build/plugin Tag: MAVEN_RC1_STABLE plugin.jelly
project.xml
src/plugins-build/multiproject/src/plugin-resources/templates
Tag: MAVEN_RC1_STABLE projects-overview.xml
navigation-independent.xml navigation-aggregate.xml
src/plugins-build/multiproject/xdocs Tag: MAVEN_RC1_STABLE
navigation.xml
src/plugins-build/native/samples/helloworld Tag:
MAVEN_RC1_STABLE maven.xml
src/plugins-build/repository Tag: MAVEN_RC1_STABLE
plugin.jelly
src/plugins-build/site Tag: MAVEN_RC1_STABLE plugin.jelly
src/plugins-build/struts Tag: MAVEN_RC1_STABLE project.xml
Added: src/plugins-build/junit-report/src/plugin-resources Tag:
MAVEN_RC1_STABLE junit-failed.jsl
src/plugins-build/multiproject/xdocs Tag: MAVEN_RC1_STABLE
faq.fml
Log:
Update from back ported fixes
Revision Changes Path
No revision
No revision
1.2.2.1 +1 -1 maven/src/plugins-build/runner/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/runner/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- plugin.jelly 5 May 2003 15:12:17 -0000 1.2
+++ plugin.jelly 7 Aug 2003 17:00:28 -0000 1.2.2.1
@@ -5,7 +5,7 @@
xmlns:define="jelly:define"
xmlns:deploy="deploy"
xmlns:sea="sea"
- xmlns:velocity="jelly:org.apache.commons.jelly.tags.velocity.VelocityTagLibrary"
+ xmlns:velocity="jelly:velocity"
xmlns:runner="runner">
<!-- ===================================================================== -->
No revision
No revision
1.5.2.1 +2 -5
maven/src/plugins-build/jxr/src/main/org/apache/maven/jxr/JxrBean.java
Index: JxrBean.java
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/jxr/src/main/org/apache/maven/jxr/JxrBean.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- JxrBean.java 24 Feb 2003 13:58:52 -0000 1.5
+++ JxrBean.java 7 Aug 2003 17:00:28 -0000 1.5.2.1
@@ -84,9 +84,7 @@
*/
public class JxrBean
{
- /**
- * Log.
- */
+ /** Log. */
private static final Log log = LogFactory.getLog(JxrBean.class);
/*
@@ -118,7 +116,6 @@
{
// get a relative link to the javadocs
String javadocLinkDir = null;
- System.out.println("javadocdir:" + javadocLinkDir);
if (javadocDir != null) {
javadocLinkDir = getRelativeLink(destDir, javadocDir);
}
1.4.2.1 +7 -10
maven/src/plugins-build/jxr/src/main/org/apache/maven/jxr/JXR.java
Index: JXR.java
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/jxr/src/main/org/apache/maven/jxr/JXR.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- JXR.java 18 Apr 2003 14:38:36 -0000 1.4
+++ JXR.java 7 Aug 2003 17:00:28 -0000 1.4.2.1
@@ -57,6 +57,8 @@
import java.io.File;
import java.io.IOException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.maven.jxr.pacman.PackageManager;
import org.apache.tools.ant.DirectoryScanner;
@@ -68,6 +70,9 @@
*/
public class JXR
{
+ /** Log. */
+ private static final Log log = LogFactory.getLog(JxrBean.class);
+
/**
* Description of the Field
*/
@@ -252,18 +257,10 @@
throws IOException
{
- log(source + " -> " + dest);
+ log.debug(source + " -> " + dest);
transformer.transform(source, dest, javadocLinkDir, this.revision);
- }
-
- /**
- * Log to system.out
- */
- private void log(String message)
- {
- System.out.println("\t" + message);
}
/**
No revision
No revision
1.22.2.1 +4 -0 maven/src/plugins-build/plexus/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/plexus/project.xml,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -r1.22 -r1.22.2.1
--- project.xml 25 Jul 2003 06:35:27 -0000 1.22
+++ project.xml 7 Aug 2003 17:00:28 -0000 1.22.2.1
@@ -15,6 +15,7 @@
<url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/plexus/</url>
</repository>
<developers/>
+
<dependencies>
<dependency>
<groupId>commons-jelly</groupId>
@@ -28,6 +29,7 @@
<id>velocity</id>
<version>1.4-dev</version>
</dependency>
+
<!-- Betwixt requirements -->
<dependency>
@@ -73,6 +75,7 @@
<id>ant</id>
<version>1.5.3-1</version>
</dependency>
+
<!-- Betwixt requirements -->
<dependency>
@@ -83,6 +86,7 @@
<id>xml-apis</id>
<version>1.0.b2</version>
</dependency>
+
<!--
|
| Plexus dependencies.
1.19.2.1 +1 -1 maven/src/plugins-build/plexus/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/plexus/plugin.jelly,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- plugin.jelly 25 Jul 2003 16:27:39 -0000 1.19
+++ plugin.jelly 7 Aug 2003 17:00:28 -0000 1.19.2.1
@@ -5,7 +5,7 @@
xmlns:define="jelly:define"
xmlns:deploy="deploy"
xmlns:sea="sea"
- xmlns:velocity="jelly:org.apache.commons.jelly.tags.velocity.VelocityTagLibrary"
+ xmlns:velocity="jelly:velocity"
xmlns:plexus-taglib="jelly:org.apache.maven.plexus.jelly.PlexusTagLibrary"
xmlns:plexus="plexus">
No revision
No revision
1.7.2.1 +1 -2 maven/src/plugins-build/statcvs/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/statcvs/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- plugin.jelly 11 Jul 2003 12:40:24 -0000 1.7
+++ plugin.jelly 7 Aug 2003 17:00:28 -0000 1.7.2.1
@@ -4,8 +4,7 @@
xmlns:j="jelly:core"
xmlns:maven="jelly:maven"
xmlns:ant="jelly:ant"
- xmlns:doc="doc"
- xmlns:m="maven">
+ xmlns:doc="doc">
<!-- ==================================================================
Generate CVS statistics on the current CVS project
No revision
No revision
1.6.4.1 +17 -0 maven/src/plugins-build/multiproject/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/project.xml,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -r1.6 -r1.6.4.1
--- project.xml 25 Jul 2003 12:31:32 -0000 1.6
+++ project.xml 7 Aug 2003 17:00:28 -0000 1.6.4.1
@@ -57,4 +57,21 @@
</dependency>
</dependencies>
+
+ <reports>
+ <report>maven-changelog-plugin</report>
+ <report>maven-changes-plugin</report>
+ <report>maven-checkstyle-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-faq-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ <report>maven-jdepend-plugin</report>
+ <report>maven-junit-report-plugin</report>
+ <report>maven-jxr-plugin</report>
+ <report>maven-license-plugin</report>
+ <report>maven-linkcheck-plugin</report>
+ <report>maven-pmd-plugin</report>
+ <report>maven-tasklist-plugin</report>
+ </reports>
</project>
1.6.2.1 +5 -1 maven/src/plugins-build/multiproject/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/plugin.properties,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- plugin.properties 27 Jul 2003 21:48:41 -0000 1.6
+++ plugin.properties 7 Aug 2003 17:00:28 -0000 1.6.2.1
@@ -20,4 +20,8 @@
maven.multiproject.aggregateDir=multiproject/
#should overview page be created?
-maven.multiproject.overviewPage=true
+maven.multiproject.overviewPage.create=true
+maven.multiproject.overviewPage.title=Overview of projects
+maven.multiproject.overviewPage.link=projects-overview
+maven.multiproject.overviewPage.linkTitle=Overview of project
+maven.multiproject.overviewPage.text=
\ No newline at end of file
1.20.2.1 +96 -60 maven/src/plugins-build/multiproject/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/plugin.jelly,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -r1.20 -r1.20.2.1
--- plugin.jelly 27 Jul 2003 21:48:41 -0000 1.20
+++ plugin.jelly 7 Aug 2003 17:00:28 -0000 1.20.2.1
@@ -2,7 +2,6 @@
<project
xmlns:j="jelly:core"
- xmlns:m="maven"
xmlns:maven="jelly:maven"
xmlns:ant="jelly:ant"
xmlns:doc="doc"
@@ -22,11 +21,42 @@
prereqs="multiproject:site">
</goal>
+
+ <!--======================================================================-->
+ <!-- Runs reactor and puts variable "reactorProjects" into jelly contex -->
+ <!-- This allows to share the work done by reactor in goals -->
+ <!-- which just need the list of project but don't need to run any goal -->
+ <!--======================================================================-->
+ <goal name="multiproject:site-init">
+
+ <!-- FIXME: This can't use multiproject:goal as it throws away the projects -->
+ <!-- generate site docs -->
+ <maven:reactor
+ basedir="${maven.multiproject.basedir}"
+ banner="Generating site for "
+ includes="${maven.multiproject.includes}"
+ excludes="${maven.multiproject.excludes}"
+ postProcessing="true"
+ ignoreFailures="${maven.multiproject.ignoreFailures}"
+ />
+
+ <mkdir dir="${maven.gen.docs}"/>
+
+ <j:set var="aggregateDir" value="${maven.multiproject.aggregateDir}"/>
+ <j:set var="navType" value="${maven.multiproject.navigation}"/>
+ <j:set var="overviewPageCreate"
value="${maven.multiproject.overviewPage.create}"/>
+ <j:set var="overviewPageTitle"
value="${maven.multiproject.overviewPage.title}"/>
+ <j:set var="overviewPageLink"
value="${maven.multiproject.overviewPage.link}"/>
+ <j:set var="overviewPageLinkTitle"
value="${maven.multiproject.overviewPage.linkTitle}"/>
+ <j:set var="overviewPageText"
value="${maven.multiproject.overviewPage.text}"/>
+ </goal>
+
+
<!--==================================================================-->
<!-- Builds sites for all subprojects -->
<!--==================================================================-->
- <goal name="multiproject:site"
- description="Run the site goal of all subprojects">
+ <goal name="multiproject:site"
+ description="Run the site goal of all subprojects">
<attainGoal name="multiproject:create-nav"/>
<attainGoal name="multiproject:create-overview-page"/>
@@ -71,31 +101,17 @@
<!--==================================================================-->
<!-- Generate HTML files for navigation bar across projects. -->
<!--==================================================================-->
- <goal name="multiproject:create-nav">
- <mkdir dir="${maven.gen.docs}"/>
-
- <!-- FIXME: 2) Needs to be a tag
- | get all projects for template processing
- | -->
- <maven:reactor
- basedir="${maven.multiproject.basedir}"
- banner="Getting projects for navigation"
- includes="${maven.multiproject.includes}"
- excludes="${maven.multiproject.excludes}"
- postProcessing="true"
- ignoreFailures="true"
- />
-
+ <goal name="multiproject:create-nav"
+ prereqs="multiproject:site-init">
+
+
<j:forEach var="reactorProject" items="${reactorProjects}">
<j:if test="${reactorProject.id == pom.id}">
<fail message="You must exclude ${pom.id} (the top level project) from the
subproject set"/>
</j:if>
</j:forEach>
- <!-- generate navbar for project based on aggregate or independent -->
- <j:set var="aggregateDir" value="${maven.multiproject.aggregateDir}"/>
- <j:set var="navType" value="${maven.multiproject.navigation}"/>
- <j:set var="createOverviewPage" value="${maven.multiproject.overviewPage}"/>
+ <!-- generate navbar for project based on aggregate or independent -->
<j:if test="${navType != ''}">
<echo>Producing ${navType} navigation...</echo>
<velocity:merge
@@ -126,32 +142,26 @@
<!--==================================================================-->
<!-- Generate Overview of all projects -->
<!--==================================================================-->
- <goal name="multiproject:create-overview-page">
+ <goal name="multiproject:create-overview-page"
+ prereqs="multiproject:site-init">
- <mkdir dir="${maven.gen.docs}"/>
+
- <j:set var="createOverviewPage" value="${maven.multiproject.overviewPage}"/>
- <j:if test="${createOverviewPage=='true'}">
-
- <!-- FIXME: 2) Needs to be a tag
- | get all projects for template processing
- | -->
- <maven:reactor
- basedir="${maven.multiproject.basedir}"
- banner="Getting projects for creating an overview page"
- includes="${maven.multiproject.includes}"
- excludes="${maven.multiproject.excludes}"
- postProcessing="true"
- ignoreFailures="true"
- />
+ <j:new var="file" className="java.io.File">
+ <j:arg value="${maven.gen.docs}/${overviewPageLink}.xml"/>
+ </j:new>
- <ant:echo>Using
tamplate:${maven.multiproject.templates}/projects-overview.xml</ant:echo>
+ <mkdir dir="${file.parent}"/>
+
+ <ant:echo>${file.parent} ${file.parent}</ant:echo>
+ <ant:echo>create ${overviewPageCreate}</ant:echo>
+ <j:if test="${overviewPageCreate=='true'}">
<velocity:merge
- name="${maven.gen.docs}/projects-overview.xml"
+ name="${maven.gen.docs}/${overviewPageLink}.xml"
basedir="${maven.multiproject.templates}"
template="projects-overview.xml"/>
</j:if>
-
+
</goal>
@@ -163,10 +173,12 @@
<!--==================================================================-->
<!-- Run specific sets of goals for all subprojects -->
<!--==================================================================-->
- <goal name="multiproject:goal" description="Run a given goal on all projects">
- <m:param-check value="${goal}" fail="true">
+ <goal name="multiproject:goal"
+ description="Run a given goal on all projects">
+
+ <maven:param-check value="${goal}" fail="true">
A goal to run must be specified, e.g.
-maven -Dgoal=clean multiproject:goal</m:param-check>
+maven -Dgoal=clean multiproject:goal</maven:param-check>
<maven:reactor
basedir="${maven.multiproject.basedir}"
@@ -183,7 +195,7 @@
<!-- Builds all artifacts for all subprojects -->
<!--==================================================================-->
<goal name="multiproject:artifact"
- description=" Builds all artifacts for all subproject">
+ description=" Builds all artifacts for all subproject">
<j:set var="goal" value="multiproject:artifact-callback"/>
<attainGoal name="multiproject:goal"/>
@@ -191,7 +203,10 @@
</goal>
<goal name="multiproject:artifact-callback">
- <attainGoal name="${maven.multiproject.type}:${maven.multiproject.type}"/>
+
+ <ant:echo>Running ${maven.multiproject.type}:${maven.multiproject.type} for
${pom.name}</ant:echo>
+ <attainGoal name="${maven.multiproject.type}:${maven.multiproject.type}"/>
+
</goal>
@@ -199,27 +214,33 @@
<!-- Run 'artifact':install for all subprojects -->
<!--==================================================================-->
<goal name="multiproject:install"
- description="Run 'artifact':install for all subprojects">
+ description="Run 'artifact':install for all subprojects">
<j:set var="goal" value="multiproject:install-callback"/>
<attainGoal name="multiproject:goal"/>
+
</goal>
<goal name="multiproject:install-callback">
+
+ <ant:echo>Running ${maven.multiproject.type}:install for ${pom.name}</ant:echo>
<attainGoal name="${maven.multiproject.type}:install"/>
+
</goal>
<!--==================================================================-->
<!-- Run 'artifact':install-snapshot for all subprojects -->
<!--==================================================================-->
<goal name="multiproject:install-snapshot"
- description="Run 'artifact':install-snapshot for all subprojects">
+ description="Run 'artifact':install-snapshot for all subprojects">
<j:set var="goal" value="multiproject:install-snapshot-callback"/>
<attainGoal name="multiproject:goal"/>
+
</goal>
<goal name="multiproject:install-snapshot-callback">
+ <ant:echo>Running ${maven.multiproject.type}:install-snapshot for
${pom.name}</ant:echo>
<attainGoal name="${maven.multiproject.type}:install-snapshot"/>
</goal>
@@ -227,64 +248,78 @@
<!-- Run 'artifact':deploy for all subprojects -->
<!--==================================================================-->
<goal name="multiproject:deploy"
- description="Run 'artifact':deploy for all subprojects">
+ description="Run 'artifact':deploy for all subprojects">
<j:set var="goal" value="multiproject:deploy-callback"/>
<attainGoal name="multiproject:goal"/>
+
</goal>
<goal name="multiproject:deploy-callback">
- <attainGoal name="${maven.multiproject.type}:deploy"/>
+
+ <ant:echo>Running ${maven.multiproject.type}:deploy for ${pom.name}</ant:echo>
+ <attainGoal name="${maven.multiproject.type}:deploy"/>
+
</goal>
<!--==================================================================-->
<!-- Run 'artifact':deploy-snapshot for all subprojects -->
<!--==================================================================-->
<goal name="multiproject:deploy-snapshot"
- description="Run 'artifact':deploy-snapshot for all subprojects">
+ description="Run 'artifact':deploy-snapshot for all subprojects">
<j:set var="goal" value="multiproject:deploy-snapshot-callback"/>
<attainGoal name="multiproject:goal"/>
</goal>
<goal name="multiproject:deploy-snapshot-callback">
- <attainGoal name="${maven.multiproject.type}:deploy-snapshot"/>
+
+ <ant:echo>Running ${maven.multiproject.type}:deploy-snapshot for
${pom.name}</ant:echo>
+ <attainGoal name="${maven.multiproject.type}:deploy-snapshot"/>
+
</goal>
<!--==================================================================-->
- <!-- Maven Report API - Register
-->
+ <!-- Maven Report API - Register -->
<!--==================================================================-->
<goal name="maven-multiproject-plugin:register">
+
<doc:registerReport
name="Dependency Convergence"
link="dependency-convergence-report"
pluginName="maven-multiproject-plugin"
description="Generate report which shows how consistent are the versions of
artitfacts between projects."/>
+
</goal>
<!--==================================================================-->
- <!-- Maven Report API - Deregister
-->
+ <!-- Maven Report API - Deregister -->
<!--==================================================================-->
<goal name="maven-multiproject-plugin:deregister">
- <doc:deregisterReport name="Multiproject Dependency Convergence Report"/>
+
+ <doc:deregisterReport name="Multiproject Dependency Convergence Report"/>
+
</goal>
<!--==================================================================-->
- <!-- Maven Report API - Deregister
-->
+ <!-- Maven Report API - Report -->
<!--==================================================================-->
<goal name="maven-multiproject-plugin:report">
- <attainGoal name="multiproject:dependency-convergence-report"/>
+
+ <attainGoal name="multiproject:dependency-convergence-report"/>
+
</goal>
<!--==================================================================-->
- <!-- Generate report which shows the harmony of versions of dependencies
-->
- <!-- which are used in sub-projects
-->
+ <!-- Generate report which shows the harmony of -->
+ <!-- versions of dependencies which are used in sub-projects -->
<!--==================================================================-->
<goal name="multiproject:dependency-convergence-report"
- description="Generate report which shows how consistent are the
versions of artitfacts between projects" >
+ description="Generate report which shows how consistent are the versions of
artitfacts between projects" >
+
<mkdir dir="${maven.gen.docs}"/>
<!-- FIXME: 2) Needs to be a tag
@@ -317,6 +352,7 @@
<j:set var="goal" value="clean:clean"/>
<attainGoal name="multiproject:goal"/>
+
</goal>
No revision
No revision
1.2.2.1 +1 -5 maven/src/plugins-build/linkcheck/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/linkcheck/maven.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- maven.xml 22 Apr 2003 11:48:49 -0000 1.2
+++ maven.xml 7 Aug 2003 17:00:28 -0000 1.2.2.1
@@ -1,8 +1,4 @@
-<project default="jar:jar"
- xmlns:j="jelly:core"
- xmlns:u="jelly:util"
- xmlns:ant="jelly:ant"
- xmlns:m="maven">
+<project default="jar:jar">
<postGoal name="java:compile">
No revision
No revision
1.3.2.1 +1 -1 maven/src/plugins-build/shell/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/shell/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- plugin.jelly 17 Jun 2003 19:52:07 -0000 1.3
+++ plugin.jelly 7 Aug 2003 17:00:28 -0000 1.3.2.1
@@ -61,7 +61,7 @@
<j:choose>
- <j:when test="${maven.shell.zdh.nodesc = 'true'}">
+ <j:when test="${maven.shell.zdh.nodesc == 'true'}">
<j:set var="desc" value="${mavenSession.getGoalDescription(goal)}"/>
<j:set var="escdesc" value='${desc.replaceAll(":","\\:")}'/>
<j:set var="point" value="'"/>
No revision
No revision
1.14.2.1 +1 -1 maven/src/plugins-build/latka/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/latka/project.xml,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- project.xml 25 Jul 2003 06:37:48 -0000 1.14
+++ project.xml 7 Aug 2003 17:00:29 -0000 1.14.2.1
@@ -92,7 +92,7 @@
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-html</artifactId>
- <version> 20030317.100924</version>
+ <version>20030317.100924</version>
<url>http://jakarta.apache.org/commons/jelly/libs/html/</url>
<properties>
<classloader>root.maven</classloader>
No revision
No revision
1.3.2.1 +24 -14
maven/src/plugins-build/junit-report/src/plugin-resources/junit.jsl
Index: junit.jsl
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/junit-report/src/plugin-resources/junit.jsl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- junit.jsl 19 Feb 2003 06:33:32 -0000 1.3
+++ junit.jsl 7 Aug 2003 17:00:29 -0000 1.3.2.1
@@ -12,12 +12,12 @@
trim="false">
<!-- This needs to be instantiated here to be available in the template matches
-->
- <j:useBean var="mavenTool" class="org.apache.maven.MavenTool"/>
+ <j:useBean var="mavenTool" class="org.apache.maven.util.MavenTool"/>
<j:useBean var="numbers" class="java.text.DecimalFormat"/>
<j:useBean var="htmlescape" class="org.apache.velocity.anakia.Escape"/>
- <j:useBean var="formatter" class="org.apache.maven.DVSLFormatter"/>
+ <j:useBean var="formatter" class="org.apache.maven.util.DVSLFormatter"/>
<j:useBean var="fileutil" class="org.apache.velocity.texen.util.FileUtil"/>
- <j:useBean var="pathtool" class="org.apache.maven.DVSLPathTool"/>
+ <j:useBean var="pathtool" class="org.apache.maven.util.DVSLPathTool"/>
<define:taglib uri="junit">
@@ -117,9 +117,9 @@
<section name="Package List">
<junit:nav/>
<table>
- <!--
- <junit:testSuiteHeader/>
- -->
+ <tr>
+
<th>Package</th><th>Tests</th><th>Errors</th><th>Failures</th><th>Success
Rate</th><th>Time</th>
+ </tr>
<x:set var="testsuites" select="./testsuite[not(./@package =
preceding-sibling::testsuite/@package)]"/>
<j:forEach var="testsuite" items="${testsuites}">
<j:set var="package" value="${testsuite.attribute('package').value}"/>
@@ -128,7 +128,7 @@
<j:set var="errorCount"><x:expr select="sum(./testsuite[./@package =
$quotedPackage]/@errors)"/></j:set>
<j:set var="failureCount"><x:expr select="sum(./testsuite[./@package
= $quotedPackage]/@failures)"/></j:set>
<j:set var="timeCount"><x:expr select="sum(./testsuite[./@package =
$quotedPackage]/@time)"/></j:set>
-
+ <j:set var="successRate"><x:expr select="($testCount - ($failureCount
+ $errorCount)) div $testCount"/></j:set>
<tr>
<td>
<a href="#${package}">${package}</a>
@@ -137,10 +137,13 @@
<doc:formatAsNumber string="${testCount}" pattern="0"/>
</td>
<td>
+ <doc:formatAsNumber string="${errorCount}" pattern="0"/>
+ </td>
+ <td>
<doc:formatAsNumber string="${failureCount}" pattern="0"/>
</td>
<td>
- <doc:formatAsNumber string="${errorCount}" pattern="0"/>
+ <doc:formatAsNumber string="${successRate}" pattern="0.00%"/>
</td>
<td>
<doc:formatAsNumber string="${timeCount}" pattern="0.00"/>
@@ -160,22 +163,29 @@
<a name="${package}"></a>
<subsection name="${package}">
<table>
- <!--
- <junit:testSuiteHeader/>
- -->
+ <tr>
+
<th>Class</th><th>Tests</th><th>Errors</th><th>Failures</th><th>Success
Rate</th><th>Time</th>
+ </tr>
<x:forEach var="test" select="/testsuites/testsuite[./@package =
$quotedPackage]">
+ <j:set var="testCount"><x:expr
select="${test.attribute('tests').value}" /></j:set>
+ <j:set var="errorCount"><x:expr
select="${test.attribute('errors').value}" /></j:set>
+ <j:set var="failureCount"><x:expr
select="${test.attribute('failures').value}" /></j:set>
+ <j:set var="successRate"><x:expr select="($testCount -
($failureCount + $errorCount)) div $testCount"/></j:set>
<tr>
<td>
<a
href="#${test.attribute('name').value}">${test.attribute('name').value}</a>
</td>
<td>
- <doc:formatAsNumber string="${test.attribute('tests').value}"
pattern="0"/>
+ <doc:formatAsNumber string="${testCount}" pattern="0"/>
+ </td>
+ <td>
+ <doc:formatAsNumber string="${errorCount}" pattern="0"/>
</td>
<td>
- <doc:formatAsNumber
string="${test.attribute('errors').value}" pattern="0"/>
+ <doc:formatAsNumber string="${failureCount}" pattern="0"/>
</td>
<td>
- <doc:formatAsNumber
string="${test.attribute('failures').value}" pattern="0"/>
+ <doc:formatAsNumber string="${successRate}" pattern="0.00%"/>
</td>
<td>
<doc:formatAsNumber string="${test.attribute('time').value}"
pattern="0.000"/>
No revision
No revision
1.2.2.1 +289 -289
maven/src/plugins-build/junit-report/src/plugin-resources/junit-failed.jsl
Index: junit-failed.jsl
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/junit-report/src/plugin-resources/junit-failed.jsl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- junit-failed.jsl 4 Aug 2003 11:58:15 -0000 1.2
+++ junit-failed.jsl 7 Aug 2003 17:00:29 -0000 1.2.2.1
@@ -1,289 +1,289 @@
-<?xml version="1.0"?>
-
-<jsl:stylesheet
- select="$doc"
- xmlns:j="jelly:core"
- xmlns:jsl="jelly:jsl"
- xmlns:x="jelly:xml"
- xmlns:define="jelly:define"
- xmlns:util="jelly:util"
- xmlns:junit="junit"
- xmlns:doc="doc"
- trim="false">
-
- <!-- This needs to be instantiated here to be available in the template matches
-->
- <j:useBean var="mavenTool" class="org.apache.maven.MavenTool"/>
- <j:useBean var="numbers" class="java.text.DecimalFormat"/>
- <j:useBean var="htmlescape" class="org.apache.velocity.anakia.Escape"/>
- <j:useBean var="formatter" class="org.apache.maven.DVSLFormatter"/>
- <j:useBean var="fileutil" class="org.apache.velocity.texen.util.FileUtil"/>
- <j:useBean var="pathtool" class="org.apache.maven.util.DVSLPathTool"/>
-
-
- <define:taglib uri="junit">
- <define:tag name="nav">
- <p>
- [
- <a href="#Summary">summary</a>]
- [
- <a href="#Package List">package list</a>]
- [
- <a href="#Test Cases">test cases</a>]
- </p>
- </define:tag>
-
- <define:tag name="testSuiteHeader">
- <tr>
- <th>Name</th>
- <th>Tests</th>
- <th>Errors</th>
- <th>Failures</th>
- <th>Time(s)</th>
- </tr>
- </define:tag>
-
- <define:tag name="testCaseHeader">
- <tr>
- <th>Name</th>
- <th>Status</th>
- <th>Type</th>
- <th>Time(s)</th>
- </tr>
- </define:tag>
-
- <define:tag name="displayFailure">
- <j:choose>
- <j:when test="${current.attribute('message') != null}">
- <code>
- ${htmlescape.getText(current.attribute('message').value)}
- </code>
- </j:when>
- <j:otherwise>
- N/A
- </j:otherwise>
- </j:choose>
- </define:tag>
- </define:taglib>
-
- <jsl:template match="testsuites">
- <document>
-
- <properties>
- <title>JUnit Test Results</title>
- </properties>
-
- <body>
- <section name="Summary">
- <junit:nav/>
- <j:set var="testCount"><x:expr select="sum(testsuite/@tests)"/></j:set>
- <j:set var="errorCount"><x:expr select="sum(testsuite/@errors)"/></j:set>
- <j:set var="failureCount"><x:expr
select="sum(testsuite/@failures)"/></j:set>
- <j:set var="timeCount"><x:expr select="sum(testsuite/@time)"/></j:set>
- <j:set var="successRate"><x:expr select="($testCount - ($failureCount +
$errorCount)) div $testCount"/></j:set>
- <table>
- <tr>
- <th>Tests</th>
- <th>Errors</th>
- <th>Failures</th>
- <th>Success rate</th>
- <th>Time(s)</th>
- </tr>
- <tr>
- <td>
- <doc:formatAsNumber string="${testCount}" pattern="0"/>
- </td>
- <td>
- <doc:formatAsNumber string="${errorCount}" pattern="0"/>
- </td>
- <td>
- <doc:formatAsNumber string="${failureCount}" pattern="0"/>
- </td>
- <td>
- <doc:formatAsNumber string="${successRate}" pattern="0.00%"/>
- </td>
- <td>
- <doc:formatAsNumber string="${timeCount}" pattern="0.00"/>
- </td>
- </tr>
- </table>
- <p>
- Note:
- <i>failures</i> are anticipated and checked for with
- assertions while
- <i>errors</i> are unanticipated.
- </p>
- </section>
-
- <section name="Package List">
- <junit:nav/>
- <table>
- <!--
- <junit:testSuiteHeader/>
- -->
- <x:set var="testsuites" select="./testsuite[not(./@package =
preceding-sibling::testsuite/@package)]"/>
- <j:forEach var="testsuite" items="${testsuites}">
- <x:set var="errorCount" select="sum($testsuite/@errors)"/>
- <x:set var="failureCount" select="sum($testsuite/@failures)"/>
-
- <j:if test="${errorCount.intValue() gt 0 or failureCount.intValue()
gt 0}">
-
- <j:set var="package" value="${testsuite.attribute('package').value}"/>
- <x:set var="quotedPackage" select='"${package}"'/>
- <j:set var="testCount"><x:expr select="sum(./testsuite[./@package =
$quotedPackage]/@tests)"/></j:set>
- <j:set var="errorCount"><x:expr select="sum(./testsuite[./@package =
$quotedPackage]/@errors)"/></j:set>
- <j:set var="failureCount"><x:expr select="sum(./testsuite[./@package
= $quotedPackage]/@failures)"/></j:set>
- <j:set var="timeCount"><x:expr select="sum(./testsuite[./@package =
$quotedPackage]/@time)"/></j:set>
-
- <tr>
- <td>
- <a href="#${package}">${package}</a>
- </td>
- <td>
- <doc:formatAsNumber string="${testCount}" pattern="0"/>
- </td>
- <td>
- <doc:formatAsNumber string="${failureCount}" pattern="0"/>
- </td>
- <td>
- <doc:formatAsNumber string="${errorCount}" pattern="0"/>
- </td>
- <td>
- <doc:formatAsNumber string="${timeCount}" pattern="0.00"/>
- </td>
- </tr>
- </j:if>
- </j:forEach>
-
- </table>
- <p>
- Note: package statistics are not computed recursively, they only
- sum up all of its testsuites numbers.
- </p>
-
- <j:forEach var="testsuite" items="${testsuites}">
- <j:set var="package" value="${testsuite.attribute('package').value}"/>
- <x:set var="quotedPackage" select='"${package}"'/>
- <x:set var="errorCount" select="sum($testsuite/@errors)"/>
- <x:set var="failureCount" select="sum($testsuite/@failures)"/>
-
- <j:if test="${errorCount.intValue() gt 0 or failureCount.intValue() gt
0}">
-
- <a name="${package}"></a>
- <subsection name="${package}">
- <table>
- <x:forEach var="test" select="/testsuites/testsuite[./@package =
$quotedPackage]">
- <x:set var="errorCount" select="count($test/testcase/error)"/>
- <x:set var="failureCount" select="count($test/testcase/failure)"/>
-
- <j:if test="${errorCount.intValue() gt 0 or
failureCount.intValue() gt 0}">
-
- <tr>
- <td>
- <a
href="#${test.attribute('name').value}">${test.attribute('name').value}</a>
- </td>
- <td>
- <doc:formatAsNumber string="${test.attribute('tests').value}"
pattern="0"/>
- </td>
- <td>
- <doc:formatAsNumber
string="${test.attribute('errors').value}" pattern="0"/>
- </td>
- <td>
- <doc:formatAsNumber
string="${test.attribute('failures').value}" pattern="0"/>
- </td>
- <td>
- <doc:formatAsNumber string="${test.attribute('time').value}"
pattern="0.000"/>
- </td>
- </tr>
- </j:if>
- </x:forEach>
- </table>
- </subsection>
- </j:if>
- </j:forEach>
- </section>
-
- <section name="Test Cases">
- <junit:nav/>
-
- <x:set var="testsuites" select="./testsuite"/>
- <j:forEach var="testsuite" items="${testsuites}">
- <!--j:set var="errorCount"><x:expr
select="count($testsuite/testcase/error)"/></j:set-->
- <x:set var="errorCount" select="count($testsuite/testcase/error)"/>
- <x:set var="failureCount" select="count($testsuite/testcase/failure)"/>
-
- <j:if test="${errorCount.intValue() gt 0 or failureCount.intValue() gt
0}">
- <a name="${testsuite.attribute('name').value}"></a>
- <subsection name="${testsuite.attribute('name').value}">
- <table>
-
- ## test can even not be started at all (failure to load the class)
- ## so report the error directly
- ##
-
- <x:set var="errors" select="$testsuite/error"/>
- <j:forEach var="error" items="${errors}">
- <tr>
- <td colspan="4">
- <junit:displayFailure current="${error}"/>
- </td>
- </tr>
- </j:forEach>
-
-
-
- <x:set var="testcases" select="$testsuite/testcase"/>
- <j:forEach var="testcase" items="${testcases}">
- <j:set var="failure"
value="${testcase.selectSingleNode('failure')}"/>
- <j:set var="error" value="${testcase.selectSingleNode('error')}"/>
- <j:if test="${!empty(failure) or !empty(error)}">
- <tr>
- <td>${testcase.attribute("name").value}</td>
- <j:choose>
- <j:when test="${failure != null}">
- <td style="width: 60px; color: red; font-weight:
bold">Failure</td>
- </j:when>
- <j:when test="${error != null}">
- <td style="width: 60px; color: red; font-weight:
bold">Error</td>
- </j:when>
- <j:otherwise>
- <td style="width: 60px;">Success</td>
- </j:otherwise>
- </j:choose>
- <j:choose>
- <j:when test="${testcase.attribute('time') != null}">
- <td width="60px">
- <doc:formatAsNumber
string="${testcase.attribute('time').value}" pattern="0.00"/>
- </td>
- </j:when>
- <j:otherwise>
- <td width="60px"></td>
- </j:otherwise>
- </j:choose>
- </tr>
- <j:choose>
- <j:when test="${failure != null}">
- <tr>
- <td colspan="3" style="padding-left: 50px">
- <junit:displayFailure current="${failure}"/>
- </td>
- </tr>
- </j:when>
- <j:when test="${error != null}">
- <tr>
- <td colspan="3" style="padding-left: 50px">
- <junit:displayFailure current="${error}"/>
- </td>
- </tr>
- </j:when>
- </j:choose>
- </j:if>
- </j:forEach>
- </table>
- </subsection>
- </j:if>
- </j:forEach>
- </section>
- </body>
- </document>
- </jsl:template>
-</jsl:stylesheet>
+<?xml version="1.0"?>
+
+<jsl:stylesheet
+ select="$doc"
+ xmlns:j="jelly:core"
+ xmlns:jsl="jelly:jsl"
+ xmlns:x="jelly:xml"
+ xmlns:define="jelly:define"
+ xmlns:util="jelly:util"
+ xmlns:junit="junit"
+ xmlns:doc="doc"
+ trim="false">
+
+ <!-- This needs to be instantiated here to be available in the template matches
-->
+ <j:useBean var="mavenTool" class="org.apache.maven.MavenTool"/>
+ <j:useBean var="numbers" class="java.text.DecimalFormat"/>
+ <j:useBean var="htmlescape" class="org.apache.velocity.anakia.Escape"/>
+ <j:useBean var="formatter" class="org.apache.maven.DVSLFormatter"/>
+ <j:useBean var="fileutil" class="org.apache.velocity.texen.util.FileUtil"/>
+ <j:useBean var="pathtool" class="org.apache.maven.util.DVSLPathTool"/>
+
+
+ <define:taglib uri="junit">
+ <define:tag name="nav">
+ <p>
+ [
+ <a href="#Summary">summary</a>]
+ [
+ <a href="#Package List">package list</a>]
+ [
+ <a href="#Test Cases">test cases</a>]
+ </p>
+ </define:tag>
+
+ <define:tag name="testSuiteHeader">
+ <tr>
+ <th>Name</th>
+ <th>Tests</th>
+ <th>Errors</th>
+ <th>Failures</th>
+ <th>Time(s)</th>
+ </tr>
+ </define:tag>
+
+ <define:tag name="testCaseHeader">
+ <tr>
+ <th>Name</th>
+ <th>Status</th>
+ <th>Type</th>
+ <th>Time(s)</th>
+ </tr>
+ </define:tag>
+
+ <define:tag name="displayFailure">
+ <j:choose>
+ <j:when test="${current.attribute('message') != null}">
+ <code>
+ ${htmlescape.getText(current.attribute('message').value)}
+ </code>
+ </j:when>
+ <j:otherwise>
+ N/A
+ </j:otherwise>
+ </j:choose>
+ </define:tag>
+ </define:taglib>
+
+ <jsl:template match="testsuites">
+ <document>
+
+ <properties>
+ <title>JUnit Test Results</title>
+ </properties>
+
+ <body>
+ <section name="Summary">
+ <junit:nav/>
+ <j:set var="testCount"><x:expr select="sum(testsuite/@tests)"/></j:set>
+ <j:set var="errorCount"><x:expr select="sum(testsuite/@errors)"/></j:set>
+ <j:set var="failureCount"><x:expr
select="sum(testsuite/@failures)"/></j:set>
+ <j:set var="timeCount"><x:expr select="sum(testsuite/@time)"/></j:set>
+ <j:set var="successRate"><x:expr select="($testCount - ($failureCount +
$errorCount)) div $testCount"/></j:set>
+ <table>
+ <tr>
+ <th>Tests</th>
+ <th>Errors</th>
+ <th>Failures</th>
+ <th>Success rate</th>
+ <th>Time(s)</th>
+ </tr>
+ <tr>
+ <td>
+ <doc:formatAsNumber string="${testCount}" pattern="0"/>
+ </td>
+ <td>
+ <doc:formatAsNumber string="${errorCount}" pattern="0"/>
+ </td>
+ <td>
+ <doc:formatAsNumber string="${failureCount}" pattern="0"/>
+ </td>
+ <td>
+ <doc:formatAsNumber string="${successRate}" pattern="0.00%"/>
+ </td>
+ <td>
+ <doc:formatAsNumber string="${timeCount}" pattern="0.00"/>
+ </td>
+ </tr>
+ </table>
+ <p>
+ Note:
+ <i>failures</i> are anticipated and checked for with
+ assertions while
+ <i>errors</i> are unanticipated.
+ </p>
+ </section>
+
+ <section name="Package List">
+ <junit:nav/>
+ <table>
+ <!--
+ <junit:testSuiteHeader/>
+ -->
+ <x:set var="testsuites" select="./testsuite[not(./@package =
preceding-sibling::testsuite/@package)]"/>
+ <j:forEach var="testsuite" items="${testsuites}">
+ <x:set var="errorCount" select="sum($testsuite/@errors)"/>
+ <x:set var="failureCount" select="sum($testsuite/@failures)"/>
+
+ <j:if test="${errorCount.intValue() gt 0 or failureCount.intValue()
gt 0}">
+
+ <j:set var="package" value="${testsuite.attribute('package').value}"/>
+ <x:set var="quotedPackage" select='"${package}"'/>
+ <j:set var="testCount"><x:expr select="sum(./testsuite[./@package =
$quotedPackage]/@tests)"/></j:set>
+ <j:set var="errorCount"><x:expr select="sum(./testsuite[./@package =
$quotedPackage]/@errors)"/></j:set>
+ <j:set var="failureCount"><x:expr select="sum(./testsuite[./@package
= $quotedPackage]/@failures)"/></j:set>
+ <j:set var="timeCount"><x:expr select="sum(./testsuite[./@package =
$quotedPackage]/@time)"/></j:set>
+
+ <tr>
+ <td>
+ <a href="#${package}">${package}</a>
+ </td>
+ <td>
+ <doc:formatAsNumber string="${testCount}" pattern="0"/>
+ </td>
+ <td>
+ <doc:formatAsNumber string="${failureCount}" pattern="0"/>
+ </td>
+ <td>
+ <doc:formatAsNumber string="${errorCount}" pattern="0"/>
+ </td>
+ <td>
+ <doc:formatAsNumber string="${timeCount}" pattern="0.00"/>
+ </td>
+ </tr>
+ </j:if>
+ </j:forEach>
+
+ </table>
+ <p>
+ Note: package statistics are not computed recursively, they only
+ sum up all of its testsuites numbers.
+ </p>
+
+ <j:forEach var="testsuite" items="${testsuites}">
+ <j:set var="package" value="${testsuite.attribute('package').value}"/>
+ <x:set var="quotedPackage" select='"${package}"'/>
+ <x:set var="errorCount" select="sum($testsuite/@errors)"/>
+ <x:set var="failureCount" select="sum($testsuite/@failures)"/>
+
+ <j:if test="${errorCount.intValue() gt 0 or failureCount.intValue() gt
0}">
+
+ <a name="${package}"></a>
+ <subsection name="${package}">
+ <table>
+ <x:forEach var="test" select="/testsuites/testsuite[./@package =
$quotedPackage]">
+ <x:set var="errorCount" select="count($test/testcase/error)"/>
+ <x:set var="failureCount" select="count($test/testcase/failure)"/>
+
+ <j:if test="${errorCount.intValue() gt 0 or
failureCount.intValue() gt 0}">
+
+ <tr>
+ <td>
+ <a
href="#${test.attribute('name').value}">${test.attribute('name').value}</a>
+ </td>
+ <td>
+ <doc:formatAsNumber string="${test.attribute('tests').value}"
pattern="0"/>
+ </td>
+ <td>
+ <doc:formatAsNumber
string="${test.attribute('errors').value}" pattern="0"/>
+ </td>
+ <td>
+ <doc:formatAsNumber
string="${test.attribute('failures').value}" pattern="0"/>
+ </td>
+ <td>
+ <doc:formatAsNumber string="${test.attribute('time').value}"
pattern="0.000"/>
+ </td>
+ </tr>
+ </j:if>
+ </x:forEach>
+ </table>
+ </subsection>
+ </j:if>
+ </j:forEach>
+ </section>
+
+ <section name="Test Cases">
+ <junit:nav/>
+
+ <x:set var="testsuites" select="./testsuite"/>
+ <j:forEach var="testsuite" items="${testsuites}">
+ <!--j:set var="errorCount"><x:expr
select="count($testsuite/testcase/error)"/></j:set-->
+ <x:set var="errorCount" select="count($testsuite/testcase/error)"/>
+ <x:set var="failureCount" select="count($testsuite/testcase/failure)"/>
+
+ <j:if test="${errorCount.intValue() gt 0 or failureCount.intValue() gt
0}">
+ <a name="${testsuite.attribute('name').value}"></a>
+ <subsection name="${testsuite.attribute('name').value}">
+ <table>
+
+ ## test can even not be started at all (failure to load the class)
+ ## so report the error directly
+ ##
+
+ <x:set var="errors" select="$testsuite/error"/>
+ <j:forEach var="error" items="${errors}">
+ <tr>
+ <td colspan="4">
+ <junit:displayFailure current="${error}"/>
+ </td>
+ </tr>
+ </j:forEach>
+
+
+
+ <x:set var="testcases" select="$testsuite/testcase"/>
+ <j:forEach var="testcase" items="${testcases}">
+ <j:set var="failure"
value="${testcase.selectSingleNode('failure')}"/>
+ <j:set var="error" value="${testcase.selectSingleNode('error')}"/>
+ <j:if test="${!empty(failure) or !empty(error)}">
+ <tr>
+ <td>${testcase.attribute("name").value}</td>
+ <j:choose>
+ <j:when test="${failure != null}">
+ <td style="width: 60px; color: red; font-weight:
bold">Failure</td>
+ </j:when>
+ <j:when test="${error != null}">
+ <td style="width: 60px; color: red; font-weight:
bold">Error</td>
+ </j:when>
+ <j:otherwise>
+ <td style="width: 60px;">Success</td>
+ </j:otherwise>
+ </j:choose>
+ <j:choose>
+ <j:when test="${testcase.attribute('time') != null}">
+ <td width="60px">
+ <doc:formatAsNumber
string="${testcase.attribute('time').value}" pattern="0.00"/>
+ </td>
+ </j:when>
+ <j:otherwise>
+ <td width="60px"></td>
+ </j:otherwise>
+ </j:choose>
+ </tr>
+ <j:choose>
+ <j:when test="${failure != null}">
+ <tr>
+ <td colspan="3" style="padding-left: 50px">
+ <junit:displayFailure current="${failure}"/>
+ </td>
+ </tr>
+ </j:when>
+ <j:when test="${error != null}">
+ <tr>
+ <td colspan="3" style="padding-left: 50px">
+ <junit:displayFailure current="${error}"/>
+ </td>
+ </tr>
+ </j:when>
+ </j:choose>
+ </j:if>
+ </j:forEach>
+ </table>
+ </subsection>
+ </j:if>
+ </j:forEach>
+ </section>
+ </body>
+ </document>
+ </jsl:template>
+</jsl:stylesheet>
No revision
No revision
1.6.2.1 +2 -8 maven/src/plugins-build/simian/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/simian/project.xml,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- project.xml 25 Jul 2003 03:32:22 -0000 1.6
+++ project.xml 7 Aug 2003 17:00:29 -0000 1.6.2.1
@@ -4,6 +4,8 @@
<id>maven-simian-plugin</id>
<name>Simian</name>
<currentVersion>1.2-SNAPSHOT</currentVersion>
+ <description>Simian Plugin for Maven</description>
+ <shortDescription>Simian Plugin for Maven</shortDescription>
<url>http://maven.apache.org/reference/plugins/simian/</url>
<siteDirectory>/www/maven.apache.org/reference/plugins/simian/</siteDirectory>
@@ -86,14 +88,6 @@
</roles>
</contributor>
</contributors>
-
- <build>
- <unitTest>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- </unitTest>
- </build>
<reports>
<!-- Make sure to run plugin:install before site -->
1.1.4.1 +1 -0 maven/src/plugins-build/simian/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/simian/maven.xml,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- maven.xml 10 Jul 2003 07:36:58 -0000 1.1
+++ maven.xml 7 Aug 2003 17:00:29 -0000 1.1.4.1
@@ -14,6 +14,7 @@
<taskdef name="simian" classname="org.apache.maven.simian.FileSimianTask">
<classpath>
<pathelement location="${maven.build.dest}"/>
+ <pathelement location="${maven.test.dest}"/>
<pathelement
location="${pom.getPluginContext('maven-clover-plugin').getVariable('maven.build.clover.classes')}"/>
<pathelement location="${pom.getDependencyPath('redhill:simian')}"/>
</classpath>
No revision
No revision
1.2.2.1 +2 -2 maven/src/plugins-build/pmd/src/plugin-resources/pmd.jsl
Index: pmd.jsl
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/pmd/src/plugin-resources/pmd.jsl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- pmd.jsl 25 Jul 2003 07:05:38 -0000 1.2
+++ pmd.jsl 7 Aug 2003 17:00:29 -0000 1.2.2.1
@@ -10,10 +10,10 @@
xmlns="dummy" trim="false">
<!-- This needs to be instantiated here to be available in the template matches
-->
- <j:useBean var="mavenTool" class="org.apache.maven.MavenTool"/>
+ <j:useBean var="mavenTool" class="org.apache.maven.util.MavenTool"/>
<j:useBean var="htmlescape" class="org.apache.velocity.anakia.Escape"/>
<j:useBean var="fileutil" class="org.apache.velocity.texen.util.FileUtil"/>
- <j:useBean var="pathtool" class="org.apache.maven.DVSLPathTool"/>
+ <j:useBean var="pathtool" class="org.apache.maven.util.DVSLPathTool"/>
<jsl:template match="pmd">
<document>
No revision
No revision
1.7.2.1 +26 -4 maven/src/plugins-build/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/plugin/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- plugin.jelly 10 Jul 2003 00:53:00 -0000 1.7
+++ plugin.jelly 7 Aug 2003 17:00:29 -0000 1.7.2.1
@@ -1,7 +1,9 @@
<?xml version="1.0"?>
<project
+ xmlns:http="jelly:http"
xmlns:j="jelly:core"
+ xmlns:maven="jelly:maven"
xmlns:u="jelly:util"
xmlns:x="jelly:xml">
@@ -22,7 +24,7 @@
todir="${maven.home}/plugins"/>
<delete includeEmptyDirs="true" verbose="false">
- <fileset dir="${maven.home.local}/plugins">
+ <fileset dir="${maven.plugin.unpacked.dir}">
<include name="*.cache"/>
<include name="**/.processed" />
<include name="${pom.artifactId}-*/**" />
@@ -35,13 +37,13 @@
<goal name="plugin:deploy" prereqs="plugin"
description="Install a specific unpacked plugin but no new jar">
- <mkdir dir="${maven.home.local}/plugins/${maven.final.name}"/>
+ <mkdir dir="${maven.plugin.unpacked.dir}/${maven.final.name}"/>
<unzip src="${maven.build.dir}/${maven.final.name}.jar"
- dest="${maven.home.local}/plugins/${maven.final.name}"/>
+ dest="${maven.plugin.unpacked.dir}/${maven.final.name}"/>
<echo message="" >
Warning: Contents of ${maven.home}/plugins/${maven.final.name}.jar does not match
- the unpacked contents of ${maven.home.local}/plugins/${maven.final.name}
directory.
+ the unpacked contents of ${maven.plugin.unpacked.dir}/${maven.final.name}
directory.
</echo>
</goal>
@@ -158,5 +160,25 @@
</j:file>
</j:if>
+ </goal>
+
+ <!-- download a plugin from a remote repo -->
+ <goal name="plugin:download">
+ <maven:param-check value="${artifactId}" fail="true" message="'artifactId' must
be specified"/>
+ <maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
+ <maven:param-check value="${version}" fail="true" message="'version' must be
specified"/>
+ <j:set var="repoList">${maven.repo.remote}</j:set>
+ <u:tokenize var="repos" delim=",">${repoList.trim()}</u:tokenize>
+ <j:forEach var="repo" items="${repos}">
+ <echo>repo is '${repo}'</echo>
+ <u:file var="localPlugin"
+ name="${maven.home}/plugins/${artifactId}-${version}.jar" />
+ <j:if test="${!localPlugin.exists()}">
+ <j:set var="remoteFile"
+ value="${repo}/${groupId}/jars/${artifactId}-${version}.jar" />
+ <echo>trying to download ${remoteFile}</echo>
+ <http:get uri="${remoteFile}" var="outputVar" />
+ </j:if>
+ </j:forEach>
</goal>
</project>
1.13.2.1 +18 -0 maven/src/plugins-build/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/plugin/project.xml,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- project.xml 5 May 2003 02:30:00 -0000 1.13
+++ project.xml 7 Aug 2003 17:00:29 -0000 1.13.2.1
@@ -44,5 +44,23 @@
<classloader>root.maven</classloader>
</properties>
</dependency>
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-http</artifactId>
+ <version>20030211.143043</version>
+ <url>http://jakarta.apache.org/commons/jelly/libs/http/</url>
+ <properties>
+ <classloader>root.maven</classloader>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>2.0-rc1</version>
+ <url>http://jakarta.apache.org/commons/httpclient/</url>
+ <properties>
+ <classloader>root.maven</classloader>
+ </properties>
+ </dependency>
</dependencies>
</project>
No revision
No revision
1.1.2.1 +36 -9
maven/src/plugins-build/multiproject/src/plugin-resources/templates/projects-overview.xml
Index: projects-overview.xml
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/multiproject/src/plugin-resources/templates/projects-overview.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- projects-overview.xml 27 Jul 2003 21:48:41 -0000 1.1
+++ projects-overview.xml 7 Aug 2003 17:00:29 -0000 1.1.2.1
@@ -1,16 +1,43 @@
<?xml version="1.0"?>
<document>
<properties>
- <title>Overview of projects</title>
+ <title>$overviewPageTitle</title>
<author email="[EMAIL PROTECTED]">Michal Maczka</author>
</properties>
<body>
- #foreach ($reactorProject in $reactorProjects)
- <section name="$reactorProject.name">
- <p>
- ${reactorProject.description}
- </p>
- </section>
- #end
+ <section name="$overviewPageTitle">
+ <p>
+ #if ($overviewPageText && $overviewPageText.lenght>0)
+ ${overviewPageText}
+ <br/>
+ #end
+ <table>
+ #foreach ($project in $reactorProjects)
+ <tr>
+ <th><a href="#${project.name}">${project.name}</a></th>
+ <td>${project.shortDescription}</td>
+ </tr>
+ #end
+ </table>
+ </p>
+ <p>
+ #foreach ($project in $reactorProjects)
+ <subsection name="$project.name">
+ <p>
+ ${project.description}
+ </p>
+ <p>
+ <b>Website:</b>
+ #if ($navType == "aggregate")
+ <a
href="/${aggregateDir}${project.artifactId}/index.html">${project.name}</a>
+ #else
+ <a href="${project.url}">${project.url}</a>
+ #end
+ </p>
+ </subsection>
+ #end
+ </p>
+ </section>
</body>
-</document>
\ No newline at end of file
+</document>
+
1.2.2.1 +1 -1
maven/src/plugins-build/multiproject/src/plugin-resources/templates/navigation-independent.xml
Index: navigation-independent.xml
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/multiproject/src/plugin-resources/templates/navigation-independent.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- navigation-independent.xml 27 Jul 2003 21:48:41 -0000 1.2
+++ navigation-independent.xml 7 Aug 2003 17:00:29 -0000 1.2.2.1
@@ -7,7 +7,7 @@
<body>
<menu name="Projects">
#if ($createOverviewPage == "true" )
- <item name="Overview" href="projects-overview.xml"/>
+ <item name="${overviewPageLinkTitle}" href="{$overviewPageLink}.html"/>
#end
#foreach ($reactorProject in $reactorProjects)
<item name="$reactorProject.name" href="${reactorProject.url}"/>
1.3.2.1 +1 -1
maven/src/plugins-build/multiproject/src/plugin-resources/templates/navigation-aggregate.xml
Index: navigation-aggregate.xml
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/multiproject/src/plugin-resources/templates/navigation-aggregate.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- navigation-aggregate.xml 27 Jul 2003 21:48:41 -0000 1.3
+++ navigation-aggregate.xml 7 Aug 2003 17:00:29 -0000 1.3.2.1
@@ -7,7 +7,7 @@
<body>
<menu name="Projects">
#if ($createOverviewPage == "true" )
- <item name="Overview" href="projects-overview.xml"/>
+ <item name="${overviewPageLinkTitle}" href="${overviewPageLink}.html"/>
#end
#foreach ($reactorProject in $reactorProjects)
<item name="$reactorProject.name"
href="/${aggregateDir}${reactorProject.artifactId}/index.html"/>
No revision
No revision
1.1.4.1 +1 -0 maven/src/plugins-build/multiproject/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/xdocs/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- navigation.xml 30 Jun 2003 03:18:49 -0000 1.1
+++ navigation.xml 7 Aug 2003 17:00:29 -0000 1.1.4.1
@@ -10,6 +10,7 @@
<menu name="Overview">
<item name="Goals" href="/goals.html" />
<item name="Properties" href="/properties.html" />
+ <item name="FAQ" href="/faq.html" />
</menu>
</body>
</project>
No revision
No revision
1.1.2.1 +0 -0 maven/src/plugins-build/multiproject/xdocs/faq.fml
Index: faq.fml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/xdocs/faq.fml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.3.2.1 +1 -4 maven/src/plugins-build/native/samples/helloworld/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/native/samples/helloworld/maven.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- maven.xml 22 Apr 2003 11:48:49 -0000 1.3
+++ maven.xml 7 Aug 2003 17:00:29 -0000 1.3.2.1
@@ -1,9 +1,6 @@
<project default="jar:jar"
xmlns:j="jelly:core"
- xmlns:u="jelly:util"
- xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven"
- xmlns:m="maven">
+ xmlns:ant="jelly:ant">
<goal name="runsample" description="run sample" prereqs="native:compile">
<mkdir dir="${maven.build.dir}/samples"/>
No revision
No revision
1.21.2.1 +13 -13 maven/src/plugins-build/repository/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/repository/plugin.jelly,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -r1.21 -r1.21.2.1
--- plugin.jelly 9 Jul 2003 07:21:03 -0000 1.21
+++ plugin.jelly 7 Aug 2003 17:00:29 -0000 1.21.2.1
@@ -5,7 +5,7 @@
xmlns:define="jelly:define"
xmlns:dummy="dummy"
xmlns:j="jelly:core"
- xmlns:m="maven"
+ xmlns:maven="jelly:maven"
xmlns:repository="repository"
xmlns:u="jelly:util"
xmlns:x="jelly:xml">
@@ -121,7 +121,7 @@
! parse audit file
! run ssh to create each <groupId>/licenses directory.
!-->
- <m:param-check value="${directoryName}" fail="true" message="'directoryName'
must be specified"/>
+ <maven:param-check value="${directoryName}" fail="true"
message="'directoryName' must be specified"/>
<repository:parseAudit var="audit"/>
<!-- see if the user specified a starting project -->
<j:set var="processing" value="true" />
@@ -210,7 +210,7 @@
<!-- expects groupId to be set -->
<goal name="repository:audit-copy-license"
description="copy the license for the specified groupId to the repository">
- <m:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
+ <maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
<!--
! parse audit file
@@ -238,7 +238,7 @@
<goal name="repository:audit-generate-pom"
description="generate a pom for the groupId provided, based on the audit file">
- <m:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
+ <maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
<repository:parseAudit var="audit"/>
<x:forEach var="project" select="$audit/licenses/project">
@@ -279,7 +279,7 @@
<goal name="repository:create-project"
description="create a project, specified by groupId, in the repository">
- <m:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
+ <maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
<repository:exec>
cd ${maven.repo.central.directory};
@@ -299,7 +299,7 @@
<goal name="repository:delete-project"
description="delete a project, specified by groupId, in the repository">
- <m:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
+ <maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
<repository:exec>
cd ${maven.repo.central.directory};
@@ -314,8 +314,8 @@
<goal name="repository:copy-snapshot-jar"
description="copy a snapshot jar, specified by groupId and artifact, to the
repository">
- <m:param-check value="${artifact}" fail="true" message="'artifact' must be
specified"/>
- <m:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
+ <maven:param-check value="${artifact}" fail="true" message="'artifact' must be
specified"/>
+ <maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
<j:if test="${empty(artifactId)}">
<j:set var="artifactId">${groupId}</j:set>
@@ -348,8 +348,8 @@
<goal name="repository:copy-jar"
description="copy a jar, specified by groupId and artifact, to the repository">
- <m:param-check value="${artifact}" fail="true" message="'artifact' must be
specified"/>
- <m:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
+ <maven:param-check value="${artifact}" fail="true" message="'artifact' must be
specified"/>
+ <maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
<j:set var="type" value="jar" />
@@ -362,9 +362,9 @@
<goal name="repository:copy-artifact"
description="copy an artifact, specified by groupId, artifact and type, to the
repository">
- <m:param-check value="${artifact}" fail="true" message="'artifact' must be
specified"/>
- <m:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
- <m:param-check value="${type}" fail="true" message="'type' must be specified" />
+ <maven:param-check value="${artifact}" fail="true" message="'artifact' must be
specified"/>
+ <maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
+ <maven:param-check value="${type}" fail="true" message="'type' must be
specified" />
<j:set var="directory"
value="${maven.repo.central.directory}/${groupId}/${type}s/" />
<repository:exec command="mkdir -p ${directory}; chmod g+ws ${directory}; chgrp
${maven.repository.group} ${directory}"/>
No revision
No revision
1.15.2.1 +2 -3 maven/src/plugins-build/site/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/site/plugin.jelly,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- plugin.jelly 7 Apr 2003 08:15:28 -0000 1.15
+++ plugin.jelly 7 Aug 2003 17:00:29 -0000 1.15.2.1
@@ -2,8 +2,7 @@
<project
xmlns:j="jelly:core"
- xmlns:maven="jelly:maven"
- xmlns:m="maven">
+ xmlns:maven="jelly:maven">
<!-- ================================================================== -->
<!-- S I T E G E N E R A T I O N -->
@@ -76,7 +75,7 @@
prereqs="site:init"
description="Deploy the generated site docs using ssh">
- <m:user-check user="${maven.username}"/>
+ <maven:user-check user="${maven.username}"/>
<echo>
siteAddress = ${pom.siteAddress}
No revision
No revision
1.18.2.1 +1 -1 maven/src/plugins-build/struts/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/struts/project.xml,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- project.xml 25 Jul 2003 06:21:15 -0000 1.18
+++ project.xml 7 Aug 2003 17:00:29 -0000 1.18.2.1
@@ -29,7 +29,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-j2ee-plugin</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
</dependency>
<dependency>
<id>commons-collections</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
