You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2002/12/17 04:47:17 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/activity developer-activity.dvsl project.xml plugin.jelly
dion 2002/12/16 19:47:17
Modified: src/plugins-build/activity developer-activity.dvsl
project.xml plugin.jelly
Log:
Fix for Maven-110. Thanks to Rafal et al for their persistence.
Revision Changes Path
1.3 +13 -7 jakarta-turbine-maven/src/plugins-build/activity/developer-activity.dvsl
Index: developer-activity.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/activity/developer-activity.dvsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- developer-activity.dvsl 12 Dec 2002 16:37:13 -0000 1.2
+++ developer-activity.dvsl 17 Dec 2002 03:47:17 -0000 1.3
@@ -18,6 +18,7 @@
## Matches the first data element of the ChangeLog XML report.
##
#match ("changelog")
+#set( $mavenProject = $context.getAppValue("mavenProject") )
<?xml version="1.0" encoding="$context.toolbox.encoding"?>
<document>
@@ -36,17 +37,22 @@
<tr>
<th>Name</th><th>Number of Commits</th><th>Number of files changed</th>
</tr>
- #foreach ($developer in $node.selectNodes("document('$context.toolbox.basedir/project.xml')/project/developers/developer"))
+ #foreach ($developer in $mavenProject.developers)
+ #set ($name = $developer.name)
+ #set ($commits = 0)
+ #set ($commits = $node.valueOf("count(./changelog-entry/author[text()='$name']"))
+ #set ($changedFiles = 0)
+ #set ($changedFiles = $node.valueOf("count(./changelog-entry/author[text()='$name']/../file"))
+ ## FIXME leaving the if commented out, as it seems to have a problem
+ ## converting between the node.valueOf return value and zero,
+ ## as developers with more than 1 commit, still aren't processed
+ ##if($commits > 0)
<tr>
- #set ($name = $developer.name.value())
<td>$name</td>
- #set ($commits = 0)
- #set ($commits = $node.valueOf("count(./changelog-entry/author[text()='$developer.name.value()']"))
<td>$commits</td>
- #set ($changedFiles = 0)
- #set ($changedFiles = $node.valueOf("count(./changelog-entry/author[text()='$developer.name.value()']/../file"))
<td>$changedFiles</td>
</tr>
+ ##end
#end
</table>
</section>
1.12 +14 -0 jakarta-turbine-maven/src/plugins-build/activity/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/activity/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 29 Sep 2002 15:35:28 -0000 1.11
+++ project.xml 17 Dec 2002 03:47:17 -0000 1.12
@@ -65,6 +65,20 @@
</developer>
</developers>
+ <dependencies>
+ <dependency>
+ <id>maven+changelog-plugin</id>
+ <version>1.2-SNAPSHOT</version>
+ <properties>
+ <classloader>root.maven</classloader>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.0.1</version>
+ </dependency>
+ </dependencies>
+
<build/>
</project>
1.14 +2 -3 jakarta-turbine-maven/src/plugins-build/activity/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/activity/plugin.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.jelly 30 Oct 2002 18:02:01 -0000 1.13
+++ plugin.jelly 17 Dec 2002 03:47:17 -0000 1.14
@@ -46,13 +46,12 @@
<!-- Transform the activity log into developer activity first -->
<dvsl:dvsl
- basedir="${maven.build.dir}"
- destdir="${maven.gen.docs}/"
extension=".xml"
force="true"
toolboxFile="${plugin.dir}/toolbox.props"
style="${plugin.dir}/developer-activity.dvsl"
- includes="activity-log.xml"
+ in="${maven.build.dir}/activity-log.xml"
+ out="${maven.gen.docs}/developer-activity-report.xml"
outputEncoding="${maven.docs.outputencoding}"
mavenProject="${pom}">
</dvsl:dvsl>