Author: tchemit Date: 2010-06-29 13:59:54 +0200 (Tue, 29 Jun 2010) New Revision: 148 Url: http://nuiton.org/repositories/revision/jredmine/148 Log: Evolution #549: Use maven-license-plugin 2.3.1 Evolution #550: Use mavenpom4redmine 2.2.2 Evolution #737: Use maven-helper-plugin 1.2.6 Reformat code + optimze imports Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 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/java/org/nuiton/jredmine/plugin/announcement/AnnouncementGeneratorConfiguration.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReport.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssignee.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategory.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriority.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporter.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatus.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByTracker.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersion.java trunk/pom.xml Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2010-06-29 11:59:54 UTC (rev 148) @@ -53,6 +53,7 @@ public abstract class AbstractRedmineMojo extends AbstractPlugin implements RestClientConfiguration { public static final String REDMINE_SYSTEM = "redmine"; + /** * Dependance du projet. * @@ -62,6 +63,7 @@ * @since 1.0.0 */ protected MavenProject project; + /** * The real basedir redmine url. * <p/> @@ -71,9 +73,10 @@ * @since 1.0.0 */ protected URL url; + /** * The redmine's server login. - * + * <p/> * <b>Note:</b> : this parameter is mandatory if you not use a {@code anonymous} service. * configuration. * @@ -81,23 +84,29 @@ * @since 1.0.0 */ protected String username; + /** * The redmine's server password. - * + * <p/> * <b>Note:</b> : this parameter is mandatory if you not use a {@code anonymous} service. * configuration. - * + * * @parameter expression="${redmine.password}" * @since 1.0.0 */ protected String password; + /** * The encoding used to read and write files. + * <p/> + * <b>Note:</b> If nothing is filled here, we will use the system + * property {@code file.encoding}. * * @parameter expression="${redmine.encoding}" default-value="${project.build.sourceEncoding}" * @since 1.0.0 */ protected String encoding; + /** * Redmine project name. * @@ -106,6 +115,7 @@ * @since 1.0.0 */ protected String projectId; + /** * redmine version name. * @@ -113,6 +123,7 @@ * @since 1.0.0 */ protected String versionId; + /** * Un flag pour activer le mode verbeux. * @@ -120,6 +131,7 @@ * @since 1.0.0 */ protected boolean verbose; + /** * Un flag pour faire échouer le build si la configuration n'est pas ok. * @@ -127,11 +139,13 @@ * @since 1.0.0 */ protected boolean safe; + /** * @parameter expression="${session}" * @readonly */ protected MavenSession session; + /** * Redmine service. * @@ -139,47 +153,37 @@ * @since 1.0.0 */ protected RedmineService service; - /** - * flag to load in init a required project using the {@link #projectId} name - */ + + /** flag to load in init a required project using the {@link #projectId} name */ private final boolean requireProject; - /** - * flag to load in init a required version using the {@link #versionId} name. - */ + + /** flag to load in init a required version using the {@link #versionId} name. */ private final boolean requireVersion; - /** - * flag to load in init a required user using the user loggued to redmine server. - */ + + /** flag to load in init a required user using the user loggued to redmine server. */ private final boolean requireUser; - /** - * the project loaded in init if {@link #requireProject} flag is on - */ + + /** the project loaded in init if {@link #requireProject} flag is on */ protected Project releaseProject; - /** - * the version loaded in init if {@link #requireVersion} flag is on - */ + + /** the version loaded in init if {@link #requireVersion} flag is on */ protected Version releaseVersion; - /** - * the user loaded in init if {@link #requireUser} flag is on - */ + + /** the user loaded in init if {@link #requireUser} flag is on */ protected User releaseUser; - /** - * cache of users of a given project loaded in int if {@link #requireUser} flag is on - */ + + /** cache of users of a given project loaded in int if {@link #requireUser} flag is on */ protected User[] users; - /** - * the date format used to write a date - */ + + /** the date format used to write a date */ protected DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - /** - * flag to mark if a runOnce goal was done - */ + + /** flag to mark if a runOnce goal was done */ protected boolean runOnceDone; - /** - * flag to mark if service was sucessfull init - */ + /** flag to mark if service was sucessfull init */ protected boolean serviceInit; + protected boolean initOk = true; public AbstractRedmineMojo(boolean requireProject, boolean requireVersion, boolean requireUser) { @@ -191,6 +195,7 @@ /////////////////////////////////////////////////////////////////////////// /// AbstractPlugin /////////////////////////////////////////////////////////////////////////// + @Override protected void init() throws Exception { @@ -200,9 +205,9 @@ if (issueManagement == null) { throw new MojoExecutionException("No Issue Management set."); - } else if ((issueManagement.getUrl() == null) || (issueManagement.getUrl().trim().equals(""))) { + } else if (issueManagement.getUrl() == null || issueManagement.getUrl().trim().equals("")) { throw new MojoExecutionException("No URL set in Issue Management."); - } else if ((issueManagement.getSystem() != null) && !(issueManagement.getSystem().equalsIgnoreCase(AbstractRedmineMojo.REDMINE_SYSTEM))) { + } else if (issueManagement.getSystem() != null && !issueManagement.getSystem().equalsIgnoreCase(REDMINE_SYSTEM)) { throw new MojoExecutionException("Redmine's Plugin only supports 'redmine' Issue Management system."); } // prepare Redmine service configuration @@ -227,11 +232,11 @@ if (verbose) { if (isAnonymous()) { getLog().info("Redmine anonymous configuration :\n>> host : " + - getRestUrl()); + getRestUrl()); } else { getLog().info("Redmine configuration :\n>> host : " + - getRestUrl() + "\n>> username : " + - getRestUsername()); + getRestUrl() + "\n>> username : " + + getRestUsername()); } } @@ -332,8 +337,7 @@ /** * Re-expose the protected method for test purposes... * - * @throws Exception - * @see AbstractPlugin#doAction() + * @throws Exception if any problems */ @Override protected abstract void doAction() throws Exception; @@ -368,8 +372,23 @@ } /////////////////////////////////////////////////////////////////////////// + /// PluginWithencoding + /////////////////////////////////////////////////////////////////////////// + + @Override + public String getEncoding() { + return encoding; + } + + @Override + public void setEncoding(String encoding) { + this.encoding = encoding; + } + + /////////////////////////////////////////////////////////////////////////// /// RestClientConfiguration /////////////////////////////////////////////////////////////////////////// + @Override public String getRestPassword() { return password; @@ -400,19 +419,10 @@ username = restUsername; } - @Override - public String getEncoding() { - return encoding; - } - - @Override - public void setEncoding(String encoding) { - this.encoding = encoding; - } - /////////////////////////////////////////////////////////////////////////// /// Others /////////////////////////////////////////////////////////////////////////// + protected boolean initReleaseProject() throws MojoExecutionException { if (projectId == null || projectId.trim().isEmpty()) { @@ -429,7 +439,7 @@ releaseProject = p; return true; } catch (RedmineServiceException e) { - getLog().warn("could not retreave project '" + projectId + "', for reason "+e.getMessage(),e); + getLog().warn("could not retreave project '" + projectId + "', for reason " + e.getMessage(), e); return false; } } @@ -452,7 +462,7 @@ releaseVersion = v; return true; } catch (RedmineServiceException e) { - getLog().warn("could not retreave version '" + versionId + "', for reason "+e.getMessage(),e); + getLog().warn("could not retreave version '" + versionId + "', for reason " + e.getMessage(), e); return false; } } @@ -472,7 +482,7 @@ releaseUser = user; return true; } catch (RedmineServiceException e) { - getLog().warn("could not retreave user '" + username + "', for reason "+e.getMessage(),e); + getLog().warn("could not retreave user '" + username + "', for reason " + e.getMessage(), e); return false; } } @@ -480,7 +490,7 @@ protected void closeService() { if (service != null) { RedmineServiceImplementor i; - i = ((RedmineServiceImplementor) service); + i = (RedmineServiceImplementor) service; if (i.isInit()) { try { Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2010-06-29 11:59:54 UTC (rev 148) @@ -26,7 +26,11 @@ import org.apache.maven.plugin.MojoFailureException; import org.nuiton.jredmine.RedmineServiceImplementor; -import org.nuiton.jredmine.model.*; +import org.nuiton.jredmine.model.I18nAble; +import org.nuiton.jredmine.model.IdAble; +import org.nuiton.jredmine.model.ModelHelper; +import org.nuiton.jredmine.model.RedmineModelEnum; +import org.nuiton.jredmine.model.RedmineModelScope; import org.nuiton.plugin.PluginHelper; import java.util.ArrayList; @@ -63,19 +67,21 @@ * @since 1.0.0 */ protected String types; + /** * A flag to sort of not retrived data by id. - * + * * @parameter expression="${sortById}" default-value="true" * @required * @since 1.0.0 */ protected boolean sortById; + /** * Flag to know if anonymùous connexion to redmine server is required. - * + * <p/> * For this goal, the default value is {@code true} - * + * <p/> * <b>Note:</b> If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * @@ -83,9 +89,8 @@ * @since 1.1.3 */ protected boolean anonymous; - /** - * list of actions to perform - */ + + /** list of actions to perform */ protected List<RedmineModelEnum> actions; public DisplayDataMojo() { @@ -116,15 +121,15 @@ } actions = getDownloadActions(types, - RedmineModelEnum.project, - RedmineModelEnum.version, - RedmineModelEnum.issue, - RedmineModelEnum.news, - RedmineModelEnum.issueStatus, - RedmineModelEnum.issuePriority, - RedmineModelEnum.issueCategory, - RedmineModelEnum.tracker, - RedmineModelEnum.user); + RedmineModelEnum.project, + RedmineModelEnum.version, + RedmineModelEnum.issue, + RedmineModelEnum.news, + RedmineModelEnum.issueStatus, + RedmineModelEnum.issuePriority, + RedmineModelEnum.issueCategory, + RedmineModelEnum.tracker, + RedmineModelEnum.user); if (actions == null || actions.isEmpty()) { // no need to connect, nothing to do... return; @@ -165,7 +170,7 @@ IdAble[] datas = (IdAble[]) ((RedmineServiceImplementor) service).getDatas(requestName, entry.getModelType(), projectId, versionId); List<IdAble> list = Arrays.asList(datas); if (sortById) { - Collections.sort(list,ModelHelper.ID_ABLE_COMPARATOR); + Collections.sort(list, ModelHelper.ID_ABLE_COMPARATOR); } buffer.append("\nValues of '").append(entry).append('\''); if (scope == RedmineModelScope.project || scope == RedmineModelScope.version) { Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2010-06-29 11:59:54 UTC (rev 148) @@ -25,17 +25,32 @@ package org.nuiton.jredmine.plugin; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugins.changes.model.*; +import org.apache.maven.plugins.changes.model.Action; +import org.apache.maven.plugins.changes.model.Author; +import org.apache.maven.plugins.changes.model.Body; +import org.apache.maven.plugins.changes.model.ChangesDocument; import org.apache.maven.plugins.changes.model.Properties; +import org.apache.maven.plugins.changes.model.Release; import org.apache.maven.plugins.changes.model.io.xpp3.ChangesXpp3Writer; import org.codehaus.plexus.util.xml.XmlStreamWriter; import org.nuiton.jredmine.RedmineServiceException; -import org.nuiton.jredmine.model.*; +import org.nuiton.jredmine.model.Issue; +import org.nuiton.jredmine.model.IssueCategory; +import org.nuiton.jredmine.model.IssueStatus; +import org.nuiton.jredmine.model.ModelHelper; +import org.nuiton.jredmine.model.Tracker; +import org.nuiton.jredmine.model.User; +import org.nuiton.jredmine.model.Version; import org.nuiton.plugin.PluginHelper; import java.io.File; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; /** @@ -49,9 +64,7 @@ */ public class GenerateChangesMojo extends AbstractRedmineMojo implements IssueCollectorConfiguration { - /** - * The actions understood by the changes.xml format. - */ + /** The actions understood by the changes.xml format. */ enum Actions { add, @@ -72,7 +85,7 @@ * @since 1.1.3 */ protected boolean anonymous; - + /** * The path of the <code>changes.xml</code> file that will be converted into an HTML report. * @@ -81,6 +94,7 @@ * @since 1.0.0 */ protected File xmlPath; + /** * The description of the release. * <p/> @@ -90,6 +104,7 @@ * @since 1.0.0 */ protected String releaseDescription; + /** * The changes file title. * @@ -98,6 +113,7 @@ * @since 1.0.0 */ protected String changesTitle; + /** * If you only want to show issues for the current version in the report. * The current version being used is <code>${project.version}</code> minus @@ -107,6 +123,7 @@ * @since 1.0.0 */ protected boolean onlyCurrentVersion; + /** * The action mapping to the redmine tracker ids. * <p/> @@ -126,6 +143,7 @@ * @since 1.0.0 */ protected String actionMapping; + /** * The comma separated list of statuses ids to include in the changes.xml * <p/> @@ -136,6 +154,7 @@ * @since 1.0.0 */ protected String statusIds; + /** * The comma separated list of category ids to include in the changes.xml * <p/> @@ -146,6 +165,7 @@ * @since 1.0.0 */ protected String categoryIds; + /** * A flag to skip the goal. * @@ -153,6 +173,7 @@ * @since 1.0.0 */ protected boolean skipGenerateChanges; + /** * A flag to generate only once in a multi-module project. The changes.xml * file will be generated only once in the pom module and then copy in the @@ -164,15 +185,15 @@ * @since 1.0.0 */ protected boolean generateOnce; - /** - * le fichier deja genere - */ + + /** le fichier deja genere */ private static File cacheChangesFile; - /** - * le mapping entre l'id d'un tracker et le type d'action - */ + + /** le mapping entre l'id d'un tracker et le type d'action */ protected Map<Integer, String> trackerToAction; + protected Map<String, String> filters; + private Version[] versions; public GenerateChangesMojo() { @@ -188,7 +209,7 @@ public void setAnonymous(boolean anonymous) { this.anonymous = anonymous; } - + @Override protected boolean isGoalSkip() { return skipGenerateChanges; @@ -450,7 +471,7 @@ if (releaseVersion.getEffectiveDate() == null) { getLog().debug("The version " + versionId + " is not effective on redmine, should update effective-date property to today"); - + releaseVersion.setEffectiveDate(new Date()); } @@ -611,6 +632,7 @@ /////////////////////////////////////////////////////////////////////////// /// IssueCollectionConfiguration /////////////////////////////////////////////////////////////////////////// + @Override public String getProjectId() { return projectId; Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java 2010-06-29 11:59:54 UTC (rev 148) @@ -27,7 +27,13 @@ import org.apache.maven.plugin.logging.Log; import org.nuiton.jredmine.RedmineService; import org.nuiton.jredmine.RedmineServiceException; -import org.nuiton.jredmine.model.*; +import org.nuiton.jredmine.model.Issue; +import org.nuiton.jredmine.model.IssueCategory; +import org.nuiton.jredmine.model.IssuePriority; +import org.nuiton.jredmine.model.IssueStatus; +import org.nuiton.jredmine.model.ModelHelper; +import org.nuiton.jredmine.model.Tracker; +import org.nuiton.jredmine.model.Version; import java.util.ArrayList; import java.util.Arrays; @@ -41,41 +47,31 @@ */ public class IssuesCollector { - /** - * logger - */ + /** logger */ protected final Log log; - /** - * verbose flag - */ + + /** verbose flag */ protected final boolean verbose; - /** - * to restrict on number of entries to collect - */ + + /** to restrict on number of entries to collect */ protected Integer maxEntries; - /** - * the list of version ids collected - */ + + /** the list of version ids collected */ protected List<Integer> versionIds; - /** - * the list of priority ids collected - */ + + /** the list of priority ids collected */ protected List<Integer> priorityIds; - /** - * the list of status ids collected - */ + + /** the list of status ids collected */ protected List<Integer> statusIds; - /** - * the list of category ids collected - */ + + /** the list of category ids collected */ protected List<Integer> categoryIds; - /** - * the list of tracker ids collected - */ + + /** the list of tracker ids collected */ protected List<Integer> trackerIds; - /** - * the list of issues collected - */ + + /** the list of issues collected */ protected Issue[] issues; public IssuesCollector(Log log, boolean verbose) { Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java 2010-06-29 11:59:54 UTC (rev 148) @@ -59,6 +59,7 @@ * @since 1.2.1 */ protected MavenProject project; + /** * The real basedir redmine url. * <p/> @@ -68,6 +69,7 @@ * @since 1.2.1 */ protected URL url; + /** * Un flag pour activer le mode verbeux. * @@ -75,6 +77,7 @@ * @since 1.2.1 */ protected boolean verbose; + /** * Un flag pour verifier le login (effectue une connexion au serveur). * @@ -82,6 +85,7 @@ * @since 1.2.1 */ protected boolean checkLogin; + /** * Un flag pour faire échouer le build si la configuration n'est pas ok. * @@ -89,6 +93,7 @@ * @since 1.2.1 */ protected boolean safe; + /** * Redmine server id to obtain login and password. * <p/> @@ -109,6 +114,7 @@ * @since 1.2.1 */ protected Settings settings; + /** * password decypher * @@ -116,6 +122,7 @@ * @since 1.2.1 */ protected SecDispatcher sec; + /** * Redmine service. * @@ -132,6 +139,7 @@ protected static ShareServerSecretPlugin plugin; private static final String REDMINE_USERNAME = "redmine.username"; + private static final String REDMINE_PASSWORD = "redmine.password"; /////////////////////////////////////////////////////////////////////////// @@ -276,6 +284,7 @@ /////////////////////////////////////////////////////////////////////////// /// RestClientConfiguration /////////////////////////////////////////////////////////////////////////// + @Override public String getRestPassword() { return project.getProperties().getProperty(REDMINE_PASSWORD); Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2010-06-29 11:59:54 UTC (rev 148) @@ -47,7 +47,7 @@ /** * Flag to know if anonymùous connexion to redmine server is required. - * + * <p/> * <b>Note:</b> If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * @@ -55,6 +55,7 @@ * @since 1.1.3 */ protected boolean anonymous; + /** * The news description to update to redmine server. * <p/> @@ -64,6 +65,7 @@ * @since 1.0.0 */ protected String versionDescription; + /** * The effective date to set on the version. * <p/> @@ -76,6 +78,7 @@ * @since 1.0.0 */ protected String effectiveDate; + /** * The name of a previous version. * <p/> @@ -85,6 +88,7 @@ * @since 1.0.0 */ protected String previousVersionName; + /** * A flag to skip the goal. * @@ -92,6 +96,7 @@ * @since 1.0.0 */ protected boolean skipNextVersion; + /** * A flag to test plugin but send nothing to redmine. * @@ -99,6 +104,7 @@ * @since 1.0.0 */ protected boolean dryRun; + /** * A flag to restirct only one run in a build (for multi-module context). * @@ -106,9 +112,8 @@ * @since 1.0.0 */ protected boolean runOnce; - /** - * effective date to set - */ + + /** effective date to set */ private Date date; public NextVersionMojo() { @@ -124,7 +129,7 @@ public void setAnonymous(boolean anonymous) { this.anonymous = anonymous; } - + @Override protected boolean isGoalSkip() { return skipNextVersion; Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2010-06-29 11:59:54 UTC (rev 148) @@ -47,7 +47,7 @@ public class PublishAttachmentsMojo extends AbstractRedmineMojo { /** * Flag to know if anonymùous connexion to redmine server is required. - * + * <p/> * <b>Note:</b> If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * @@ -55,6 +55,7 @@ * @since 1.1.3 */ protected boolean anonymous; + /** * The path of a properties files where files to deploy are descriped. * <p/> @@ -68,6 +69,7 @@ * @since 1.0.0 */ protected File filesFromProperties; + /** * A list of files to deploy. * <p/> @@ -77,6 +79,7 @@ * @since 1.0.0 */ protected File[] files; + /** * A flag to skip the goal. * @@ -84,6 +87,7 @@ * @since 1.0.0 */ protected boolean skipPublishAttachments; + /** * A flag to test plugin but send nothing to redmine. * @@ -91,6 +95,7 @@ * @since 1.0.0 */ protected boolean dryRun; + /** * A flag to restirct only one run in a build (for multi-module context). * @@ -98,9 +103,8 @@ * @since 1.0.0 */ protected boolean runOnce; - /** - * files to deploy - */ + + /** files to deploy */ protected List<File> allFiles; public PublishAttachmentsMojo() { @@ -116,7 +120,7 @@ public void setAnonymous(boolean anonymous) { this.anonymous = anonymous; } - + @Override protected boolean isGoalSkip() { return skipPublishAttachments; @@ -159,7 +163,7 @@ if (allFiles == null || allFiles.isEmpty()) { return; } - + runOnceDone = false; if (isRunOnce()) { Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2010-06-29 11:59:54 UTC (rev 148) @@ -40,7 +40,7 @@ public class PublishNewsMojo extends AbstractRedmineMojo { /** * Flag to know if anonymùous connexion to redmine server is required. - * + * <p/> * <b>Note:</b> If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * @@ -48,6 +48,7 @@ * @since 1.1.3 */ protected boolean anonymous; + /** * The content file of the news. * @@ -56,6 +57,7 @@ * @since 1.0.0 */ protected File newsContentFile; + /** * Short description or introduction of the released artifact. * @@ -63,6 +65,7 @@ * @since 1.0.0 */ protected String newsSummary; + /** * The title of the news to create on redmine server. * <p/> @@ -74,6 +77,7 @@ * @since 1.0.0 */ protected String newsTitle; + /** * A flag to skip the goal. * @@ -81,6 +85,7 @@ * @since 1.0.0 */ protected boolean skipPublishNews; + /** * A flag to test plugin but send nothing to redmine. * @@ -88,6 +93,7 @@ * @since 1.0.0 */ protected boolean dryRun; + /** * A flag to restirct only one run in a build (for multi-module context). * Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2010-06-29 11:59:54 UTC (rev 148) @@ -44,7 +44,7 @@ public class UpdateVersionMojo extends AbstractRedmineMojo { /** * Flag to know if anonymùous connexion to redmine server is required. - * + * <p/> * <b>Note:</b> If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * @@ -52,6 +52,7 @@ * @since 1.1.3 */ protected boolean anonymous; + /** * The news description to update to redmine server. * <p/> @@ -61,6 +62,7 @@ * @since 1.0.0 */ protected String versionDescription; + /** * A flag to close the version on redmine (will fix effectiveDate). * @@ -68,6 +70,7 @@ * @since 1.0.0 */ protected boolean closeVersion; + /** * The effective date to set on the version. * <p/> @@ -80,6 +83,7 @@ * @since 1.0.0 */ protected String effectiveDate; + /** * A flag to skip the goal. * @@ -87,6 +91,7 @@ * @since 1.0.0 */ protected boolean skipUpdateVersion; + /** * A flag to test plugin but send nothing to redmine. * @@ -94,6 +99,7 @@ * @since 1.0.0 */ protected boolean dryRun; + /** * A flag to restirct only one run in a build (for multi-module context). * @@ -101,9 +107,8 @@ * @since 1.0.0 */ protected boolean runOnce; - /** - * effective date to set - */ + + /** effective date to set */ private Date date; public UpdateVersionMojo() { @@ -119,7 +124,7 @@ public void setAnonymous(boolean anonymous) { this.anonymous = anonymous; } - + @Override protected boolean isGoalSkip() { return skipUpdateVersion; 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 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2010-06-29 11:59:54 UTC (rev 148) @@ -58,6 +58,7 @@ * @since 1.1.3 */ protected boolean anonymous; + /** * Directory where the template file will be generated. * @@ -66,6 +67,7 @@ * @since 1.0.0 */ protected File templateOutputDirectory; + /** * The path of the changes.xml file. * @@ -74,6 +76,7 @@ * @since 1.0.0 */ protected File xmlPath; + /** * Directory that contains the template. * <p> @@ -86,6 +89,7 @@ * @since 1.0.0 */ protected String templateDirectory; + /** * The template encoding. * @@ -93,6 +97,7 @@ * @since 1.0.0 */ protected String templateEncoding; + /** * Map which will be pass to the velocity context * @@ -100,6 +105,7 @@ * @since 1.0.0 */ protected Map<String, Object> announceParameters; + /** * Template strings per system that is used to discover the URL to use to display an attchment. Each key in this * map denotes the (case-sensitive) identifier of the issue tracking system and its value gives the URL template. @@ -113,18 +119,21 @@ * @since 1.0.0 */ protected String attachmentLinkTemplate; + /** * @parameter expression="${project.groupId}" * @readonly * @since 1.0.0 */ protected String groupId; + /** * @parameter expression="${project.artifactId}" * @readonly * @since 1.0.0 */ protected String artifactId; + /** * Distribution url of the artifact. * @@ -133,6 +142,7 @@ * @since 1.0.0 */ protected String projectUrl; + /** * Packaging structure for the artifact. * @@ -141,6 +151,7 @@ * @since 1.0.0 */ protected String packaging; + /** * The name of the artifact to be used in the announcement. * @@ -149,6 +160,7 @@ * @since 1.0.0 */ protected String finalName; + /** * The current project base directory. * @@ -157,6 +169,7 @@ * @since 1.0.0 */ protected String basedir; + /** * URL where the artifact can be downloaded. If not specified, * no URL is used. @@ -165,6 +178,7 @@ * @since 1.0.0 */ protected String urlDownload; + /** * Name of the team that develops the artifact. * @@ -173,6 +187,7 @@ * @since 1.0.0 */ protected String developmentTeam; + /** * Short description or introduction of the released artifact. * @@ -180,6 +195,7 @@ * @since 1.0.0 */ protected String introduction; + /** * A flag to restirct only one run in a build (for multi-module context). * @@ -187,16 +203,19 @@ * @since 1.0.0 */ protected boolean runOnce; + /** * @parameter expression="${redmine.artifactsFile}" * @since 1.2.1 */ protected File artifactsFile; + /** * @parameter expression="${redmine.deploymentUrl}" * @readonly */ protected String deploymentUrl; + /** * Velocity Component. * @@ -214,9 +233,7 @@ protected AnnouncementGenerator generator; - /** - * @return the name fo the template to use - */ + /** @return the name fo the template to use */ protected abstract String getAnnouncementTemplate(); protected AbstractAnnouncementMojo() { @@ -226,6 +243,7 @@ /////////////////////////////////////////////////////////////////////////// /// AbstractRedmineMojo /////////////////////////////////////////////////////////////////////////// + @Override public boolean isAnonymous() { return anonymous; @@ -235,7 +253,7 @@ public void setAnonymous(boolean anonymous) { this.anonymous = anonymous; } - + @Override protected boolean isRunOnce() { return runOnce; @@ -275,7 +293,7 @@ templateEncoding = ReaderFactory.FILE_ENCODING; getLog().warn( "File encoding has not been set, using platform encoding " + - templateEncoding + ", i.e. build is platform dependent!"); + templateEncoding + ", i.e. build is platform dependent!"); } if (StringUtils.isEmpty(introduction)) { @@ -287,7 +305,7 @@ if (artifactsFile != null) { if (!artifactsFile.exists()) { throw new MojoExecutionException("The artifactsFile [" + - artifactsFile + "] does not exists"); + artifactsFile + "] does not exists"); } @@ -303,7 +321,7 @@ getLog().info("Deploy url = " + url); } - artifactUrls = generator.getArtifactsUrls(url,versionId,isVerbose(),files); + artifactUrls = generator.getArtifactsUrls(url, versionId, isVerbose(), files); } super.init(); @@ -361,6 +379,7 @@ /////////////////////////////////////////////////////////////////////////// /// AnnouncementGeneratorConfiguration /////////////////////////////////////////////////////////////////////////// + @Override public String getAttachmentLinkTemplate() { return attachmentLinkTemplate; 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 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AnnouncementGenerator.java 2010-06-29 11:59:54 UTC (rev 148) @@ -42,7 +42,12 @@ import java.io.FileOutputStream; import java.io.OutputStreamWriter; import java.io.Writer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -52,13 +57,10 @@ */ public class AnnouncementGenerator { - /** - * The token any of urls denoting the base URL for the given url. - */ + /** The token any of urls denoting the base URL for the given url. */ private static final String URL_TOKEN = "%URL%"; - /** - * The token in {@link #getAttachmentLinkTemplate()} denoting the attachment ID. - */ + + /** The token in {@link #getAttachmentLinkTemplate()} denoting the attachment ID. */ private static final String ATTACHMENT_TOKEN = "%FILE%"; private static final Pattern ARTIFACT_PATTERN = Pattern.compile("(.+)?--(.+)?"); @@ -105,10 +107,15 @@ private class ArtifactInfo { private File src; + private String groupId; + private String artifactId; + private String url; + private String extension; + private String filename; public ArtifactInfo(String url, String versionId, File srcfile) { @@ -280,8 +287,8 @@ String attachmentLinkTemplate = getAttachmentLinkTemplate(); String url = getUrl(); return !StringUtils.isBlank(attachmentLinkTemplate) && - attachmentLinkTemplate.indexOf(ATTACHMENT_TOKEN) > 0 && - (!attachmentLinkTemplate.contains(URL_TOKEN) || !StringUtils.isBlank(url)); + attachmentLinkTemplate.indexOf(ATTACHMENT_TOKEN) > 0 && + (!attachmentLinkTemplate.contains(URL_TOKEN) || !StringUtils.isBlank(url)); } protected String parseAttachmentLink(String id) { Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AnnouncementGeneratorConfiguration.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AnnouncementGeneratorConfiguration.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AnnouncementGeneratorConfiguration.java 2010-06-29 11:59:54 UTC (rev 148) @@ -43,19 +43,13 @@ */ public interface AnnouncementGeneratorConfiguration { - /** - * @return the redmine url - */ + /** @return the redmine url */ String getUrl(); - /** - * @return the redmine attachment url template - */ + /** @return the redmine attachment url template */ String getAttachmentLinkTemplate(); - /** - * @return logger - */ + /** @return logger */ Log getLog(); String getArtifactId(); Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java 2010-06-29 11:59:54 UTC (rev 148) @@ -41,6 +41,7 @@ * @since 1.0.0 */ protected String emailAnnouncementTemplate; + /** * A flag to enable or disable the goal. * Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java 2010-06-29 11:59:54 UTC (rev 148) @@ -41,6 +41,7 @@ * @since 1.0.0 */ protected String newsAnnouncementTemplate; + /** * A flag to enable or disable the goal. * Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2010-06-29 11:59:54 UTC (rev 148) @@ -50,13 +50,10 @@ */ protected final String group; - /** - * cache of collected issues - */ + /** cache of collected issues */ protected static Map<IssueCollectorConfiguration, Issue[]> issuesCache = new HashMap<IssueCollectorConfiguration, Issue[]>(); - /** - * Issues to used for report - */ + + /** Issues to used for report */ protected Issue[] issues; protected AbstractIssuesReport(String group) { @@ -71,6 +68,7 @@ /////////////////////////////////////////////////////////////////////////// /// MavenReport /////////////////////////////////////////////////////////////////////////// + @Override public final String getOutputName() { return "redmine-report" + (group == null ? "" : ("-by-" + group)); @@ -104,6 +102,7 @@ /////////////////////////////////////////////////////////////////////////// /// Plugin /////////////////////////////////////////////////////////////////////////// + @Override public void init() throws Exception { @@ -118,7 +117,7 @@ if (isVerbose()) { getLog().info("Collect issues for " + this); } - + // init issues collector IssuesCollector collector = new IssuesCollector(getLog(), verbose); @@ -132,7 +131,7 @@ issues = collector.getIssues(); // store it in cache - + issuesCache.put(this, issues); } catch (RedmineServiceException ex) { @@ -146,6 +145,7 @@ /////////////////////////////////////////////////////////////////////////// /// AbstractRedmineReport /////////////////////////////////////////////////////////////////////////// + @Override public void executeReport(Locale locale) throws MavenReportException { @@ -193,6 +193,7 @@ /////////////////////////////////////////////////////////////////////////// /// IssueCollectionConfiguration /////////////////////////////////////////////////////////////////////////// + @Override public final String getProjectId() { return projectId; @@ -236,6 +237,7 @@ /////////////////////////////////////////////////////////////////////////// /// Others /////////////////////////////////////////////////////////////////////////// + protected final String getGroup() { return group; } Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2010-06-29 11:59:54 UTC (rev 148) @@ -79,6 +79,7 @@ * @since 1.1.3 */ protected boolean anonymous; + /** * Template strings per system that is used to discover the URL to use to display an issue report. Each key in this * map denotes the (case-sensitive) identifier of the issue tracking system and its value gives the URL template. @@ -92,6 +93,7 @@ * @since 1.0.0 */ protected String issueLinkTemplate; + /** * Template strings per system that is used to discover the URL to use to display an issue report. Each key in this * map denotes the (case-sensitive) identifier of the issue tracking system and its value gives the URL template. @@ -105,6 +107,7 @@ * @since 1.0.0 */ protected String versionLinkTemplate; + /** * Local Repository. * @@ -113,6 +116,7 @@ * @readonly */ protected ArtifactRepository localRepository; + /** * Report output directory. Note that this parameter is only relevant if the goal is run from the command line or * from the default build lifecycle. If the goal is run indirectly as part of a site generation, the output @@ -121,34 +125,34 @@ * @parameter default-value="${project.reporting.outputDirectory}" */ protected File outputDirectory; - /** - * @component - */ + + /** @component */ protected ArtifactResolver resolver; - /** - * @component - */ + + /** @component */ protected ArtifactFactory factory; + /** * Internationalization. * * @component */ protected I18N i18n; + /** * Doxia Site Renderer. * * @component */ protected Renderer siteRenderer; + private Sink sink; + private File reportOutputDirectory; protected abstract void executeReport(Locale locale) throws MavenReportException; - /** - * @return {@code true} if report should be skip - */ + /** @return {@code true} if report should be skip */ protected abstract boolean skipReport(); public AbstractRedmineReport(boolean requireProject, boolean requireVersion, boolean requireUser) { @@ -167,6 +171,7 @@ /////////////////////////////////////////////////////////////////////////// /// Plugin /////////////////////////////////////////////////////////////////////////// + @Override protected void doAction() throws Exception { @@ -177,7 +182,7 @@ attributes.put("outputEncoding", encoding); Locale currentLocale = Locale.getDefault(); SiteRenderingContext siteContext = siteRenderer.createContextForSkin(getSkinArtifactFile(), attributes, - model, getName(currentLocale), currentLocale); + model, getName(currentLocale), currentLocale); RenderingContext context = new RenderingContext(outputDirectory, getOutputName() + ".html"); @@ -191,7 +196,7 @@ siteRenderer.generateDocument(writer, newSink, siteContext); siteRenderer.copyResources(siteContext, new File(project.getBasedir(), "src/site/resources"), - outputDirectory); + outputDirectory); } catch (RendererException e) { throw new MojoExecutionException( @@ -211,6 +216,7 @@ /////////////////////////////////////////////////////////////////////////// /// MavenReport /////////////////////////////////////////////////////////////////////////// + @Override public boolean canGenerateReport() { boolean init; @@ -294,6 +300,7 @@ /////////////////////////////////////////////////////////////////////////// /// Others /////////////////////////////////////////////////////////////////////////// + protected Sink getSink() { return sink; } @@ -314,7 +321,7 @@ } VersionRange versionSpec = VersionRange.createFromVersionSpec(version); artifact = factory.createDependencyArtifact(skin.getGroupId(), skin.getArtifactId(), versionSpec, "jar", - null, null); + null, null); resolver.resolve(artifact, project.getRemoteArtifactRepositories(), localRepository); } catch (InvalidVersionSpecificationException e) { Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java 2010-06-29 11:59:54 UTC (rev 148) @@ -29,12 +29,25 @@ import org.apache.maven.plugin.logging.Log; import org.apache.maven.reporting.MavenReportException; import org.codehaus.plexus.util.StringUtils; -import org.nuiton.jredmine.model.*; +import org.nuiton.jredmine.model.I18nAble; +import org.nuiton.jredmine.model.Issue; +import org.nuiton.jredmine.model.IssueCategory; +import org.nuiton.jredmine.model.IssuePriority; +import org.nuiton.jredmine.model.IssueStatus; +import org.nuiton.jredmine.model.Tracker; +import org.nuiton.jredmine.model.User; +import org.nuiton.jredmine.model.Version; import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.ResourceBundle; +import java.util.TreeMap; /** * Generates a Redmine report. @@ -44,17 +57,13 @@ */ public class IssueReportGenerator { - /** - * The token any of urls denoting the base URL for the issue management. - */ + /** The token any of urls denoting the base URL for the issue management. */ private static final String URL_TOKEN = "%URL%"; - /** - * The token in {@link #issueLinkTemplate} denoting the issue ID. - */ + + /** The token in {@link #issueLinkTemplate} denoting the issue ID. */ private static final String ISSUE_TOKEN = "%ISSUE%"; - /** - * The token in {@link #versionLinkTemplate} denoting the version ID. - */ + + /** The token in {@link #versionLinkTemplate} denoting the version ID. */ private static final String VERSION_TOKEN = "%VERSION%"; /** @@ -238,7 +247,9 @@ throw new UnsupportedOperationException(name() + "does not supports grouping"); } }; + private boolean canGroup; + private String i18nKey; private ReportColumn(boolean canGroup, String i18nKey) { @@ -272,17 +283,29 @@ } private ReportColumn[] columns; + private ReportColumn groupColumn; + private String url; + private String issueLinkTemplate; + private String versionLinkTemplate; + private Issue[] issues; + private Map<Integer, IssueCategory> issueCategories; + private Map<Integer, IssuePriority> issuePriorities; + private Map<Integer, Version> versions; + private Map<Integer, IssueStatus> issueStatuses; + private Map<Integer, User> users; + private Map<Integer, Tracker> trackers; + private DateFormat dateFormat; public IssueReportGenerator() { Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReport.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReport.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReport.java 2010-06-29 11:59:54 UTC (rev 148) @@ -44,6 +44,7 @@ * @since 1.0.0 */ protected int maxEntries; + /** * If you only want to show issues for the current version in the report. * The current version being used is <code>${project.version}</code> minus @@ -53,6 +54,7 @@ * @since 1.0.0 */ protected boolean onlyCurrentVersion; + /** * Sets some filters on issues to include. * the possible keys are : @@ -83,6 +85,7 @@ * @since 1.0.0 */ protected Map<String, String> filters; + /** * Sets the column names that you want to show in the report. The columns * will appear in the report in the same order as you specify them here. @@ -102,10 +105,10 @@ /** * A flag to skip the report. - * + * <p/> * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. - * + * * @parameter expression="${redmine.skipIssueReport}" default-value="false" * @since 1.0.0 */ @@ -123,6 +126,7 @@ /////////////////////////////////////////////////////////////////////////// /// IssueCollectionConfiguration /////////////////////////////////////////////////////////////////////////// + @Override public boolean isOnlyCurrentVersion() { return onlyCurrentVersion; @@ -136,6 +140,7 @@ /////////////////////////////////////////////////////////////////////////// /// AbstractIssuesReport /////////////////////////////////////////////////////////////////////////// + @Override protected String getColumnNames() { return columnNames; Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssignee.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssignee.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssignee.java 2010-06-29 11:59:54 UTC (rev 148) @@ -44,6 +44,7 @@ * @since 1.0.0 */ protected int maxEntriesByAssignee; + /** * If you only want to show issues for the current version in the report. * The current version being used is <code>${project.version}</code> minus @@ -53,6 +54,7 @@ * @since 1.0.0 */ protected boolean onlyCurrentVersionByAssignee; + /** * Sets some filters on issues to include. * the possible keys are : @@ -83,6 +85,7 @@ * @since 1.0.0 */ protected Map<String, String> filtersByAssignee; + /** * Sets the column names that you want to show in the report. The columns * will appear in the report in the same order as you specify them here. @@ -102,7 +105,7 @@ /** * A flag to skip the report. - * + * <p/> * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * @@ -123,6 +126,7 @@ /////////////////////////////////////////////////////////////////////////// /// IssueCollectionConfiguration /////////////////////////////////////////////////////////////////////////// + @Override public boolean isOnlyCurrentVersion() { return onlyCurrentVersionByAssignee; @@ -136,6 +140,7 @@ /////////////////////////////////////////////////////////////////////////// /// AbstractIssuesReport /////////////////////////////////////////////////////////////////////////// + @Override protected String getColumnNames() { return columnNamesByAssignee; Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategory.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategory.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategory.java 2010-06-29 11:59:54 UTC (rev 148) @@ -44,6 +44,7 @@ * @since 1.0.0 */ protected int maxEntriesByCategory; + /** * If you only want to show issues for the current version in the report. * The current version being used is <code>${project.version}</code> minus @@ -53,6 +54,7 @@ * @since 1.0.0 */ protected boolean onlyCurrentVersionByCategory; + /** * Sets some filters on issues to include. * the possible keys are : @@ -83,6 +85,7 @@ * @since 1.0.0 */ protected Map<String, String> filtersByCategory; + /** * Sets the column names that you want to show in the report. The columns * will appear in the report in the same order as you specify them here. @@ -102,7 +105,7 @@ /** * A flag to skip the report. - * + * <p/> * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * @@ -123,6 +126,7 @@ /////////////////////////////////////////////////////////////////////////// /// IssueCollectionConfiguration /////////////////////////////////////////////////////////////////////////// + @Override public boolean isOnlyCurrentVersion() { return onlyCurrentVersionByCategory; @@ -136,6 +140,7 @@ /////////////////////////////////////////////////////////////////////////// /// AbstractIssuesReport /////////////////////////////////////////////////////////////////////////// + @Override protected String getColumnNames() { return columnNamesByCategory; Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriority.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriority.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriority.java 2010-06-29 11:59:54 UTC (rev 148) @@ -44,6 +44,7 @@ * @since 1.0.0 */ protected int maxEntriesByPriority; + /** * If you only want to show issues for the current version in the report. * The current version being used is <code>${project.version}</code> minus @@ -53,6 +54,7 @@ * @since 1.0.0 */ protected boolean onlyCurrentVersionByPriority; + /** * Sets some filters on issues to include. * the possible keys are : @@ -83,6 +85,7 @@ * @since 1.0.0 */ protected Map<String, String> filtersByPriority; + /** * Sets the column names that you want to show in the report. The columns * will appear in the report in the same order as you specify them here. @@ -102,7 +105,7 @@ /** * A flag to skip the report. - * + * <p/> * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * @@ -123,6 +126,7 @@ /////////////////////////////////////////////////////////////////////////// /// IssueCollectionConfiguration /////////////////////////////////////////////////////////////////////////// + @Override public boolean isOnlyCurrentVersion() { return onlyCurrentVersionByPriority; @@ -136,6 +140,7 @@ /////////////////////////////////////////////////////////////////////////// /// AbstractIssuesReport /////////////////////////////////////////////////////////////////////////// + @Override protected String getColumnNames() { return columnNamesByPriority; Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporter.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporter.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporter.java 2010-06-29 11:59:54 UTC (rev 148) @@ -44,6 +44,7 @@ * @since 1.0.0 */ protected int maxEntriesByReporter; + /** * If you only want to show issues for the current version in the report. * The current version being used is <code>${project.version}</code> minus @@ -53,6 +54,7 @@ * @since 1.0.0 */ protected boolean onlyCurrentVersionByReporter; + /** * Sets some filters on issues to include. * the possible keys are : @@ -83,6 +85,7 @@ * @since 1.0.0 */ protected Map<String, String> filtersByReporter; + /** * Sets the column names that you want to show in the report. The columns * will appear in the report in the same order as you specify them here. @@ -102,7 +105,7 @@ /** * A flag to skip the report. - * + * <p/> * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * @@ -115,7 +118,7 @@ protected boolean skipReport() { return skipIssueReportByReporter; } - + public IssuesReportByReporter() { super("reporter"); } @@ -123,6 +126,7 @@ /////////////////////////////////////////////////////////////////////////// /// IssueCollectionConfiguration /////////////////////////////////////////////////////////////////////////// + @Override public boolean isOnlyCurrentVersion() { return onlyCurrentVersionByReporter; @@ -136,6 +140,7 @@ /////////////////////////////////////////////////////////////////////////// /// AbstractIssuesReport /////////////////////////////////////////////////////////////////////////// + @Override protected String getColumnNames() { return columnNamesByReporter; Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatus.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatus.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatus.java 2010-06-29 11:59:54 UTC (rev 148) @@ -44,6 +44,7 @@ * @since 1.0.0 */ protected int maxEntriesByStatus; + /** * If you only want to show issues for the current version in the report. * The current version being used is <code>${project.version}</code> minus @@ -53,6 +54,7 @@ * @since 1.0.0 */ protected boolean onlyCurrentVersionByStatus; + /** * Sets some filters on issues to include. * the possible keys are : @@ -83,6 +85,7 @@ * @since 1.0.0 */ protected Map<String, String> filtersByStatus; + /** * Sets the column names that you want to show in the report. The columns * will appear in the report in the same order as you specify them here. @@ -99,9 +102,10 @@ * @since 2.0 */ protected String columnNamesByStatus; + /** * A flag to skip the report. - * + * <p/> * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * @@ -114,7 +118,7 @@ protected boolean skipReport() { return skipIssueReportByStatus; } - + public IssuesReportByStatus() { super("status"); } @@ -122,6 +126,7 @@ /////////////////////////////////////////////////////////////////////////// /// IssueCollectionConfiguration /////////////////////////////////////////////////////////////////////////// + @Override public boolean isOnlyCurrentVersion() { return onlyCurrentVersionByStatus; @@ -135,6 +140,7 @@ /////////////////////////////////////////////////////////////////////////// /// AbstractIssuesReport /////////////////////////////////////////////////////////////////////////// + @Override protected String getColumnNames() { return columnNamesByStatus; Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByTracker.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByTracker.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByTracker.java 2010-06-29 11:59:54 UTC (rev 148) @@ -44,6 +44,7 @@ * @since 1.0.0 */ protected int maxEntriesByTracker; + /** * If you only want to show issues for the current version in the report. * The current version being used is <code>${project.version}</code> minus @@ -53,6 +54,7 @@ * @since 1.0.0 */ protected boolean onlyCurrentVersionByTracker; + /** * Sets some filters on issues to include. * the possible keys are : @@ -83,6 +85,7 @@ * @since 1.0.0 */ protected Map<String, String> filtersByTracker; + /** * Sets the column names that you want to show in the report. The columns * will appear in the report in the same order as you specify them here. @@ -102,7 +105,7 @@ /** * A flag to skip the report. - * + * <p/> * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * @@ -115,7 +118,7 @@ protected boolean skipReport() { return skipIssueReportByTracker; } - + public IssuesReportByTracker() { super("tracker"); } @@ -123,6 +126,7 @@ /////////////////////////////////////////////////////////////////////////// /// IssueCollectionConfiguration /////////////////////////////////////////////////////////////////////////// + @Override public boolean isOnlyCurrentVersion() { return onlyCurrentVersionByTracker; @@ -136,6 +140,7 @@ /////////////////////////////////////////////////////////////////////////// /// AbstractIssuesReport /////////////////////////////////////////////////////////////////////////// + @Override protected String getColumnNames() { return columnNamesByTracker; Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersion.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersion.java 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersion.java 2010-06-29 11:59:54 UTC (rev 148) @@ -44,6 +44,7 @@ * @since 1.0.0 */ protected int maxEntriesByVersion; + /** * If you only want to show issues for the current version in the report. * The current version being used is <code>${project.version}</code> minus @@ -53,6 +54,7 @@ * @since 1.0.0 */ protected boolean onlyCurrentVersionByVersion; + /** * Sets some filters on issues to include. * the possible keys are : @@ -83,6 +85,7 @@ * @since 1.0.0 */ protected Map<String, String> filtersByVersion; + /** * Sets the column names that you want to show in the report. The columns * will appear in the report in the same order as you specify them here. @@ -102,7 +105,7 @@ /** * A flag to skip the report. - * + * <p/> * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * @@ -115,7 +118,7 @@ protected boolean skipReport() { return skipIssueReportByVersion; } - + public IssuesReportByVersion() { super("version"); } @@ -123,6 +126,7 @@ /////////////////////////////////////////////////////////////////////////// /// IssueCollectionConfiguration /////////////////////////////////////////////////////////////////////////// + @Override public boolean isOnlyCurrentVersion() { return onlyCurrentVersionByVersion; @@ -136,6 +140,7 @@ /////////////////////////////////////////////////////////////////////////// /// AbstractIssuesReport /////////////////////////////////////////////////////////////////////////// + @Override protected String getColumnNames() { return columnNamesByVersion; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-27 06:58:56 UTC (rev 147) +++ trunk/pom.xml 2010-06-29 11:59:54 UTC (rev 148) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.1</version> + <version>2.2.2-SNAPSHOT</version> </parent> <artifactId>jredmine</artifactId>