Author: brett
Date: Fri Jul 29 05:33:55 2005
New Revision: 226360
URL: http://svn.apache.org/viewcvs?rev=226360&view=rev
Log:
PR: MPDEVACTIVITY-3, MPDEVACTIVITY-4
- enable changesets from maven-changelog-plugin-1.8
- allow developer's names to have a quote in them
Modified:
maven/maven-1/plugins/trunk/developer-activity/src/plugin-resources/developer-activity.jsl
maven/maven-1/plugins/trunk/developer-activity/xdocs/changes.xml
Modified:
maven/maven-1/plugins/trunk/developer-activity/src/plugin-resources/developer-activity.jsl
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/developer-activity/src/plugin-resources/developer-activity.jsl?rev=226360&r1=226359&r2=226360&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/developer-activity/src/plugin-resources/developer-activity.jsl
(original)
+++
maven/maven-1/plugins/trunk/developer-activity/src/plugin-resources/developer-activity.jsl
Fri Jul 29 05:33:55 2005
@@ -24,6 +24,7 @@
select="$doc"
xmlns:j="jelly:core"
xmlns:jsl="jelly:jsl"
+ xmlns:util="jelly:util"
xmlns:x="jelly:xml"
xmlns="dummy" trim="false">
<jsl:template match="changelog">
@@ -35,6 +36,27 @@
<body>
<section name="Activity by Developer">
+ <jsl:applyTemplates select="changeset" />
+ </section>
+ </body>
+ </document>
+ </jsl:template>
+
+ <jsl:template match="changeset">
+ <j:set var="logstart"><x:expr select="@start"/></j:set>
+ <j:set var="logend"><x:expr select="@end"/></j:set>
+ <j:choose>
+ <j:when test="${empty(logstart) and empty(logend)}">
+ <j:set var="setname">Changes from an unknown range</j:set>
+ </j:when>
+ <j:when test="${empty(logend)}">
+ <j:set var="setname">Changes since ${logstart}</j:set>
+ </j:when>
+ <j:otherwise>
+ <j:set var="setname">Changes between ${logstart} and ${logend}</j:set>
+ </j:otherwise>
+ </j:choose>
+ <subsection name="${setname}">
<p>
<!-- The range needs to be fed in somehow. -->
Timeframe: ${maven.changelog.range} days,
@@ -50,23 +72,19 @@
<th>Number of files changed</th>
</tr>
<j:forEach var="developer" items="${pom.developers}">
- <j:set var="developerId" value="${developer.id}"/>
- <j:set var="name" value="${developer.name}"/>
- <j:set var="commits"><x:expr
select="count(./changelog-entry/author[text()='${name}'])"/></j:set>
- <j:set var="changedFiles"><x:expr
select="count(./changelog-entry/author[text()='${name}']/../file)"/></j:set>
+ <j:set var="commits"><x:expr
select="count(./changelog-entry/author[text()="${developer.name}"])"/></j:set>
+ <j:set var="changedFiles"><x:expr
select="count(./changelog-entry/author[text()="${developer.name}"]/../file)"/></j:set>
<j:if test="${commits != '0'}">
<tr>
- <td><a href="team-list.html#${developerId}">${name}</a></td>
+ <td><a
href="team-list.html#${developer.id}">${developer.name}</a></td>
<td>${commits}</td>
<td>${changedFiles}</td>
</tr>
</j:if>
</j:forEach>
</table>
- </section>
- </body>
- </document>
+ </subsection>
</jsl:template>
<!-- element values don't pass through as text -->
Modified: maven/maven-1/plugins/trunk/developer-activity/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/developer-activity/xdocs/changes.xml?rev=226360&r1=226359&r2=226360&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/developer-activity/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/developer-activity/xdocs/changes.xml Fri Jul 29
05:33:55 2005
@@ -24,6 +24,10 @@
<author email="[EMAIL PROTECTED]">Emmanuel Venisse</author>
</properties>
<body>
+ <release version="1.5.2" date="in SVN">
+ <action dev="brett" type="fix" issue="MPDEVACTIVITY-3">Allow single
quotes in a developer's name</action>
+ <action dev="brett" type="fix" issue="MPDEVACTIVITY-4">Make template
compatible with changelog 1.8 plugin</action>
+ </release>
<release version="1.5.1" date="2004-10-23">
<action dev="dion" type="fix" issue="MPDEVACTIVITY-1">Use
maven.changelog.range instead of maven.activity.range.</action>
<action dev="dion" type="update">Bump jelly xml tag dependency.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
