Author: tchemit Date: 2009-12-10 14:28:20 +0100 (Thu, 10 Dec 2009) New Revision: 56 Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AnnouncementGenerator.java trunk/maven-jredmine-plugin/src/main/resources/org/nuiton/jredmine/plugin/announcement/release-email-announcement.vm trunk/maven-jredmine-plugin/src/main/resources/org/nuiton/jredmine/plugin/announcement/release-news-announcement.vm Log: - add TODO - add dev into release templates - remove unused initializers Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2009-12-09 22:04:45 UTC (rev 55) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2009-12-10 13:28:20 UTC (rev 56) @@ -250,12 +250,11 @@ return; } - // do upload files to redmine, - ChangesXML changesXml = new ChangesXML(xmlPath, getLog()); List<?> releases = changesXml.getReleaseList(); + //TODO-TC-20091209 must obtain back the full name of dev from the project team on each action String template = getAnnouncementTemplate(); File out = new File(templateOutputDirectory, template); Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AnnouncementGenerator.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AnnouncementGenerator.java 2009-12-09 22:04:45 UTC (rev 55) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AnnouncementGenerator.java 2009-12-10 13:28:20 UTC (rev 56) @@ -156,16 +156,16 @@ */ public Release getLatestRelease(List<?> releases, String releaseVersion) throws MojoExecutionException { - boolean isFound = false; + boolean isFound; - Release release = null; + Release release; String pomVersion = releaseVersion; getLog().debug("Found " + releases.size() + " releases."); - for (int i = 0; i < releases.size(); i++) { - release = (Release) releases.get(i); + for (Object release1 : releases) { + release = (Release) release1; if (getLog().isDebugEnabled()) { getLog().debug("The release: " + release.getVersion() + " has " + release.getActions().size() + " actions."); } @@ -191,9 +191,9 @@ } protected Release getRelease(List<?> releases, String version) { - Release release = null; - for (int i = 0; i < releases.size(); i++) { - release = (Release) releases.get(i); + Release release; + for (Object release1 : releases) { + release = (Release) release1; if (getLog().isDebugEnabled()) { getLog().debug("The release: " + release.getVersion() + " has " + release.getActions().size() + " actions."); } @@ -211,12 +211,13 @@ private void logRelease(Release release) { Action action; - for (Iterator<?> iterator = release.getActions().iterator(); iterator.hasNext();) { - action = (Action) iterator.next(); + for (Object o : release.getActions()) { + action = (Action) o; getLog().debug("o " + action.getType()); getLog().debug("issue : " + action.getIssue()); getLog().debug("action : " + action.getAction()); getLog().debug("dueTo : " + action.getDueTo()); + getLog().debug("dev : " + action.getDev()); } } Modified: trunk/maven-jredmine-plugin/src/main/resources/org/nuiton/jredmine/plugin/announcement/release-email-announcement.vm =================================================================== --- trunk/maven-jredmine-plugin/src/main/resources/org/nuiton/jredmine/plugin/announcement/release-email-announcement.vm 2009-12-09 22:04:45 UTC (rev 55) +++ trunk/maven-jredmine-plugin/src/main/resources/org/nuiton/jredmine/plugin/announcement/release-email-announcement.vm 2009-12-10 13:28:20 UTC (rev 56) @@ -37,7 +37,12 @@ #else #set($dueto="") #end -o ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end +#if ($actionItem.getDev()) +#set($dev=$actionItem.getDev()) +#else +#set($dev="") +#end +o ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end #if($!dev != "")Resolved by $dev. #end #set($issue="") #set($dueto="") @@ -58,10 +63,16 @@ #else #set($dueto="") #end -o ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end +#if ($actionItem.getDev()) +#set($dev=$actionItem.getDev()) +#else +#set($dev="") +#end +o ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end #if($!dev != "")Resolved by $dev. #end #set($issue="") #set($dueto="") +#set($dev="") #end #end @@ -79,10 +90,16 @@ #else #set($dueto="") #end -o ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end +#if ($actionItem.getDev()) +#set($dev=$actionItem.getDev()) +#else +#set($dev="") +#end +o ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end #if($!dev != "")Resolved by $dev. #end #set($issue="") #set($dueto="") +#set($dev="") #end #end @@ -100,10 +117,16 @@ #else #set($dueto="") #end -o ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end +#if ($actionItem.getDev()) +#set($dev=$actionItem.getDev()) +#else +#set($dev="") +#end +o ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end #if($!dev != "")Resolved by $dev. #end #set($issue="") #set($dueto="") +#set($dev="") #end #end ## End of main loop Modified: trunk/maven-jredmine-plugin/src/main/resources/org/nuiton/jredmine/plugin/announcement/release-news-announcement.vm =================================================================== --- trunk/maven-jredmine-plugin/src/main/resources/org/nuiton/jredmine/plugin/announcement/release-news-announcement.vm 2009-12-09 22:04:45 UTC (rev 55) +++ trunk/maven-jredmine-plugin/src/main/resources/org/nuiton/jredmine/plugin/announcement/release-news-announcement.vm 2009-12-10 13:28:20 UTC (rev 56) @@ -37,7 +37,12 @@ #else #set($dueto="") #end -* ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end +#if ($actionItem.getDev()) +#set($dev=$actionItem.getDev()) +#else +#set($dev="") +#end +* ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end #if($!dev != "")Resolved by $dev. #end #set($issue="") #set($dueto="") @@ -58,10 +63,16 @@ #else #set($dueto="") #end -* ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end +#if ($actionItem.getDev()) +#set($dev=$actionItem.getDev()) +#else +#set($dev="") +#end +* ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end #if($!dev != "")Resolved by $dev. #end #set($issue="") #set($dueto="") +#set($dev="") #end #end @@ -79,10 +90,16 @@ #else #set($dueto="") #end -* ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end +#if ($actionItem.getDev()) +#set($dev=$actionItem.getDev()) +#else +#set($dev="") +#end +* ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end #if($!dev != "")Resolved by $dev. #end #set($issue="") #set($dueto="") +#set($dev="") #end #end @@ -100,10 +117,16 @@ #else #set($dueto="") #end -* ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end +#if ($actionItem.getDev()) +#set($dev=$actionItem.getDev()) +#else +#set($dev="") +#end +* ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end #if($!dev != "")Resolved by $dev. #end #set($issue="") #set($dueto="") +#set($dev="") #end #end ## End of main loop