- Jredmine-commits - mailman.cloud.codelutin.com

r113 - trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-24 14:44:13 +0100 (Sun, 24 Jan 2010) New Revision: 113 Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/News.java Log: improve news name Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/News.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/News.java 2010-01-24 13:42:46 UTC (rev 112) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/News.java 2010-01-24 13:44:13 UTC (rev 113) @@ -45,7 +45,7 @@ @Override public String getName() { - return getTitle(); + return getTitle() + " at " + getCreatedOn(); } public int getAuthorId() {

1 0

r112 - trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-24 14:42:46 +0100 (Sun, 24 Jan 2010) New Revision: 112 Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java Log: Evolution #265: Am?\195?\169lioration du goal display-data 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-01-24 13:40:58 UTC (rev 111) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2010-01-24 13:42:46 UTC (rev 112) @@ -22,13 +22,12 @@ import org.apache.maven.plugin.MojoFailureException; import org.nuiton.jredmine.RedmineServiceImplementor; -import org.nuiton.jredmine.model.I18nAble; -import org.nuiton.jredmine.model.IdAble; -import org.nuiton.jredmine.model.RedmineModelEnum; -import org.nuiton.jredmine.model.RedmineModelScope; +import org.nuiton.jredmine.model.*; +import org.nuiton.plugin.PluginHelper; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -61,12 +60,20 @@ */ 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; + /** * The redmine's server login. * * Note: This parameter is not used, but override the required parameter of the abstract mojo. * * @parameter expression="${redmine.username}" - * @since 1.0.0 + * @since 1.1.3 */ protected String username; /** @@ -75,7 +82,7 @@ * Note: This parameter is not used, but override the required parameter of the abstract mojo. * * @parameter expression="${redmine.password}" - * @since 1.0.0 + * @since 1.1.3 */ protected String password; /** @@ -106,34 +113,37 @@ @Override protected void init() throws Exception { - super.init(); - if (!safe && !initOk) { - // we are in none safe mode but init is not ok... - return; + if (versionId != null) { + // always remove snapshot (TODO-TC20100124 perharps should it be a flag ?) + versionId = PluginHelper.removeSnapshotSuffix(versionId); } + actions = getDownloadActions(types, 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; + } + super.init(); } @Override protected boolean checkSkip() { - boolean b = super.checkSkip(); - if (!b) { - return false; - } if (actions == null || actions.isEmpty()) { // no data to treate getLog().warn("no data types detected, you must fill the required parameter dataTypes, will skip goal"); return false; } - return true; + boolean b = super.checkSkip(); + return b; } @Override @@ -145,14 +155,21 @@ RedmineModelScope scope = entry.getScope(); String requestName = entry.getRequestAll(); - Object[] datas = ((RedmineServiceImplementor) service).getDatas(requestName, entry.getModelType(), projectId, versionId); + 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); + } buffer.append("\nValues of '").append(entry).append('\''); if (scope == RedmineModelScope.project || scope == RedmineModelScope.version) { - buffer.append(" for project ").append(projectId); + buffer.append(" for project '").append(projectId).append("'"); } + if (scope == RedmineModelScope.version) { + buffer.append(" and version '").append(versionId).append("'"); + } buffer.append('\n'); - for (Object data : datas) { - buffer.append(" - ").append(((IdAble) data).getId()).append(" = ").append(((I18nAble) data).getName()).append('\n'); + for (IdAble data : list) { + buffer.append(" - ").append(data.getId()).append(" = ").append(((I18nAble) data).getName()).append('\n'); } } System.out.println(buffer.toString()); @@ -190,7 +207,7 @@ if (!universeList.isEmpty() && !universeList.contains(result)) { // can not accept these value - getLog().warn("the type " + result + " is not authorized, universe : " + universeList); + getLog().warn("the type " + result + " is not authorized, Accepted types are : " + universeList); continue; } results.add(result);

1 0

r111 - trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-24 14:40:58 +0100 (Sun, 24 Jan 2010) New Revision: 111 Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/ModelHelper.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/News.java Log: update IdAble comparator + make I18nAble Issue and News Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java 2010-01-24 13:01:50 UTC (rev 110) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java 2010-01-24 13:40:58 UTC (rev 111) @@ -28,7 +28,7 @@ * @author chemit * @since 1.0.0 */ -public class Issue implements IdAble { +public class Issue implements IdAble, I18nAble { protected int assignedToId; protected int authorId; @@ -49,6 +49,16 @@ protected String description; protected String subject; + @Override + public int getId() { + return id; + } + + @Override + public String getName() { + return getSubject(); + } + public int getAssignedToId() { return assignedToId; } @@ -85,11 +95,6 @@ return fixedVersionId; } - @Override - public int getId() { - return id; - } - public int getLockVersion() { return lockVersion; } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/ModelHelper.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/ModelHelper.java 2010-01-24 13:01:50 UTC (rev 110) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/ModelHelper.java 2010-01-24 13:40:58 UTC (rev 111) @@ -23,6 +23,7 @@ import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Arrays; +import java.util.Comparator; import java.util.List; /** @@ -91,4 +92,12 @@ } return filter.toArray((T[]) Array.newInstance(type, filter.size())); } + + public static final Comparator<IdAble> ID_ABLE_COMPARATOR = new Comparator<IdAble>(){ + + @Override + public int compare(IdAble o1, IdAble o2) { + return o1.getId()-o2.getId(); + } + } ; } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/News.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/News.java 2010-01-24 13:01:50 UTC (rev 110) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/News.java 2010-01-24 13:40:58 UTC (rev 111) @@ -27,7 +27,7 @@ * @author chemit * @since 1.0.0 */ -public class News implements IdAble { +public class News implements IdAble, I18nAble { protected int id; protected int projectId; @@ -43,6 +43,11 @@ return id; } + @Override + public String getName() { + return getTitle(); + } + public int getAuthorId() { return authorId; } @@ -102,4 +107,5 @@ public void setTitle(String title) { this.title = title; } + }

1 0

r110 - trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-24 14:01:50 +0100 (Sun, 24 Jan 2010) New Revision: 110 Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java Log: simplify display-data goal parameters 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-01-24 12:45:40 UTC (rev 109) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2010-01-24 13:01:50 UTC (rev 110) @@ -55,7 +55,7 @@ * * Note : you can specifiy several types separated by comma * - * @parameter expression="${redmine.types}" + * @parameter expression="${types}" * @required * @since 1.0.0 */

1 0

r109 - in trunk: . maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-24 13:45:40 +0100 (Sun, 24 Jan 2010) New Revision: 109 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/pom.xml Log: update pom 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-01-24 11:43:30 UTC (rev 108) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2010-01-24 12:45:40 UTC (rev 109) @@ -144,6 +144,10 @@ */ private final boolean requireUser; /** + * flag to knwon if anonymùous service is required + */ + private final boolean anonymous; + /** * the project loaded in init if {@link #requireProject} flag is on */ protected Project releaseProject; @@ -167,21 +171,22 @@ * flag to mark if a runOnce goal was done */ protected boolean runOnceDone; + /** * flag to mark if service was sucessfull init */ protected boolean serviceInit; - protected boolean initOk = true; - private boolean anonymous; public AbstractRedmineMojo(boolean requireProject, boolean requireVersion, boolean requireUser) { - super(); + this(false,requireProject,requireVersion,requireUser); + } + + public AbstractRedmineMojo(boolean anonymous, boolean requireProject, boolean requireVersion, boolean requireUser) { + this.anonymous = anonymous; this.requireProject = requireProject; this.requireVersion = requireVersion; this.requireUser = requireUser; - // by default, requires to be loggued - this.anonymous = false; } /////////////////////////////////////////////////////////////////////////// @@ -221,9 +226,14 @@ setRestUrl(url); if (verbose) { - getLog().info("Redmine configuration :\n>> host : " + - getRestUrl() + "\n>> username : " + - getRestUsername()); + if (isAnonymous()) { + getLog().info("Redmine anonymous configuration :\n>> host : " + + getRestUrl()); + } else { + getLog().info("Redmine configuration :\n>> host : " + + getRestUrl() + "\n>> username : " + + getRestUsername()); + } } // init Redmine service @@ -233,14 +243,12 @@ ((RedmineServiceImplementor) service).init(this); serviceInit = true; } catch (Exception e) { - if (safe) { + if (isSafe()) { throw e; } serviceInit = false; initOk = false; -// if (verbose) { getLog().error("could not init Redmine service [" + getRestUrl() + "] with user '" + getRestUsername() + "'", e); -// } } // check project exists @@ -248,7 +256,7 @@ if (requireProject) { boolean r = initReleaseProject(); if (!r) { - if (safe) { + if (isSafe()) { throw new MojoExecutionException("the project '" + projectId + "' could not be retrieve from redmine server."); } initOk = false; @@ -261,7 +269,7 @@ if (requireUser) { boolean r = initReleaseUser(); if (!r) { - if (safe) { + if (isSafe()) { throw new MojoExecutionException("the user '" + this.username + "' could not be retrieve from redmine server."); } initOk = false; @@ -274,7 +282,7 @@ if (requireVersion) { boolean r = initReleaseVersion(); if (!r) { - if (safe) { + if (isSafe()) { throw new MojoExecutionException("the version '" + versionId + "' could not be retrieve from redmine server."); } initOk = false; @@ -322,82 +330,6 @@ closeService(); } -// @Override -// public final void execute() throws MojoExecutionException, MojoFailureException { -// -// boolean canContinue = checkPackaging(); -// -// if (!canContinue) { -// getLog().warn("The goal is skip due to packaging '" + getProject().getPackaging() + "'"); -// return; -// } -// -// if (isGoalSkip()) { -// getLog().warn("The goal is skip due to skipGoal flag on"); -// return; -// } -// -// Exception error = null; -// try { -// -// try { -// -// canContinue = init(); -// -// } catch (Exception e) { -// error = e; -// -// // none safe execution, just warn and not failed the build -// canContinue = false; -// } -// -// if (!canContinue) { -// -// -// if (isSafe()) { -// String message; -// if (error != null) { -// message = "safe mode is on and could not init goal [" + getClass().getSimpleName() + "] for reason " + error.getMessage(); -// } else { -// message = "safe mode is on and could not init goal [" + getClass().getSimpleName() + "]"; -// } -// if (isVerbose()) { -// if (error != null) { -// getLog().error(message, error); -// } else { -// getLog().error(message); -// } -// } -// -// if (error != null) { -// if (error instanceof MojoExecutionException) { -// throw (MojoExecutionException) error; -// } -// throw new MojoExecutionException(message, error); -// } -// throw new MojoExecutionException(message); -// } -// -// getLog().warn(skipAfterInitMessage); -// return; -// } -// -// try { -// -// doAction(); -// -// } catch (MojoExecutionException e) { -// throw e; -// } catch (Exception e) { -// throw new MojoExecutionException("could not execute goal " + getClass().getSimpleName() + " for reason : " + e.getMessage(), e); -// } -// -// } finally { -// // always close service (it will release connections to redmine) -// closeService(); -// } -// } - /** * Re-expose the protected method for test purposes... * @@ -486,7 +418,7 @@ @Override public void setAnonymous(boolean anonymous) { - this.anonymous = true; + //this is a final state, can not modify it after init } /////////////////////////////////////////////////////////////////////////// @@ -508,10 +440,7 @@ this.releaseProject = p; return true; } catch (RedmineServiceException e) { -// getLog().warn("could not retreave project '" + projectId + "', goal is skip"); - if (verbose) { - getLog().error(e); - } + getLog().warn("could not retreave project '" + projectId + "', for reason "+e.getMessage(),e); return false; } } @@ -534,10 +463,7 @@ this.releaseVersion = v; return true; } catch (RedmineServiceException e) { -// getLog().warn("could not retreave version " + versionId + ", goal is skip"); - if (verbose) { - getLog().error(e); - } + getLog().warn("could not retreave version '" + versionId + "', for reason "+e.getMessage(),e); return false; } } @@ -557,10 +483,7 @@ this.releaseUser = user; return true; } catch (RedmineServiceException e) { -// getLog().warn("could not retreave user '" + username + "', goal is skip"); - if (verbose) { - getLog().error(e); - } + getLog().warn("could not retreave user '" + username + "', for reason "+e.getMessage(),e); return false; } } 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-01-24 11:43:30 UTC (rev 108) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2010-01-24 12:45:40 UTC (rev 109) @@ -84,9 +84,8 @@ protected List<RedmineModelEnum> actions; public DisplayDataMojo() { - super(false, false, false); // no need to be loggued to obtain informations from redmine - setAnonymous(true); + super(true,false, false, false); } @Override @@ -167,10 +166,6 @@ for (String dataType : dataTypes.split(",")) { -// if (dataType.endsWith("s")) { -// dataType = dataType.substring(0, dataType.length() - 1); -// } - RedmineModelEnum result; try { result = RedmineModelEnum.valueOf(dataType.trim()); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-24 11:43:30 UTC (rev 108) +++ trunk/pom.xml 2010-01-24 12:45:40 UTC (rev 109) @@ -501,7 +501,7 @@ </properties> </profile> -  +  <profile> <id>release-sign-artifacts</id> <activation> @@ -541,9 +541,6 @@ <goals> <goal>sign</goal> </goals> - <configuration> - <keyname></keyname> - </configuration> </execution> </executions> </plugin>

1 0

r108 - trunk
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-24 12:43:30 +0100 (Sun, 24 Jan 2010) New Revision: 108 Modified: trunk/pom.xml Log: add signing profile (wille be removed with mavenpom4redmine >= 2.0.3) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-23 20:17:17 UTC (rev 107) +++ trunk/pom.xml 2010-01-24 11:43:30 UTC (rev 108) @@ -501,6 +501,56 @@ </properties> </profile> +  + <profile> + <id>release-sign-artifacts</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-pgp-passphrase</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>verify</phase> + <configuration> + <serverId>gpg-signer</serverId> + <usernameOut>gpg.keyname</usernameOut> + <passwordOut>gpg.passphrase</passwordOut> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <version>1.0-alpha-4</version> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + <configuration> + <keyname></keyname> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>

1 0

r107 - in trunk/maven-jredmine-plugin: . src/it src/it/report src/it/skip-report src/main/java/org/nuiton/jredmine/plugin/report
by tchemit＠users.nuiton.org 23 Jan '10

23 Jan '10

Author: tchemit Date: 2010-01-23 21:17:17 +0100 (Sat, 23 Jan 2010) New Revision: 107 Added: trunk/maven-jredmine-plugin/src/it/skip-report/ trunk/maven-jredmine-plugin/src/it/skip-report/invoker.properties trunk/maven-jredmine-plugin/src/it/skip-report/pom.xml trunk/maven-jredmine-plugin/src/it/skip-report/verify.groovy Modified: trunk/maven-jredmine-plugin/pom.xml trunk/maven-jredmine-plugin/src/it/report/pom.xml trunk/maven-jredmine-plugin/src/it/report/verify.groovy 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/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 Log: Evolution #263: Can skip reports Modified: trunk/maven-jredmine-plugin/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/pom.xml 2010-01-23 20:12:07 UTC (rev 106) +++ trunk/maven-jredmine-plugin/pom.xml 2010-01-23 20:17:17 UTC (rev 107) @@ -166,14 +166,13 @@ <pomInclude>single_failed/pom.xml</pomInclude> <pomInclude>single/pom.xml</pomInclude> <pomInclude>multi/pom.xml</pomInclude> + <pomInclude>skip-report/pom.xml</pomInclude> <pomInclude>report/pom.xml</pomInclude> </pomIncludes> <postBuildHookScript>verify</postBuildHookScript> - <localRepositoryPath>${basedir}/target/local-repo - </localRepositoryPath> + <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath> <settingsFile>src/it/settings.xml</settingsFile> - <cloneProjectsTo>${project.build.directory}/its - </cloneProjectsTo> + <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> </configuration> <executions> <execution> Modified: trunk/maven-jredmine-plugin/src/it/report/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/src/it/report/pom.xml 2010-01-23 20:12:07 UTC (rev 106) +++ trunk/maven-jredmine-plugin/src/it/report/pom.xml 2010-01-23 20:17:17 UTC (rev 107) @@ -96,10 +96,12 @@ <reportSet> <reports> <report>issues-report</report> - <report>issues-report-by-tracker</report> - <report>issues-report-by-status</report> + <report>issues-report-by-assignee</report> <report>issues-report-by-category</report> <report>issues-report-by-priority</report> + <report>issues-report-by-reporter</report> + <report>issues-report-by-status</report> + <report>issues-report-by-tracker</report> <report>issues-report-by-version</report> </reports> </reportSet> Modified: trunk/maven-jredmine-plugin/src/it/report/verify.groovy =================================================================== --- trunk/maven-jredmine-plugin/src/it/report/verify.groovy 2010-01-23 20:12:07 UTC (rev 106) +++ trunk/maven-jredmine-plugin/src/it/report/verify.groovy 2010-01-23 20:17:17 UTC (rev 107) @@ -18,15 +18,12 @@ * under the License. */ assert new File(basedir, 'target/site/redmine-report.html').exists(); + assert new File(basedir, 'target/site/redmine-report-by-assignee.html').exists(); assert new File(basedir, 'target/site/redmine-report-by-category.html').exists(); assert new File(basedir, 'target/site/redmine-report-by-priority.html').exists(); + assert new File(basedir, 'target/site/redmine-report-by-reporter.html').exists(); assert new File(basedir, 'target/site/redmine-report-by-status.html').exists(); assert new File(basedir, 'target/site/redmine-report-by-tracker.html').exists(); assert new File(basedir, 'target/site/redmine-report-by-version.html').exists(); - assert new File(basedir, 'target/site/redmine-report.html').exists(); -//content = new File(basedir, 'target/announcement/announcement.vm').text; - -//assert content.contains( 'Test report.' ); - return true; Copied: trunk/maven-jredmine-plugin/src/it/skip-report/invoker.properties (from rev 103, trunk/maven-jredmine-plugin/src/it/report/invoker.properties) =================================================================== --- trunk/maven-jredmine-plugin/src/it/skip-report/invoker.properties (rev 0) +++ trunk/maven-jredmine-plugin/src/it/skip-report/invoker.properties 2010-01-23 20:17:17 UTC (rev 107) @@ -0,0 +1,21 @@ +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=clean initialize site + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +#invoker.profiles=its,jdk15 + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-at-end + +# The expected result of the build, possible values are "success" (default) and "failure" +#invoker.buildResult=success + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Copied: trunk/maven-jredmine-plugin/src/it/skip-report/pom.xml (from rev 103, trunk/maven-jredmine-plugin/src/it/report/pom.xml) =================================================================== --- trunk/maven-jredmine-plugin/src/it/skip-report/pom.xml (rev 0) +++ trunk/maven-jredmine-plugin/src/it/skip-report/pom.xml 2010-01-23 20:17:17 UTC (rev 107) @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.nuiton.jredmine</groupId> + <artifactId>test-report</artifactId> + <version>0</version> + + <name>JRedmine report</name> + <packaging>pom</packaging> + <description>Test JRedmine plugin reports</description> + + <url>http://www.foo.com</url> + + <issueManagement> + <system>redmine</system> + <url>http://www.mynuiton.org/projects/one/issues</url> + </issueManagement> + + <properties> + + <pluginVersion>@pom.version@</pluginVersion> + + <redmine.serverId>redmine-local</redmine.serverId> + <redmine.projectId>one</redmine.projectId> + <redmine.versionId>1.0.0</redmine.versionId> + +  + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + +  + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>1.0.3</version> + <executions> + <execution> + <id>get-redmine-login</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>initialize</phase> + <configuration> + <serverId>${redmine.serverId}</serverId> + <passwordOut>redmine.password</passwordOut> + <usernameOut>redmine.username</usernameOut> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <reporting> + <plugins> + + <plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>maven-jredmine-plugin</artifactId> + <version>${pluginVersion}</version> + <configuration> + <serverId>redmine-local</serverId> + <projectId>one</projectId> + <versionId>1.0.0</versionId> + <issueLinkTemplate>http://www.mynuiton.org/issues/show/%ISSUE%</issueLinkTemplate> + <versionLinkTemplate>http://www.mynuiton.org/versions/show/%VERSION%</versionLinkTemplate> + <columnNames>key,summary,status,assignee,reporter,tracker,priority,version,category,createdOn</columnNames> + <skipIssueReport>true</skipIssueReport> + <skipIssueReportByAssignee>true</skipIssueReportByAssignee> + <skipIssueReportByCategory>true</skipIssueReportByCategory> + <skipIssueReportByPriority>true</skipIssueReportByPriority> + <skipIssueReportByReporter>true</skipIssueReportByReporter> + <skipIssueReportByStatus>true</skipIssueReportByStatus> + <skipIssueReportByTracker>true</skipIssueReportByTracker> + <skipIssueReportByVersion>true</skipIssueReportByVersion> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>issues-report</report> + <report>issues-report-by-assignee</report> + <report>issues-report-by-category</report> + <report>issues-report-by-priority</report> + <report>issues-report-by-reporter</report> + <report>issues-report-by-status</report> + <report>issues-report-by-tracker</report> + <report>issues-report-by-version</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + </plugins> + </reporting> + +</project> Copied: trunk/maven-jredmine-plugin/src/it/skip-report/verify.groovy (from rev 103, trunk/maven-jredmine-plugin/src/it/report/verify.groovy) =================================================================== --- trunk/maven-jredmine-plugin/src/it/skip-report/verify.groovy (rev 0) +++ trunk/maven-jredmine-plugin/src/it/skip-report/verify.groovy 2010-01-23 20:17:17 UTC (rev 107) @@ -0,0 +1,29 @@ + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + assert !new File(basedir, 'target/site/redmine-report.html').exists(); + assert !new File(basedir, 'target/site/redmine-report-by-assignee.html').exists(); + assert !new File(basedir, 'target/site/redmine-report-by-category.html').exists(); + assert !new File(basedir, 'target/site/redmine-report-by-priority.html').exists(); + assert !new File(basedir, 'target/site/redmine-report-by-reporter.html').exists(); + assert !new File(basedir, 'target/site/redmine-report-by-status.html').exists(); + assert !new File(basedir, 'target/site/redmine-report-by-tracker.html').exists(); + assert !new File(basedir, 'target/site/redmine-report-by-version.html').exists(); + +return true; 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-01-23 20:12:07 UTC (rev 106) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2010-01-23 20:17:17 UTC (rev 107) @@ -127,6 +127,8 @@ issues = collector.getIssues(); + // store it in cache + issuesCache.put(this, issues); } catch (RedmineServiceException ex) { 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-01-23 20:12:07 UTC (rev 106) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2010-01-23 20:17:17 UTC (rev 107) @@ -130,6 +130,11 @@ protected abstract void executeReport(Locale locale) throws MavenReportException; + /** + * @return {@code true} if report should be skip + */ + protected abstract boolean skipReport(); + public AbstractRedmineReport(boolean requireProject, boolean requireVersion, boolean requireUser) { super(requireProject, requireVersion, requireUser); } @@ -187,6 +192,10 @@ if (getLog().isDebugEnabled()) { getLog().debug("check can use report"); } + if (skipReport()) { + getLog().info("User ask to skip report \"" + getName(Locale.ENGLISH) + "\"."); + return false; + } if (session.getSettings().isOffline()) { // skip when offline getLog().info("Skipped \"" + getName(Locale.ENGLISH) + "\" report in offline mode."); 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-01-23 20:12:07 UTC (rev 106) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReport.java 2010-01-23 20:17:17 UTC (rev 107) @@ -96,6 +96,22 @@ */ protected String columnNames; + /** + * A flag to skip the report. + * + * 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 + */ + protected boolean skipIssueReport; + + @Override + protected boolean skipReport() { + return skipIssueReport; + } + public IssuesReport() { super(null); } 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-01-23 20:12:07 UTC (rev 106) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssignee.java 2010-01-23 20:17:17 UTC (rev 107) @@ -96,6 +96,22 @@ */ protected String columnNamesByAssignee; + /** + * A flag to skip the report. + * + * This can be usefull since there is no way to skip a report from an + * inherited reportSet configuration. + * + * @parameter expression="${redmine.skipIssueReportByAssignee}" default-value="false" + * @since 1.0.0 + */ + protected boolean skipIssueReportByAssignee; + + @Override + protected boolean skipReport() { + return skipIssueReportByAssignee; + } + public IssuesReportByAssignee() { super("assignee"); } 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-01-23 20:12:07 UTC (rev 106) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategory.java 2010-01-23 20:17:17 UTC (rev 107) @@ -96,6 +96,22 @@ */ protected String columnNamesByCategory; + /** + * A flag to skip the report. + * + * This can be usefull since there is no way to skip a report from an + * inherited reportSet configuration. + * + * @parameter expression="${redmine.skipIssueReportByCategory}" default-value="false" + * @since 1.0.0 + */ + protected boolean skipIssueReportByCategory; + + @Override + protected boolean skipReport() { + return skipIssueReportByCategory; + } + public IssuesReportByCategory() { super("category"); } 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-01-23 20:12:07 UTC (rev 106) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriority.java 2010-01-23 20:17:17 UTC (rev 107) @@ -96,6 +96,22 @@ */ protected String columnNamesByPriority; + /** + * A flag to skip the report. + * + * This can be usefull since there is no way to skip a report from an + * inherited reportSet configuration. + * + * @parameter expression="${redmine.skipIssueReportByPriority}" default-value="false" + * @since 1.0.0 + */ + protected boolean skipIssueReport; + + @Override + protected boolean skipReport() { + return skipIssueReport; + } + public IssuesReportByPriority() { super("priority"); } 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-01-23 20:12:07 UTC (rev 106) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporter.java 2010-01-23 20:17:17 UTC (rev 107) @@ -96,6 +96,22 @@ */ protected String columnNamesByReporter; + /** + * A flag to skip the report. + * + * This can be usefull since there is no way to skip a report from an + * inherited reportSet configuration. + * + * @parameter expression="${redmine.skipIssueReportByReporter}" default-value="false" + * @since 1.0.0 + */ + protected boolean skipIssueReportByReporter; + + @Override + protected boolean skipReport() { + return skipIssueReportByReporter; + } + public IssuesReportByReporter() { super("reporter"); } 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-01-23 20:12:07 UTC (rev 106) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatus.java 2010-01-23 20:17:17 UTC (rev 107) @@ -96,32 +96,21 @@ */ protected String columnNamesByStatus; /** - * 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. - * - * There are 2 template tokens you can use. <code>%URL%</code>: this is computed by getting the - * <code><issueManagement>/<url></code> value from the POM, and removing the last '/' - * and everything that comes after it. <code>%ISSUE%</code>: this is the issue number. - * + * A flag to skip the report. * - * @parameter expression="${redmine.issueLinkTemplate}" - * @since 1.0.0 - */ - protected String issueLinkTemplateByStatus; - /** - * 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. - * - * There are 2 template tokens you can use. <code>%URL%</code>: this is computed by getting the - * <code><issueManagement>/<url></code> value from the POM, and removing the last '/' - * and everything that comes after it. <code>%VERSION%</code>: this is the issue number. - * + * This can be usefull since there is no way to skip a report from an + * inherited reportSet configuration. * - * @parameter expression="${redmine.versionLinkTemplate}" + * @parameter expression="${redmine.skipIssueReportByStatus}" default-value="false" * @since 1.0.0 */ - protected String versionLinkTemplateByStatus; + protected boolean skipIssueReportByStatus; + @Override + protected boolean skipReport() { + return skipIssueReportByStatus; + } + public IssuesReportByStatus() { super("status"); } 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-01-23 20:12:07 UTC (rev 106) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByTracker.java 2010-01-23 20:17:17 UTC (rev 107) @@ -96,6 +96,22 @@ */ protected String columnNamesByTracker; + /** + * A flag to skip the report. + * + * This can be usefull since there is no way to skip a report from an + * inherited reportSet configuration. + * + * @parameter expression="${redmine.skipIssueReportByTracker}" default-value="false" + * @since 1.0.0 + */ + protected boolean skipIssueReportByTracker; + + @Override + protected boolean skipReport() { + return skipIssueReportByTracker; + } + public IssuesReportByTracker() { super("tracker"); } 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-01-23 20:12:07 UTC (rev 106) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersion.java 2010-01-23 20:17:17 UTC (rev 107) @@ -96,6 +96,22 @@ */ protected String columnNamesByVersion; + /** + * A flag to skip the report. + * + * This can be usefull since there is no way to skip a report from an + * inherited reportSet configuration. + * + * @parameter expression="${redmine.skipIssueReportByVersion}" default-value="false" + * @since 1.0.0 + */ + protected boolean skipIssueReportByVersion; + + @Override + protected boolean skipReport() { + return skipIssueReportByVersion; + } + public IssuesReportByVersion() { super("version"); }

1 0

r106 - trunk
by tchemit＠users.nuiton.org 23 Jan '10

23 Jan '10

Author: tchemit Date: 2010-01-23 21:12:07 +0100 (Sat, 23 Jan 2010) New Revision: 106 Modified: trunk/pom.xml Log: finish clean pom Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-23 17:23:27 UTC (rev 105) +++ trunk/pom.xml 2010-01-23 20:12:07 UTC (rev 106) @@ -240,20 +240,8 @@ <artifactId>velocity</artifactId> <version>1.6.3</version> </dependency> -  -  - - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.14</version> @@ -437,7 +425,6 @@ </activation> <properties> <redmine.safe>true</redmine.safe> -  </properties> <reporting> @@ -451,14 +438,12 @@ we do not propagate maven-jredmine-plugin to child modules --> <inherited>false</inherited> <configuration> - <columnNames> - key,summary,status,assignee,tracker,priority,version,category,createdOn - </columnNames> + <skipIssueReport>true</skipIssueReport> </configuration> <reportSets> <reportSet> <reports> - <report>issues-report</report> + <report>issues-report-by-category</report> </reports> </reportSet> </reportSets> @@ -470,73 +455,11 @@ <plugins> -  - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> -  - <execution> - <id>collect-build-artifacts</id> - <goals> - <goal>collect-files</goal> - </goals> - <phase>install</phase> - <configuration> - <descriptionFile>${redmine.collectedArtifacts}</descriptionFile> - <includeAttached>true</includeAttached> - <includeSiteAttached>true</includeSiteAttached> - </configuration> - </execution> -  - </executions> - </plugin> -  <plugin> <groupId>org.nuiton.jredmine</groupId> <artifactId>maven-jredmine-plugin</artifactId> <inherited>false</inherited> - <executions> - <execution> - <id>jredmine-generate-changes</id> - <goals> - <goal>generate-changes</goal> - </goals> - <phase>process-classes</phase> - <configuration> - <generateOnce>true</generateOnce> - <actionMapping>fix:1, add:2</actionMapping> - <statusIds>3,4,5</statusIds> - </configuration> - </execution> - - </executions> </plugin> </plugins>

1 0

r105 - trunk/jredmine-client
by tchemit＠users.nuiton.org 23 Jan '10

23 Jan '10

Author: tchemit Date: 2010-01-23 18:23:27 +0100 (Sat, 23 Jan 2010) New Revision: 105 Modified: trunk/jredmine-client/pom.xml Log: expose test-jar and test-sources as we expose tests classifier Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2010-01-23 17:07:16 UTC (rev 104) +++ trunk/jredmine-client/pom.xml 2010-01-23 17:23:27 UTC (rev 105) @@ -125,6 +125,34 @@ <build> <plugins> +  + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> +  + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> +  + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> +  <plugin>

1 0

r104 - trunk
by tchemit＠users.nuiton.org 23 Jan '10

23 Jan '10

Author: tchemit Date: 2010-01-23 18:07:16 +0100 (Sat, 23 Jan 2010) New Revision: 104 Modified: trunk/pom.xml Log: clean pom + bump velocity to version 1.6.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-22 11:19:00 UTC (rev 103) +++ trunk/pom.xml 2010-01-23 17:07:16 UTC (rev 104) @@ -107,28 +107,10 @@ <artifactId>plexus-cipher</artifactId> </exclusion> -  - </exclusions> -  </dependency> -  -  -  <dependency> <groupId>org.codehaus.plexus</groupId> @@ -256,7 +238,7 @@ <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> - <version>1.6.2</version> + <version>1.6.3</version> </dependency> <!-- <dependency>

1 0