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

r247 - trunk
by tchemit＠users.nuiton.org 20 Mar '12

20 Mar '12

Author: tchemit Date: 2012-03-21 00:06:55 +0100 (Wed, 21 Mar 2012) New Revision: 247 Url: http://nuiton.org/repositories/revision/jredmine/247 Log: prepare for next release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-20 22:53:27 UTC (rev 246) +++ trunk/pom.xml 2012-03-20 23:06:55 UTC (rev 247) @@ -525,7 +525,7 @@ <projectId>jredmine</projectId>  - <jredminePluginVersion>1.2.2</jredminePluginVersion> + <jredminePluginVersion>1.3</jredminePluginVersion> <doxiaVersion>1.2</doxiaVersion> @@ -586,7 +586,7 @@ <plugin> <groupId>org.nuiton.jredmine</groupId> - <artifactId>maven-jredmine-plugin</artifactId> + <artifactId>jredmine-maven-plugin</artifactId> <version>${jredminePluginVersion}</version>  @@ -618,7 +618,7 @@  <plugin> <groupId>org.nuiton.jredmine</groupId> - <artifactId>maven-jredmine-plugin</artifactId> + <artifactId>jredmine-maven-plugin</artifactId>  <inherited>false</inherited> @@ -640,8 +640,7 @@ </activation> <properties>  -  -  + <jredminePluginVersion>${project.version}</jredminePluginVersion> </properties> @@ -659,8 +658,7 @@ <properties>  -  -  + <jredminePluginVersion>${project.version}</jredminePluginVersion> </properties> </profile>

1 0

r246 - in trunk: . jredmine-client jredmine-maven-plugin
by maven-release＠users.nuiton.org 20 Mar '12

20 Mar '12

Author: maven-release Date: 2012-03-20 23:53:27 +0100 (Tue, 20 Mar 2012) New Revision: 246 Url: http://nuiton.org/repositories/revision/jredmine/246 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jredmine-client/pom.xml trunk/jredmine-maven-plugin/pom.xml trunk/pom.xml Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2012-03-20 22:53:25 UTC (rev 245) +++ trunk/jredmine-client/pom.xml 2012-03-20 22:53:27 UTC (rev 246) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/jredmine-maven-plugin/pom.xml =================================================================== --- trunk/jredmine-maven-plugin/pom.xml 2012-03-20 22:53:25 UTC (rev 245) +++ trunk/jredmine-maven-plugin/pom.xml 2012-03-20 22:53:27 UTC (rev 246) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-20 22:53:25 UTC (rev 245) +++ trunk/pom.xml 2012-03-20 22:53:27 UTC (rev 246) @@ -37,7 +37,7 @@ </parent> <artifactId>jredmine</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> <modules> <module>jredmine-client</module> @@ -46,11 +46,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.3</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.3 + scm:svn:http://svn.nuiton.org/svn/jredmine/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jredmine/tags/jredmine-1.3</url> + <url>http://www.nuiton.org/repositories/browse/jredmine/trunk</url> </scm> <distributionManagement>

1 0

r245 - tags
by maven-release＠users.nuiton.org 20 Mar '12

20 Mar '12

Author: maven-release Date: 2012-03-20 23:53:25 +0100 (Tue, 20 Mar 2012) New Revision: 245 Url: http://nuiton.org/repositories/revision/jredmine/245 Log: [maven-release-plugin] copy for tag jredmine-1.3 Added: tags/jredmine-1.3/

1 0

r244 - in trunk: . jredmine-client jredmine-maven-plugin
by maven-release＠users.nuiton.org 20 Mar '12

20 Mar '12

Author: maven-release Date: 2012-03-20 23:53:23 +0100 (Tue, 20 Mar 2012) New Revision: 244 Url: http://nuiton.org/repositories/revision/jredmine/244 Log: [maven-release-plugin] prepare release jredmine-1.3 Modified: trunk/jredmine-client/pom.xml trunk/jredmine-maven-plugin/pom.xml trunk/pom.xml Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2012-03-20 22:50:19 UTC (rev 243) +++ trunk/jredmine-client/pom.xml 2012-03-20 22:53:23 UTC (rev 244) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/jredmine-maven-plugin/pom.xml =================================================================== --- trunk/jredmine-maven-plugin/pom.xml 2012-03-20 22:50:19 UTC (rev 243) +++ trunk/jredmine-maven-plugin/pom.xml 2012-03-20 22:53:23 UTC (rev 244) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-20 22:50:19 UTC (rev 243) +++ trunk/pom.xml 2012-03-20 22:53:23 UTC (rev 244) @@ -37,7 +37,7 @@ </parent> <artifactId>jredmine</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> <modules> <module>jredmine-client</module> @@ -46,11 +46,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.3</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jredmine/trunk + scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.3 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jredmine/trunk</url> + <url>http://www.nuiton.org/repositories/browse/jredmine/tags/jredmine-1.3</url> </scm> <distributionManagement>

1 0

r243 - in trunk: . jredmine-maven-plugin
by tchemit＠users.nuiton.org 20 Mar '12

20 Mar '12

Author: tchemit Date: 2012-03-20 23:50:19 +0100 (Tue, 20 Mar 2012) New Revision: 243 Url: http://nuiton.org/repositories/revision/jredmine/243 Log: optimize dependencies Modified: trunk/jredmine-maven-plugin/pom.xml trunk/pom.xml Modified: trunk/jredmine-maven-plugin/pom.xml =================================================================== --- trunk/jredmine-maven-plugin/pom.xml 2012-03-20 22:46:26 UTC (rev 242) +++ trunk/jredmine-maven-plugin/pom.xml 2012-03-20 22:50:19 UTC (rev 243) @@ -117,10 +117,10 @@ <artifactId>maven-reporting-api</artifactId> </dependency> - <dependency> +  <dependency> <groupId>org.apache.maven.plugins</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-20 22:46:26 UTC (rev 242) +++ trunk/pom.xml 2012-03-20 22:50:19 UTC (rev 243) @@ -243,11 +243,11 @@ <scope>provided</scope> </dependency> - <dependency> +  <dependency> <groupId>org.apache.maven</groupId>

1 0

r242 - trunk/jredmine-maven-plugin/src/license
by tchemit＠users.nuiton.org 20 Mar '12

20 Mar '12

Author: tchemit Date: 2012-03-20 23:46:26 +0100 (Tue, 20 Mar 2012) New Revision: 242 Url: http://nuiton.org/repositories/revision/jredmine/242 Log: optimize third-parties Modified: trunk/jredmine-maven-plugin/src/license/THIRD-PARTY.properties Modified: trunk/jredmine-maven-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jredmine-maven-plugin/src/license/THIRD-PARTY.properties 2012-03-20 22:38:07 UTC (rev 241) +++ trunk/jredmine-maven-plugin/src/license/THIRD-PARTY.properties 2012-03-20 22:46:26 UTC (rev 242) @@ -4,6 +4,7 @@ # - Apache License # - Apache Public License 2.0 # - BSD License +# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 @@ -18,11 +19,11 @@ # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 07:33:03 CEST 2011 +#Tue Mar 20 23:45:15 CET 2012 classworlds--classworlds--1.1=http\://classworlds.codehaus.org/license.html commons-digester--commons-digester--1.6=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-i18n--1.0-beta-7=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-i18n--1.0-beta-10=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4=The Apache Software License, Version 2.0 org.sonatype.plexus--plexus-build-api--0.0.4=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0

1 0

r241 - in trunk: jredmine-maven-plugin/src/site/apt src/site/apt
by tchemit＠users.nuiton.org 20 Mar '12

20 Mar '12

Author: tchemit Date: 2012-03-20 23:38:07 +0100 (Tue, 20 Mar 2012) New Revision: 241 Url: http://nuiton.org/repositories/revision/jredmine/241 Log: closes #1969 (update docs) Modified: trunk/jredmine-maven-plugin/src/site/apt/index.apt trunk/src/site/apt/index.apt Modified: trunk/jredmine-maven-plugin/src/site/apt/index.apt =================================================================== --- trunk/jredmine-maven-plugin/src/site/apt/index.apt 2012-03-20 22:36:31 UTC (rev 240) +++ trunk/jredmine-maven-plugin/src/site/apt/index.apt 2012-03-20 22:38:07 UTC (rev 241) @@ -29,7 +29,7 @@ 2009-09-06 ---- -maven-redmine-plugin +jredmine-maven-plugin * Presentation @@ -37,6 +37,14 @@ récuperer des données depuis un serveur redmine qui a installé le plugin rails <<jredmine>>. +* Important notes + +** Version 1.3 + + Since version 1.3, the plugin artifact was renamed from <maven-jredmine-plugin> + to <jredmine-maven-plugin>. Please change the plugin coordinates as shown + {{{./plugin-info.html#Utilisation}here}}. + * Goals Overview The plugin has the following goals: Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2012-03-20 22:36:31 UTC (rev 240) +++ trunk/src/site/apt/index.apt 2012-03-20 22:38:07 UTC (rev 241) @@ -54,6 +54,16 @@ Notes +* Version 1.3 + + La version <<1.3>> est compatible avec {{{http://www.redmine.org/versions/42}<redmine 1.3.2>}} après la + résolution du ticket {{http://nuiton.org/issues/1925}}. + + Le nom du plugin a été renommé de <maven-jredmine-plugin> en <jredmine-maven-plugin> + (voir ticket {{http://nuiton.org/issues/1969}}). Pensez à bien changer les coordonnées + du plugin comme indiqué {{{./jredmine-maven-plugin/plugin-info.html#Utilisation}ici}}. + + * Version 1.2 Avant la version <<1.2>>, on ne pouvait pas communiquer avec un <<redmine>>

1 0

r240 - trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report
by tchemit＠users.nuiton.org 20 Mar '12

20 Mar '12

Author: tchemit Date: 2012-03-20 23:36:31 +0100 (Tue, 20 Mar 2012) New Revision: 240 Url: http://nuiton.org/repositories/revision/jredmine/240 Log: fixes #2018 (report api update) Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2012-03-20 22:35:30 UTC (rev 239) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2012-03-20 22:36:31 UTC (rev 240) @@ -71,7 +71,7 @@ @Override public final String getOutputName() { - return "redmine-report" + (group == null ? "" : ("-by-" + group)); + return "redmine-report" + (group == null ? "" : "-by-" + group); } @Override @@ -178,7 +178,7 @@ report.setTrackers(service.getTrackers(id)); report.setVersions(service.getVersions(id)); - report.doGenerateReport(getBundle(locale), getSink(), getLog()); + report.doGenerateReport(getBundle(locale), getSink()); } } catch (MavenReportException mre) { @@ -186,7 +186,7 @@ // so that the build fails throw mre; } catch (Exception e) { - e.printStackTrace(); + getLog().error("Could not execute report", e); } } Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2012-03-20 22:35:30 UTC (rev 239) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2012-03-20 22:36:31 UTC (rev 240) @@ -33,6 +33,7 @@ import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.doxia.sink.Sink; +import org.apache.maven.doxia.sink.render.RenderingContext; import org.apache.maven.doxia.site.decoration.Body; import org.apache.maven.doxia.site.decoration.DecorationModel; import org.apache.maven.doxia.site.decoration.Skin; @@ -43,7 +44,6 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.reporting.MavenReport; import org.apache.maven.reporting.MavenReportException; -import org.apache.maven.reporting.sink.SinkFactory; import org.codehaus.plexus.i18n.I18N; import org.nuiton.jredmine.plugin.AbstractRedmineMojo; @@ -187,8 +187,13 @@ String filename = getOutputName() + ".html"; File file = new File(outputDirectory, filename); - SiteRendererSink sink = SinkFactory.createSink(outputDirectory, filename); + RenderingContext context = new RenderingContext(outputDirectory, getOutputName() + ".html"); + //SiteRendererSink sink = SinkFactory.createSink(outputDirectory, filename); + + SiteRendererSink sink = new SiteRendererSink(context); + + generate(sink, currentLocale); Writer writer = new FileWriter(file); @@ -196,7 +201,7 @@ try { siteRenderer.generateDocument(writer, sink, siteContext); } finally { - + writer.close(); } Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java 2012-03-20 22:35:30 UTC (rev 239) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java 2012-03-20 22:36:31 UTC (rev 240) @@ -71,12 +71,11 @@ * <p/> * Can retreave th i18n header key by {@link #getI18nKey()} and have the * logic of each cell generation in the method - * {@link #sinkInsideCell(org.apache.maven.doxia.sink.Sink, org.nuiton.jredmine.plugin.report.IssueReportGenerator, org.nuiton.jredmine.model.Issue)} + * {@link #sinkInsideCell(Sink, org.nuiton.jredmine.plugin.report.IssueReportGenerator, Issue)} */ public enum ReportColumn { key(false, "report.label.key") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { generator.constructIssueLink(issue, sink); @@ -88,7 +87,6 @@ } }, summary(false, "report.label.summary") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { generator.sinkRawText(sink, issue.getDescription()); @@ -100,18 +98,17 @@ } }, status(true, "report.label.status") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { int id = issue.getStatusId(); - String t = id + ""; +// String t = id + ""; IssueStatus status = generator.getIssueStatus(id); - if (status == null) { - t = id == 0 ? "-" : t; - } else { - t = status.getName(); - } +// if (status == null) { +// t = id == 0 ? "-" : t; +// } else { +// t = status.getName(); +// } generator.sinkI18nAble(sink, id, status); } @@ -122,7 +119,6 @@ } }, assignee(true, "report.label.by") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { int id = issue.getAssignedToId(); @@ -144,7 +140,6 @@ } }, reporter(true, "report.label.reporter") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { int id = issue.getAuthorId(); @@ -166,7 +161,6 @@ } }, tracker(true, "report.label.type") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { int id = issue.getTrackerId(); @@ -180,7 +174,6 @@ } }, priority(true, "report.label.priority") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { int id = issue.getPriorityId(); @@ -194,7 +187,6 @@ } }, version(true, "report.label.version") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { int id = issue.getFixedVersionId(); @@ -208,7 +200,6 @@ } }, category(true, "report.label.category") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { int id = issue.getCategoryId(); @@ -222,7 +213,6 @@ } }, createdon(false, "report.label.created") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { Date d = issue.getCreatedOn(); @@ -235,7 +225,6 @@ } }, updatedon(false, "report.label.updated") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { Date d = issue.getUpdatedOn(); @@ -252,7 +241,7 @@ private String i18nKey; - private ReportColumn(boolean canGroup, String i18nKey) { + ReportColumn(boolean canGroup, String i18nKey) { this.canGroup = canGroup; this.i18nKey = i18nKey; } @@ -372,7 +361,7 @@ sinkEndReport(sink); } - public void doGenerateReport(ResourceBundle bundle, Sink sink, Log log) + public void doGenerateReport(ResourceBundle bundle, Sink sink) throws MojoExecutionException { if (issues != null && issues.length == 0) { @@ -436,7 +425,7 @@ * @return {@code true} if issue links can be generated, {@code false} otherwise. */ public boolean canGenerateIssueLinks() { - return !StringUtils.isEmpty(issueLinkTemplate) && (!StringUtils.isBlank(getUrl()) || issueLinkTemplate.indexOf(URL_TOKEN) < 0); + return !StringUtils.isEmpty(issueLinkTemplate) && (!StringUtils.isBlank(getUrl()) || !issueLinkTemplate.contains(URL_TOKEN)); } /** @@ -445,7 +434,7 @@ * @return {@code true} if issue links can be generated, {@code false} otherwise. */ public boolean canGenerateVersionLinks() { - return !StringUtils.isEmpty(versionLinkTemplate) && (!StringUtils.isBlank(getUrl()) || versionLinkTemplate.indexOf(URL_TOKEN) < 0); + return !StringUtils.isEmpty(versionLinkTemplate) && (!StringUtils.isBlank(getUrl()) || !versionLinkTemplate.contains(URL_TOKEN)); } public void setUrl(String url) { @@ -552,10 +541,7 @@ String issueLink = issueLinkTemplate; parseLink = issueLink.replaceFirst(ISSUE_TOKEN, issue); - if (parseLink.indexOf(URL_TOKEN) >= 0) { -// String u = this.url.substring(0, this.url.lastIndexOf("/")); - -// parseLink = parseLink.replaceFirst(URL_TOKEN, u); + if (parseLink.contains(URL_TOKEN)) { parseLink = parseLink.replaceFirst(URL_TOKEN, url); } @@ -567,9 +553,7 @@ String issueLink = versionLinkTemplate; parseLink = issueLink.replaceFirst(VERSION_TOKEN, issue); - if (parseLink.indexOf(URL_TOKEN) >= 0) { -// String u = this.url.substring(0, this.url.lastIndexOf("/")); -// parseLink = parseLink.replaceFirst(URL_TOKEN, u); + if (parseLink.contains(URL_TOKEN)) { parseLink = parseLink.replaceFirst(URL_TOKEN, url); }

1 0

r239 - trunk
by tchemit＠users.nuiton.org 20 Mar '12

20 Mar '12

Author: tchemit Date: 2012-03-20 23:35:30 +0100 (Tue, 20 Mar 2012) New Revision: 239 Url: http://nuiton.org/repositories/revision/jredmine/239 Log: fixes #2018 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-20 21:10:19 UTC (rev 238) +++ trunk/pom.xml 2012-03-20 22:35:30 UTC (rev 239) @@ -180,7 +180,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-i18n</artifactId> - <version>1.0-beta-7</version> + <version>1.0-beta-10</version> <exclusions> <exclusion> <groupId>org.codehaus.plexus</groupId> @@ -198,7 +198,7 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.4</version> + <version>1.6</version> </dependency> <dependency> @@ -239,14 +239,14 @@ <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-api</artifactId> - <version>${mavenVersion}</version> + <version>3.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-impl</artifactId> - <version>2.0.5</version> + <version>2.2</version> </dependency> <dependency> @@ -365,7 +365,7 @@ <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> - <version>2.4</version> + <version>2.6</version> <exclusions> <exclusion> <groupId>org.codehaus.plexus</groupId> @@ -525,7 +525,7 @@ <projectId>jredmine</projectId>  - <jredminePluginVersion>1.2.1</jredminePluginVersion> + <jredminePluginVersion>1.2.2</jredminePluginVersion> <doxiaVersion>1.2</doxiaVersion> @@ -586,7 +586,7 @@ <plugin> <groupId>org.nuiton.jredmine</groupId> - <artifactId>jredmine-maven-plugin</artifactId> + <artifactId>maven-jredmine-plugin</artifactId> <version>${jredminePluginVersion}</version>  @@ -618,7 +618,7 @@  <plugin> <groupId>org.nuiton.jredmine</groupId> - <artifactId>jredmine-maven-plugin</artifactId> + <artifactId>maven-jredmine-plugin</artifactId>  <inherited>false</inherited> @@ -640,7 +640,8 @@ </activation> <properties>  - <jredminePluginVersion>${project.version}</jredminePluginVersion> +  +  </properties> @@ -658,7 +659,8 @@ <properties>  - <jredminePluginVersion>${project.version}</jredminePluginVersion> +  +  </properties> </profile>

1 0

r238 - in trunk: jredmine-client/src/main/java/org/nuiton/jredmine/model jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3 jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3 jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3 jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2 jredmine-maven-plugin/src/main/resources/META-INF/plexus
by tchemit＠users.nuiton.org 20 Mar '12

20 Mar '12

Author: tchemit Date: 2012-03-20 22:10:19 +0100 (Tue, 20 Mar 2012) New Revision: 238 Url: http://nuiton.org/repositories/revision/jredmine/238 Log: closes #1925: Redmine 1.3, XML mal form?\195?\169 Added: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/issue.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/user.xml Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueXpp3Reader.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserXpp3Reader.java trunk/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/user.xml trunk/jredmine-maven-plugin/src/main/resources/META-INF/plexus/components.xml 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 2012-02-29 12:36:41 UTC (rev 237) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java 2012-03-20 21:10:19 UTC (rev 238) @@ -78,6 +78,8 @@ protected String subject; + protected boolean isPrivate; + @Override public int getId() { return id; @@ -172,6 +174,10 @@ return rootId; } + public boolean isIsPrivate() { + return isPrivate; + } + public void setAssignedToId(int assignedToId) { this.assignedToId = assignedToId; } @@ -259,4 +265,8 @@ public void setRootId(int rootId) { this.rootId = rootId; } + + public void setIsPrivate(boolean aPrivate) { + isPrivate = aPrivate; + } } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java 2012-02-29 12:36:41 UTC (rev 237) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java 2012-03-20 21:10:19 UTC (rev 238) @@ -66,6 +66,8 @@ protected String identityUrl; + protected String salt; + public boolean isAdmin() { return admin; } @@ -135,6 +137,10 @@ return identityUrl; } + public String getSalt() { + return salt; + } + public void setAdmin(boolean admin) { this.admin = admin; } @@ -199,6 +205,10 @@ this.updatedOn = updatedOn; } + public void setSalt(String salt) { + this.salt = salt; + } + @Override public String getName() { return firstname + " " + lastname; Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueXpp3Reader.java 2012-02-29 12:36:41 UTC (rev 237) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueXpp3Reader.java 2012-03-20 21:10:19 UTC (rev 238) @@ -26,6 +26,7 @@ import org.nuiton.io.xpp3.AbstractXpp3Reader; import org.nuiton.jredmine.model.Issue; +import org.nuiton.jredmine.model.Project; import java.beans.IntrospectionException; @@ -77,5 +78,8 @@ addTagTextContentMappers(Issue.class, RedmineDataConverter.Text, true, allMappers, "description", "subject"); + + addTagTextContentMappers(Issue.class, RedmineDataConverter.Boolean, true, allMappers, + "is-private"); } } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserXpp3Reader.java 2012-02-29 12:36:41 UTC (rev 237) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserXpp3Reader.java 2012-03-20 21:10:19 UTC (rev 238) @@ -69,6 +69,7 @@ "lastname", "login", "identity-url", - "mail"); + "mail", + "salt"); } } Modified: trunk/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java =================================================================== --- trunk/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java 2012-02-29 12:36:41 UTC (rev 237) +++ trunk/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java 2012-03-20 21:10:19 UTC (rev 238) @@ -184,6 +184,29 @@ Arrays.asList(TestHelper.getModel(News.class).get(0)), Arrays.asList(TestHelper.getModel(TimeEntry.class).get(0)) ); + + Issue issue = TestHelper.getModel(Issue.class).get(0); + User user = TestHelper.getModel(User.class).get(0); + issue.setIsPrivate(true); + user.setSalt("38006729a049cd820aafd6c2bb3b193f"); + try { + action.run("single2", + null, + Arrays.asList(issue), + null, + null, + Arrays.asList(user), + null, + null, + null, + null, + null, + null + ); + } finally { + issue.setIsPrivate(false); + user.setSalt(null); + } } /** @@ -214,7 +237,7 @@ FileInputStream input = new FileInputStream(file); try { -// test from text + // test from text String txt = IOUtil.toString(input); actual = builder.readObjects(type, txt, true); @@ -293,7 +316,9 @@ RedmineModelEnum next = TYPE_ORDER[i]; - runForType(rootDir, next.getModelType(), expected[i]); + if (expected[i] != null) { + runForType(rootDir, next.getModelType(), expected[i]); + } } } } Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/user.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/user.xml 2012-02-29 12:36:41 UTC (rev 237) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/user.xml 2012-03-20 21:10:19 UTC (rev 238) @@ -30,7 +30,7 @@ <last-login-on type="datetime">2009-09-06T01:23:59+02:00</last-login-on> <id type="integer">1</id> - <auth-source-id type="integer" nil="true"></auth-source-id> + <auth-source-id type="integer" nil="true"/> <member-id type="NilClass">5</member-id> <role-id type="NilClass">3</role-id> <status type="integer">1</status> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/issue.xml (from rev 237, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issue.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/issue.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/issue.xml 2012-03-20 21:10:19 UTC (rev 238) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issue> + <assigned-to-id type="integer" nil="true"/> + <author-id type="integer">5</author-id> + <category-id type="integer">2</category-id> + <done-ratio type="integer">0</done-ratio> + <lock-version type="integer">7</lock-version> + <priority-id type="integer">4</priority-id> + <project-id type="integer">1</project-id> + <status-id type="integer">3</status-id> + <tracker-id type="integer">1</tracker-id> + <fixed-version-id type="integer">1</fixed-version-id> + <id type="integer">3</id> + <parent-id>3</parent-id> + <root-id>3</root-id> + + <estimated-hours type="float" nil="true"/> + + <created-on type="datetime">2009-09-04T20:11:52+02:00</created-on> + <updated-on type="datetime">2009-09-06T00:37:40+02:00</updated-on> + <due-date type="date" nil="true"/> + <start-date type="date">2009-09-04</start-date> + + <description>avec une description !</description> + <subject>yes!</subject> + <lft type="integer">1</lft> + <rgt type="integer">2</rgt> + <is-private type="boolean">true</is-private> +</issue> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/user.xml (from rev 237, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/user.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/user.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/user.xml 2012-03-20 21:10:19 UTC (rev 238) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<user> + <created-on type="datetime">2009-09-04T17:24:46+02:00</created-on> + <updated-on type="datetime">2009-09-06T01:23:59+02:00</updated-on> + <last-login-on type="datetime">2009-09-06T01:23:59+02:00</last-login-on> + + <id type="integer">1</id> + <auth-source-id type="integer" nil="true"/> + <member-id type="NilClass">5</member-id> + <role-id type="NilClass">3</role-id> + <status type="integer">1</status> + + <admin type="boolean">true</admin> + <mail-notification type="boolean">true</mail-notification> + + <firstname>Redmine</firstname> + <hashed-password>70c881d4a26984ddce795f6f71817c9cf4480e79</hashed-password> + <language>fr</language> + <lastname>Admin</lastname> + <login>admin</login> + <mail>dummy(a)codelutin.com</mail> + <identity-url>yo</identity-url> + <salt>38006729a049cd820aafd6c2bb3b193f</salt> +</user> Modified: trunk/jredmine-maven-plugin/src/main/resources/META-INF/plexus/components.xml =================================================================== --- trunk/jredmine-maven-plugin/src/main/resources/META-INF/plexus/components.xml 2012-02-29 12:36:41 UTC (rev 237) +++ trunk/jredmine-maven-plugin/src/main/resources/META-INF/plexus/components.xml 2012-03-20 21:10:19 UTC (rev 238) @@ -4,7 +4,7 @@ Maven helper plugin $Id$ - $HeadURL: http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plugin-1.3/… $ + $HeadURL$ %% Copyright (C) 2009 - 2010 CodeLutin %% Property changes on: trunk/jredmine-maven-plugin/src/main/resources/META-INF/plexus/components.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL

1 0