Author: dennisl
Date: Fri Feb 8 12:29:50 2008
New Revision: 619990
URL: http://svn.apache.org/viewvc?rev=619990&view=rev
Log:
o Merge xml-parsers and javabeans for announcement and jira mojos.
Removed:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/JiraAnnouncement.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/JiraAnnouncementParser.java
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraIssue.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java?rev=619990&r1=619989&r2=619990&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
Fri Feb 8 12:29:50 2008
@@ -24,6 +24,7 @@
import org.apache.maven.plugin.changes.Action;
import org.apache.maven.plugin.changes.ChangesXML;
import org.apache.maven.plugin.changes.Release;
+import org.apache.maven.plugin.jira.JiraXML;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
import org.apache.velocity.VelocityContext;
@@ -459,11 +460,11 @@
if ( jiraXMLFile.exists() )
{
- JiraAnnouncementParser jiraParser = new
JiraAnnouncementParser( jiraXMLFile );
+ JiraXML jiraParser = new JiraXML( jiraXMLFile );
- List issues = jiraParser.getIssues();
+ List issues = jiraParser.getIssueList();
- List releases = jiraParser.getReleases( issues );
+ List releases = JiraXML.getReleases( issues );
getLog().info( "Creating announcement file from JIRA
releases..." );
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraIssue.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraIssue.java?rev=619990&r1=619989&r2=619990&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraIssue.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraIssue.java
Fri Feb 8 12:29:50 2008
@@ -19,6 +19,9 @@
* under the License.
*/
+import java.util.ArrayList;
+import java.util.List;
+
/**
* A JIRA issue.
*
@@ -50,6 +53,10 @@
private String assignee;
+ private List comments;
+
+ private String title;
+
public JiraIssue()
{
}
@@ -172,5 +179,29 @@
public void setVersion( String version )
{
this.version = version;
+ }
+
+ public void addComment( String comment )
+ {
+ if ( comments == null )
+ {
+ comments = new ArrayList();
+ }
+ comments.add( comment );
+ }
+
+ public List getComments()
+ {
+ return comments;
+ }
+
+ public String getTitle()
+ {
+ return title;
+ }
+
+ public void setTitle( String title )
+ {
+ this.title = title;
}
}
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java?rev=619990&r1=619989&r2=619990&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
Fri Feb 8 12:29:50 2008
@@ -19,6 +19,8 @@
* under the License.
*/
+import org.apache.maven.plugin.changes.Action;
+import org.apache.maven.plugin.changes.Release;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
@@ -27,7 +29,10 @@
import javax.xml.parsers.SAXParserFactory;
import java.io.File;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
+import java.util.Map;
/**
* XML parser for <code>JiraIssue</code>s. This works on an XML file downloaded
@@ -133,6 +138,14 @@
{
issue.setComponent( currentElement.toString().trim() );
}
+ else if ( qName.equals( "comment" ) )
+ {
+ issue.addComment( currentElement.toString().trim() );
+ }
+ else if ( qName.equals( "title" ) && currentParent.equals( "item" ) )
+ {
+ issue.setTitle( currentElement.toString().trim() );
+ }
currentElement.setLength( 0 );
}
@@ -146,5 +159,80 @@
public List getIssueList()
{
return this.issueList;
+ }
+
+ public static List getReleases( List issues )
+ {
+ // A Map of releases keyed by fixVersion
+ Map releasesMap = new HashMap();
+
+ // Loop through all issues looking for fixVersions
+ for ( int i = 0; i < issues.size(); i++ )
+ {
+ JiraIssue issue = (JiraIssue) issues.get( i );
+ // Do NOT create a release for issues that lack a fixVersion
+ if ( issue.getFixVersion() != null )
+ {
+ // Try to get a matching Release from the map
+ Release release = (Release) releasesMap.get(
issue.getFixVersion() );
+ if ( release == null )
+ {
+ // Add a new Release to the Map if it wasn't there
+ release = new Release();
+ release.setVersion( issue.getFixVersion() );
+ releasesMap.put( issue.getFixVersion(), release );
+ }
+
+ // Add this issue as an Action to this release
+ Action action = createAction( issue );
+ release.addAction( action );
+ }
+ }
+
+ // Extract the releases from the Map to a List
+ List releasesList = new ArrayList();
+ for ( Iterator iterator = releasesMap.entrySet().iterator();
iterator.hasNext(); )
+ {
+ Release o = (Release) ( (Map.Entry) iterator.next() ).getValue();
+ releasesList.add( o );
+ }
+ return releasesList;
+ }
+
+ /**
+ * Create an <code>Action</code> from a JIRA issue.
+ *
+ * @param issue The issue to extract the information from
+ * @return An <code>Action</code>
+ */
+ private static Action createAction( JiraIssue issue )
+ {
+ Action action = new Action();
+
+ action.setIssue( issue.getKey() );
+
+ String type = "";
+ if ( issue.getType().equals( "Bug" ) )
+ {
+ type = "fix";
+ }
+ else if ( issue.getType().equals( "New Feature" ) )
+ {
+ type = "add";
+ }
+ else if ( issue.getType().equals( "Improvement" ) )
+ {
+ type = "update";
+ }
+ action.setType( type );
+
+ action.setDev( issue.getAssignee() );
+
+ // Set dueTo to the empty String instead of null to make Velocity happy
+ action.setDueTo( "" );
+ //action.setDueTo( issue.getReporter() );
+
+ action.setAction( issue.getSummary() );
+ return action;
}
}
