Author: tchemit Date: 2009-09-21 16:04:58 +0200 (Mon, 21 Sep 2009) New Revision: 216 Modified: jredmine/trunk/maven-jredmine-plugin/pom.xml jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java jredmine/trunk/maven-jredmine-plugin/src/main/resources/redmine-report.properties jredmine/trunk/maven-jredmine-plugin/src/main/resources/redmine-report_fr.properties jredmine/trunk/pom.xml Log: prepare use of the plugin to generate reports Modified: jredmine/trunk/maven-jredmine-plugin/pom.xml =================================================================== --- jredmine/trunk/maven-jredmine-plugin/pom.xml 2009-09-21 12:24:07 UTC (rev 215) +++ jredmine/trunk/maven-jredmine-plugin/pom.xml 2009-09-21 14:04:58 UTC (rev 216) @@ -119,23 +119,6 @@ <properties> - <maven.changeFile>${maven.gen.dir}/changes/changes.xml</maven.changeFile> - <!--<maven.changeFile>${maven.changeFile}</maven.changeFile>--> - - <!-- redmine issue and version url pattern --> - <maven.redmine.issue.url>http://www.mynuiton.org/issues/show/%ISSUE%</maven.redmine.issue.url> - <!--<maven.redmine.issue.url>${maven.redmine.issue.url}</maven.redmine.issue.url>--> - - <!-- redmine server (must be defined in your settings.xml) --> - <redmine.serverId>redmine-local</redmine.serverId> - <!--<redmine.serverId>redmine-${plateform}</redmine.serverId>--> - - <!-- redmine project --> - <redmine.projectId>one</redmine.projectId> - <redmine.versionId>1.0.0</redmine.versionId> - <!--<redmine.projectId>${projectId}</redmine.projectId>--> - - <redmine.url>http://www.mynuiton.org</redmine.url> </properties> <build> @@ -178,8 +161,8 @@ <version>${project.version}</version> <configuration> <xmlPath>${maven.changeFile}</xmlPath> - <issueLinkTemplate>${maven.redmine.issue.url}</issueLinkTemplate> - <versionLinkTemplate>http://www.mynuiton.org/versions/show/%VERSION%</versionLinkTemplate> + <issueLinkTemplate>${redmine.url}/issues/show/%ISSUE%</issueLinkTemplate> + <versionLinkTemplate>${redmine.url}/versions/show/%VERSION%</versionLinkTemplate> <!--<onlyCurrentVersion>true</onlyCurrentVersion>--> <!--<maxEntries>2</maxEntries>--> <columnNames>key,summary,status,assignee,reporter,tracker,priority,version,category,createdOn</columnNames> Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2009-09-21 12:24:07 UTC (rev 215) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2009-09-21 14:04:58 UTC (rev 216) @@ -122,7 +122,7 @@ try { - if (issues.length == 0) { + if (issues==null || issues.length == 0) { getLog().warn("no issue to treate, will generate an empty raport."); IssueReportGenerator reportGenerator = new IssueReportGenerator(); Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java 2009-09-21 12:24:07 UTC (rev 215) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java 2009-09-21 14:04:58 UTC (rev 216) @@ -353,7 +353,7 @@ public void doGenerateEmptyReport(ResourceBundle bundle, Sink sink) { sinkBeginReport(sink, bundle); - sink.text(bundle.getString("report.error")); + sink.text(bundle.getString("report.empty")); sinkEndReport(sink); } Modified: jredmine/trunk/maven-jredmine-plugin/src/main/resources/redmine-report.properties =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/resources/redmine-report.properties 2009-09-21 12:24:07 UTC (rev 215) +++ jredmine/trunk/maven-jredmine-plugin/src/main/resources/redmine-report.properties 2009-09-21 14:04:58 UTC (rev 216) @@ -47,6 +47,7 @@ report.header-version=Redmine Issues Report organized by Version. report.description-version=Report on Issues from the Redmine Issue Tracking System (organized by version). +report.empty=No issues to display in the report. report.error=An error occured that made it impossible to generate this report. \ Please check the console for information on what might be the cause of this. report.date.format=yyy-MM-dd 'at' mm:hh Modified: jredmine/trunk/maven-jredmine-plugin/src/main/resources/redmine-report_fr.properties =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/resources/redmine-report_fr.properties 2009-09-21 12:24:07 UTC (rev 215) +++ jredmine/trunk/maven-jredmine-plugin/src/main/resources/redmine-report_fr.properties 2009-09-21 14:04:58 UTC (rev 216) @@ -47,6 +47,7 @@ report.description-version=Rapport des issues sur un server de type Redmine organis\u00E9s par version. report.header-version=Rapport des demandes sur le serveur Redmine organis\u00E9s par version. +report.empty=Pas de demandes \u00E0 afficher dans le rapport. report.error=An error occured that made it impossible to generate this report. \ Please check the console for information on what might be the cause of this. report.date.format=dd/MM/yyyy '\u00E0' mm:hh Modified: jredmine/trunk/pom.xml =================================================================== --- jredmine/trunk/pom.xml 2009-09-21 12:24:07 UTC (rev 215) +++ jredmine/trunk/pom.xml 2009-09-21 14:04:58 UTC (rev 216) @@ -253,12 +253,19 @@ <!-- generated changes.xml file --> <maven.changeFile>${maven.gen.dir}/changes/changes.xml</maven.changeFile> + <!-- test config --> <test.redmineUrl>http://mynuiton.org</test.redmineUrl> <test.redmineUsername>chemit</test.redmineUsername> <test.redminePassword>azer</test.redminePassword> <test.verbose>false</test.verbose> <test.encoding>UTF-8</test.encoding> - + + <!-- redmine config --> + <redmine.serverId>redmine-nuiton.org</redmine.serverId> + <redmine.projectId>sandbox</redmine.projectId> + <redmine.versionId>${project.version}</redmine.versionId> + <redmine.url>http://www.nuiton.org</redmine.url> + </properties> <build> @@ -908,7 +915,7 @@ <issueManagement> <system>redmine</system> - <url>http://www.nuiton.org/projects/sandbox/issues</url> + <url>${redmine.url}/projects/sandbox/issues</url> </issueManagement> <ciManagement>