Author: ltheussl
Date: Fri Jan 6 16:55:38 2006
New Revision: 366612
URL: http://svn.apache.org/viewcvs?rev=366612&view=rev
Log:
Layout changes: mimic default JIRA appearance, also show votes.
Added:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/bug.gif
(with props)
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/improvement.gif
(with props)
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/issue_subtask.gif
(with props)
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/newfeature.gif
(with props)
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/newtest.gif
(with props)
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_blocker.gif
(with props)
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_critical.gif
(with props)
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_major.gif
(with props)
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_minor.gif
(with props)
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_trivial.gif
(with props)
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/task.gif
(with props)
Modified:
maven/maven-1/plugins/trunk/jira/plugin.jelly
maven/maven-1/plugins/trunk/jira/src/plugin-resources/jira.jsl
maven/maven-1/plugins/trunk/jira/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/jira/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jira/plugin.jelly?rev=366612&r1=366611&r2=366612&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jira/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/jira/plugin.jelly Fri Jan 6 16:55:38 2006
@@ -77,7 +77,10 @@
prettyPrint="true"
/>
</j:catch>
-
+
+ <!-- FIXME: Hack, taken from announcement/plugin.jelly -->
+ <ant:replace file="${maven.gen.docs}/jira.xml" token="&amp;"
value="&"/>
+
<j:choose>
<j:when test="${!empty(parseresult)}">
<ant:echo>Error: unable to parse jira results due to an error:
${parseresult.message}. Jira report will not be generated</ant:echo>
Added: maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/bug.gif
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/bug.gif?rev=366612&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/bug.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/improvement.gif
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/improvement.gif?rev=366612&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/improvement.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/issue_subtask.gif
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/issue_subtask.gif?rev=366612&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/issue_subtask.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/newfeature.gif
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/newfeature.gif?rev=366612&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/newfeature.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/newtest.gif
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/newtest.gif?rev=366612&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/newtest.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_blocker.gif
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_blocker.gif?rev=366612&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_blocker.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_critical.gif
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_critical.gif?rev=366612&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_critical.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_major.gif
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_major.gif?rev=366612&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_major.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_minor.gif
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_minor.gif?rev=366612&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_minor.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_trivial.gif
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_trivial.gif?rev=366612&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/priority_trivial.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/task.gif
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/task.gif?rev=366612&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/maven-1/plugins/trunk/jira/src/plugin-resources/images/task.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: maven/maven-1/plugins/trunk/jira/src/plugin-resources/jira.jsl
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jira/src/plugin-resources/jira.jsl?rev=366612&r1=366611&r2=366612&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jira/src/plugin-resources/jira.jsl (original)
+++ maven/maven-1/plugins/trunk/jira/src/plugin-resources/jira.jsl Fri Jan 6
16:55:38 2006
@@ -40,57 +40,111 @@
<table>
<thead>
<tr>
+ <th style="width:40px">Type</th>
<th style="width:150px">Key</th>
<th>Summary</th>
- <th style="width:150px">Created</th>
+ <th style="width:100px">Assignee</th>
+ <th style="width:100px">Reporter</th>
<th style="width:50px">Priority</th>
<th style="width:50px">Status</th>
- <th style="width:100px">Resolution</th>
- <th style="width:100px">Assigned to</th>
- <th style="width:100px">Reported by</th>
+ <th style="width:80px">Created</th>
+ <th style="width:80px">Updated</th>
+ <th style="width:40px">Votes</th>
</tr>
</thead>
<tbody>
<x:forEach var="entry" select="item">
+ <j:set var="type"><x:expr select="$entry/type"/></j:set>
<j:set var="key"><x:expr select="$entry/key"/></j:set>
<j:set var="link"><x:expr select="$entry/link"/></j:set>
- <j:set var="createdate"><x:expr
select="$entry/created"/></j:set>
+ <j:set var="date"><x:expr select="$entry/created"/></j:set>
+ <j:set var="createdate" value="${date.substring(5, 16)}"/>
+ <j:set var="date"><x:expr select="$entry/updated"/></j:set>
+ <j:set var="updated" value="${date.substring(5, 16)}"/>
<j:set var="priority"><x:expr
select="$entry/priority"/></j:set>
<j:set var="status"><x:expr select="$entry/status"/></j:set>
<j:set var="summary"><x:expr
select="$entry/summary"/></j:set>
<j:set var="assignee"><x:expr
select="$entry/assignee"/></j:set>
<j:set var="reporter"><x:expr
select="$entry/reporter"/></j:set>
- <j:set var="resolution"><x:expr
select="$entry/resolution"/></j:set>
+ <j:set var="votes"><x:expr select="$entry/votes"/></j:set>
<tr>
+ <td>
+ <j:choose>
+ <j:when test="${type.equalsIgnoreCase('Bug')}">
+ <img src="./images/jira/bug.gif" alt="${type}"
title="${type}"/>
+ </j:when>
+ <j:when test="${type.equalsIgnoreCase('Improvement')}">
+ <img src="./images/jira/improvement.gif"
alt="${type}" title="${type}"/>
+ </j:when>
+ <j:when test="${type.equalsIgnoreCase('Wish')}">
+ <img src="./images/jira/improvement.gif"
alt="${type}" title="${type}"/>
+ </j:when>
+ <j:when test="${type.equalsIgnoreCase('New Feature')}">
+ <img src="./images/jira/newfeature.gif"
alt="${type}" title="${type}"/>
+ </j:when>
+ <j:when test="${type.equalsIgnoreCase('Task')}">
+ <img src="./images/jira/task.gif" alt="${type}"
title="${type}"/>
+ </j:when>
+ <j:when test="${type.equalsIgnoreCase('SubTask')}">
+ <img src="./images/jira/issue_subtask.gif"
alt="${type}" title="${type}"/>
+ </j:when>
+ <j:when test="${type.equalsIgnoreCase('Test')}">
+ <img src="./images/jira/newtest.gif" alt="${type}"
title="${type}"/>
+ </j:when>
+ <j:otherwise>
+ </j:otherwise>
+ </j:choose>
+ </td>
<td><a href="${link}">${key}</a></td>
<td>${summary}</td>
- <td>${createdate}</td>
- <td>${priority}</td>
+ <td>${assignee}</td>
+ <td>${reporter}</td>
+ <td>
+ <j:choose>
+ <j:when test="${priority.equalsIgnoreCase('Blocker')}">
+ <img src="./images/jira/priority_blocker.gif"
alt="${priority}" title="${priority}"/>
+ </j:when>
+ <j:when
test="${priority.equalsIgnoreCase('Critical')}">
+ <img src="./images/jira/priority_critical.gif"
alt="${priority}" title="${priority}"/>
+ </j:when>
+ <j:when test="${priority.equalsIgnoreCase('Major')}">
+ <img src="./images/jira/priority_major.gif"
alt="${priority}" title="${priority}"/>
+ </j:when>
+ <j:when test="${priority.equalsIgnoreCase('Minor')}">
+ <img src="./images/jira/priority_minor.gif"
alt="${priority}" title="${priority}"/>
+ </j:when>
+ <j:when test="${priority.equalsIgnoreCase('Trivial')}">
+ <img src="./images/jira/priority_trivial.gif"
alt="${priority}" title="${priority}"/>
+ </j:when>
+ <j:otherwise>
+ </j:otherwise>
+ </j:choose>
+ </td>
<td>
<j:choose>
<j:when test="${status.equalsIgnoreCase('Closed')}">
- <img src="./images/jira/status_closed.gif"/>
+ <img src="./images/jira/status_closed.gif"
alt="${status}" title="${status}"/>
</j:when>
<j:when test="${status.equalsIgnoreCase('In
Progress')}">
- <img src="./images/jira/status_inprogress.gif"/>
+ <img src="./images/jira/status_inprogress.gif"
alt="${status}" title="${status}"/>
</j:when>
<j:when test="${status.equalsIgnoreCase('Open')}">
- <img src="./images/jira/status_open.gif"/>
+ <img src="./images/jira/status_open.gif"
alt="${status}" title="${status}"/>
</j:when>
<j:when test="${status.equalsIgnoreCase('Reopened')}">
- <img src="./images/jira/status_reopened.gif"/>
+ <img src="./images/jira/status_reopened.gif"
alt="${status}" title="${status}"/>
</j:when>
<j:when test="${status.equalsIgnoreCase('Resolved')}">
- <img src="./images/jira/status_resolved.gif"/>
+ <img src="./images/jira/status_resolved.gif"
alt="${status}" title="${status}"/>
</j:when>
<j:otherwise>
</j:otherwise>
</j:choose>
${status}
</td>
- <td>${resolution}</td>
- <td>${assignee}</td>
- <td>${reporter}</td>
+ <td>${createdate}</td>
+ <td>${updated}</td>
+ <td>${votes}</td>
</tr>
</x:forEach>
</tbody>
Modified: maven/maven-1/plugins/trunk/jira/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jira/xdocs/changes.xml?rev=366612&r1=366611&r2=366612&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jira/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jira/xdocs/changes.xml Fri Jan 6 16:55:38 2006
@@ -23,6 +23,9 @@
<author email="[EMAIL PROTECTED]">Brett Porter</author>
</properties>
<body>
+ <release version="1.3-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="update">Layout changes: mimic default JIRA
appearance, also show votes.</action>
+ </release>
<release version="1.2" date="2005-12-03">
<action dev="fgiust" type="fix">Only log an error if the jira changes
xml can't be parsed instead of throwing an Exception</action>
<action dev="fgiust" type="fix" issue="MPJIRA-4">Make the Jira report
work also using a fancy JIRA url like http://jira.codehaus.org/browse/MPJIRA
(it doesn't require the url with a numeric project id anymore)</action>
