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

r51 - in trunk: . jredmine-client maven-jredmine-plugin
by tchemit＠users.nuiton.org 07 Dec '09

07 Dec '09

Author: tchemit Date: 2009-12-07 16:15:07 +0100 (Mon, 07 Dec 2009) New Revision: 51 Modified: trunk/jredmine-client/pom.xml trunk/maven-jredmine-plugin/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare release jredmine-1.0.1 Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2009-12-07 13:54:48 UTC (rev 50) +++ trunk/jredmine-client/pom.xml 2009-12-07 15:15:07 UTC (rev 51) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/maven-jredmine-plugin/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/pom.xml 2009-12-07 13:54:48 UTC (rev 50) +++ trunk/maven-jredmine-plugin/pom.xml 2009-12-07 15:15:07 UTC (rev 51) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-07 13:54:48 UTC (rev 50) +++ trunk/pom.xml 2009-12-07 15:15:07 UTC (rev 51) @@ -9,7 +9,7 @@ <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> <modules> <module>jredmine-client</module> @@ -1174,9 +1174,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jredmine/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.0.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.0.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jredmine/tags/jredmine-1.0.1</url> </scm> <profiles>

1 0

r50 - trunk
by tchemit＠users.nuiton.org 07 Dec '09

07 Dec '09

Author: tchemit Date: 2009-12-07 14:54:48 +0100 (Mon, 07 Dec 2009) New Revision: 50 Modified: trunk/pom.xml Log: fix test url Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-25 07:49:48 UTC (rev 49) +++ trunk/pom.xml 2009-12-07 13:54:48 UTC (rev 50) @@ -458,7 +458,7 @@ <maven.changeFile>${maven.gen.dir}/changes/changes.xml</maven.changeFile>  - <test.redmineUrl>http://mynuiton.org</test.redmineUrl> + <test.redmineUrl>http://www.mynuiton.org</test.redmineUrl> <test.redmineUsername>chemit</test.redmineUsername> <test.redminePassword>azer</test.redminePassword> <test.verbose>false</test.verbose>

1 0

r49 - trunk
by tchemit＠users.nuiton.org 25 Nov '09

25 Nov '09

Author: tchemit Date: 2009-11-25 08:49:48 +0100 (Wed, 25 Nov 2009) New Revision: 49 Modified: trunk/pom.xml Log: use maven-jar-plugin 2.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-24 17:31:41 UTC (rev 48) +++ trunk/pom.xml 2009-11-25 07:49:48 UTC (rev 49) @@ -554,7 +554,7 @@ <plugin> <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> + <version>2.3</version> <inherited>true</inherited> <configuration>

1 0

r48 - trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin
by tchemit＠users.nuiton.org 24 Nov '09

24 Nov '09

Author: tchemit Date: 2009-11-24 18:31:41 +0100 (Tue, 24 Nov 2009) New Revision: 48 Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java Log: fix api changes in maven-changes-plugin 2.2 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 2009-11-24 16:46:18 UTC (rev 47) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2009-11-24 17:31:41 UTC (rev 48) @@ -485,7 +485,8 @@ Body body = new Body(); doc.setBody(body); - body.setModelEncoding(encoding); + //TC-20091124 : was removed since maven-changes-plugin 2.2 ? +// body.setModelEncoding(encoding); Issue[] issues = collector.getIssues();

1 0

r47 - trunk
by tchemit＠users.nuiton.org 24 Nov '09

24 Nov '09

Author: tchemit Date: 2009-11-24 17:46:18 +0100 (Tue, 24 Nov 2009) New Revision: 47 Modified: trunk/pom.xml Log: use maven-changes-plugin 2.2 (with french translations :)) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-12 20:41:02 UTC (rev 46) +++ trunk/pom.xml 2009-11-24 16:46:18 UTC (rev 47) @@ -220,7 +220,7 @@ <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> - <version>2.1</version> + <version>2.2</version> <exclusions> <exclusion> <groupId>plexus</groupId>

1 0

r46 - in trunk: . jredmine-client/src/main/java/org/nuiton/jredmine jredmine-client/src/main/java/org/nuiton/jredmine/rest jredmine-client/src/test/java/org/nuiton/jredmine maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin
by tchemit＠users.nuiton.org 12 Nov '09

12 Nov '09

Author: tchemit Date: 2009-11-12 21:41:02 +0100 (Thu, 12 Nov 2009) New Revision: 46 Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineService.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/DefaultRequestBuilder.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/ProjectScopeRequestBuilder.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRestClient.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/VersionScopeRequestBuilder.java trunk/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineServiceTest.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java trunk/pom.xml Log: fix Anomalie #126 Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java 2009-11-07 10:48:58 UTC (rev 45) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java 2009-11-12 20:41:02 UTC (rev 46) @@ -21,6 +21,7 @@ package org.nuiton.jredmine; import java.io.IOException; + import org.nuiton.io.rest.RestException; import org.nuiton.jredmine.model.Attachment; import org.nuiton.jredmine.model.News; @@ -29,7 +30,9 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.io.rest.RestClient; import org.nuiton.io.rest.RestRequest; + import java.io.InputStream; + import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.model.Issue; @@ -44,20 +47,19 @@ /** * Default {@link RedmineService} implementation base on a {@link RestClient} - * + * * @author chemit + * @plexus.component role="org.nuiton.jredmine.RedmineService" role-hint="default" * @since 1.0.0 - * - * @plexus.component role="org.nuiton.jredmine.RedmineService" - * role-hint="default" */ public class DefaultRedmineService implements RedmineService, RedmineServiceImplementor { protected static final Log log = LogFactory.getLog(DefaultRedmineService.class); /** * client Rest + * * @plexus.requirement role="org.nuiton.io.rest.RestClient" - * role-hint="redmine" + * role-hint="redmine" */ protected RestClient session; /** @@ -80,9 +82,9 @@ /// RedmineService implementation /////////////////////////////////////////////////////////////////////////// @Override - public Version addVersion(String projectId, Version version) throws RedmineServiceException { + public Version addVersion(String projectName, Version version) throws RedmineServiceException { checkInit(); - RestRequest r = getRequest(RedmineRestClient.ADD_VERSION, projectId, version); + RestRequest r = getRequest(RedmineRestClient.ADD_VERSION, projectName, version); // send data and obtain created version try { @@ -96,9 +98,9 @@ } @Override - public Attachment addAttachment(String projectId, String versionId, Attachment attachement) throws RedmineServiceException { + public Attachment addAttachment(String projectName, String versionName, Attachment attachement) throws RedmineServiceException { checkInit(); - RestRequest r = getRequest(RedmineRestClient.ADD_ATTACHMENT, projectId, versionId, attachement); + RestRequest r = getRequest(RedmineRestClient.ADD_ATTACHMENT, projectName, versionName, attachement); // send data and obtain created attachment try { @@ -112,9 +114,9 @@ } @Override - public News addNews(String projectId, News news) throws RedmineServiceException { + public News addNews(String projectName, News news) throws RedmineServiceException { checkInit(); - RestRequest r = getRequest(RedmineRestClient.ADD_NEWS, projectId, news); + RestRequest r = getRequest(RedmineRestClient.ADD_NEWS, projectName, news); // send data and obtain created news try { @@ -128,9 +130,9 @@ } @Override - public Version updateVersion(String projectId, Version version) throws RedmineServiceException { + public Version updateVersion(String projectName, Version version) throws RedmineServiceException { checkInit(); - RestRequest r = getRequest(RedmineRestClient.UPDATE_VERSION, projectId, version); + RestRequest r = getRequest(RedmineRestClient.UPDATE_VERSION, projectName, version); // send data and obtain updated version try { @@ -144,9 +146,9 @@ } @Override - public Version nextVersion(String projectId, String oldVersionId, Version newVersion) throws RedmineServiceException { + public Version nextVersion(String projectName, String oldVersionName, Version newVersion) throws RedmineServiceException { checkInit(); - RestRequest r = getRequest(RedmineRestClient.NEXT_VERSION, projectId, oldVersionId, newVersion); + RestRequest r = getRequest(RedmineRestClient.NEXT_VERSION, projectName, oldVersionName, newVersion); // send data and obtain updated version try { @@ -174,48 +176,48 @@ } @Override - public IssueCategory[] getIssueCategories(String projectId) throws RedmineServiceException { - return getDatas(IssueCategory.class, projectId); + public IssueCategory[] getIssueCategories(String projectName) throws RedmineServiceException { + return getDatas(IssueCategory.class, projectName); } @Override - public Project getProject(String projectId) throws RedmineServiceException { - return getData(Project.class, projectId); + public Project getProject(String projectName) throws RedmineServiceException { + return getData(Project.class, projectName); } @Override - public Tracker[] getTrackers(String projectId) throws RedmineServiceException { - return getDatas(Tracker.class, projectId); + public Tracker[] getTrackers(String projectName) throws RedmineServiceException { + return getDatas(Tracker.class, projectName); } @Override - public News[] getNews(String projectId) throws RedmineServiceException { - return getDatas(News.class, projectId); + public News[] getNews(String projectName) throws RedmineServiceException { + return getDatas(News.class, projectName); } @Override - public User[] getUsers(String projectId) throws RedmineServiceException { - return getDatas(User.class, projectId); + public User[] getUsers(String projectName) throws RedmineServiceException { + return getDatas(User.class, projectName); } @Override - public Version[] getVersions(String projectId) throws RedmineServiceException { - return getDatas(Version.class, projectId); + public Version[] getVersions(String projectName) throws RedmineServiceException { + return getDatas(Version.class, projectName); } @Override - public Version getVersion(String projectId, String versionId) throws RedmineServiceException { - return getData(Version.class, projectId, versionId); + public Version getVersion(String projectName, String versionName) throws RedmineServiceException { + return getData(Version.class, projectName, versionName); } @Override - public Attachment[] getAttachments(String projectId, String versionId) throws RedmineServiceException { - return getDatas(Attachment.class, projectId, versionId); + public Attachment[] getAttachments(String projectName, String versionName) throws RedmineServiceException { + return getDatas(Attachment.class, projectName, versionName); } @Override - public Issue[] getIssues(String projectId, String versionId) throws RedmineServiceException { - return getDatas(Issue.class, projectId, versionId); + public Issue[] getIssues(String projectName, String versionName) throws RedmineServiceException { + return getDatas(Issue.class, projectName, versionName); } /////////////////////////////////////////////////////////////////////////// Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineService.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineService.java 2009-11-07 10:48:58 UTC (rev 45) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineService.java 2009-11-12 20:41:02 UTC (rev 46) @@ -39,190 +39,192 @@ */ public interface RedmineService { - /** Plexus lookup name */ + /** + * Plexus lookup name + */ String ROLE = RedmineService.class.getName(); /** * Obtain all accessible projets for the loggued user. - * + * * @return all the projects - * @throws RedmineServiceException if any pb + * @throws RedmineServiceException if any pb while retriving datas * @see Project */ Project[] getProjects() throws RedmineServiceException; /** * Obtain all the priorities defined on a {@link Issue}. - * + * * Note : The priorities are common for all projects. * * @return all the issue properties - * @throws RedmineServiceException + * @throws RedmineServiceException if any pb while retriving datas * @see IssuePriority */ IssuePriority[] getIssuePriorities() throws RedmineServiceException; /** * Obtain all the statuses defined on a {@link Issue}. - * + * * Note : The statuses are common for all projects. * * @return all the issue statuses - * @throws RedmineServiceException + * @throws RedmineServiceException if any pb while retriving datas * @see IssueStatus */ IssueStatus[] getIssueStatuses() throws RedmineServiceException; /** * Obtain a project given his name. - * - * @param projectId the name of the project - * @return the project - * @throws RedmineServiceException + * + * @param projectName the name of the project + * @return the project + * @throws RedmineServiceException if any pb while retriving datas * @see Project */ - Project getProject(String projectId) throws RedmineServiceException; + Project getProject(String projectName) throws RedmineServiceException; /** * Obtain all categories defined on issues for a given project. - * - * @param projectId the name of the project + * + * @param projectName the name of the project * @return the categories of issues for the given project. - * @throws RedmineServiceException + * @throws RedmineServiceException if any pb while retriving datas * @see IssueCategory */ - IssueCategory[] getIssueCategories(String projectId) throws RedmineServiceException; + IssueCategory[] getIssueCategories(String projectName) throws RedmineServiceException; /** * Obtain all trackers defined on a given project. * - * @param projectId the name of the project + * @param projectName the name of the project * @return the trackers for the given project. - * @throws RedmineServiceException + * @throws RedmineServiceException if any pb while retriving datas * @see Tracker */ - Tracker[] getTrackers(String projectId) throws RedmineServiceException; + Tracker[] getTrackers(String projectName) throws RedmineServiceException; /** * Obtain all news defined on a given project. * - * @param projectId the name of the project + * @param projectName the name of the project * @return the news for the given project. - * @throws RedmineServiceException + * @throws RedmineServiceException if any pb while retriving datas * @see News */ - News[] getNews(String projectId) throws RedmineServiceException; + News[] getNews(String projectName) throws RedmineServiceException; /** * Obtain all users defined on a given project. * - * @param projectId the name of the project + * @param projectName the name of the project * @return the users for the given project. - * @throws RedmineServiceException + * @throws RedmineServiceException if any pb while retriving datas * @see User */ - User[] getUsers(String projectId) throws RedmineServiceException; + User[] getUsers(String projectName) throws RedmineServiceException; /** * Obtain all versions defined on a given project. * - * @param projectId the name of the project + * @param projectName the name of the project * @return the versions of the given project. - * @throws RedmineServiceException + * @throws RedmineServiceException if any pb while retriving datas * @see Version */ - Version[] getVersions(String projectId) throws RedmineServiceException; + Version[] getVersions(String projectName) throws RedmineServiceException; /** * Obtain a specific version for a given project. * - * @param projectId the name of the project - * @param versionId the name of the version + * @param projectName the name of the project + * @param versionName the name of the version * @return the version - * @throws RedmineServiceException + * @throws RedmineServiceException if any pb while retriving datas * @see Version */ - Version getVersion(String projectId, String versionId) throws RedmineServiceException; + Version getVersion(String projectName, String versionName) throws RedmineServiceException; /** * Obtain all issues for a specific version on a given project * - * @param projectId the name of the project - * @param versionId the name of the version + * @param projectName the name of the project + * @param versionName the name of the version * @return the issues - * @throws RedmineServiceException + * @throws RedmineServiceException if any pb while retriving datas * @see Issue */ - Issue[] getIssues(String projectId, String versionId) throws RedmineServiceException; + Issue[] getIssues(String projectName, String versionName) throws RedmineServiceException; /** * Obtain all attachments for a specific version on a given project * - * @param projectId the name of the project - * @param versionId the name of the version + * @param projectName the name of the project + * @param versionName the name of the version * @return the attachments - * @throws RedmineServiceException + * @throws RedmineServiceException if any pb while retriving datas * @see Attachment */ - Attachment[] getAttachments(String projectId, String versionId) throws RedmineServiceException; + Attachment[] getAttachments(String projectName, String versionName) throws RedmineServiceException; /** * Add a version for a given project. - * - * @param projectId the name of the project - * @param version the version to add + * + * @param projectName the name of the project + * @param version the version to add * @return the added version - * @throws RedmineServiceException + * @throws RedmineServiceException if any pb while sending and retriving datas to redmine server * @see Version */ - Version addVersion(String projectId, Version version) throws RedmineServiceException; + Version addVersion(String projectName, Version version) throws RedmineServiceException; /** * Update a version for a given project. * - * @param projectId the name of the project - * @param version the version to update + * @param projectName the name of the project + * @param version the version to update * @return the updated version - * @throws RedmineServiceException + * @throws RedmineServiceException if any pb while sending and retriving datas to redmine server * @see Version */ - Version updateVersion(String projectId, Version version) throws RedmineServiceException; + Version updateVersion(String projectName, Version version) throws RedmineServiceException; /** * Prepare a new version (create it or update it). - * + * * If the {@code oldVersionName} is given, then all issues unclosed from this * old version will be move to the new version. * - * @param projectId the name of the project + * @param projectName the name of the project * @param oldVersionName the name of the old version (optional) - * @param newVersion the newVersion to create or update + * @param newVersion the newVersion to create or update * @return the created version - * @throws RedmineServiceException + * @throws RedmineServiceException if any pb while sending and retriving datas to redmine server * @see Version */ - Version nextVersion(String projectId, String oldVersionName, Version newVersion) throws RedmineServiceException; + Version nextVersion(String projectName, String oldVersionName, Version newVersion) throws RedmineServiceException; /** * Add a news for a given project. * - * @param projectId the name of the project - * @param news the news to add + * @param projectName the name of the project + * @param news the news to add * @return the added news. - * @throws RedmineServiceException + * @throws RedmineServiceException if any pb while sending and retriving datas to redmine server * @see News */ - News addNews(String projectId, News news) throws RedmineServiceException; + News addNews(String projectName, News news) throws RedmineServiceException; /** * Add a attachment for a given version of a given project. - * - * @param projectId the name of the project - * @param versionId the name of the version + * + * @param projectName the name of the project + * @param versionName the name of the version * @param attachement the attachment to add * @return the added attachment - * @throws RedmineServiceException + * @throws RedmineServiceException if any pb while sending and retriving datas to redmine server * @see Attachment */ - Attachment addAttachment(String projectId, String versionId, Attachment attachement) throws RedmineServiceException; + Attachment addAttachment(String projectName, String versionName, Attachment attachement) throws RedmineServiceException; } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/DefaultRequestBuilder.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/DefaultRequestBuilder.java 2009-11-07 10:48:58 UTC (rev 45) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/DefaultRequestBuilder.java 2009-11-12 20:41:02 UTC (rev 46) @@ -22,12 +22,13 @@ import java.io.File; import java.util.Map; + import org.nuiton.io.rest.RestRequest; import org.nuiton.io.rest.RestRequestBuilder; /** * Default {@link RestRequestBuilder} to be used in {@link RedmineRestClient}. - * + * * @author chemit * @since 1.0.0 */ @@ -47,15 +48,23 @@ return name; } + /** + * + * @param args the args of the request + * @return TODO + */ public String[] getParameters(Object... args) { + // by default, no parameter return new String[0]; } public String[] getPath(Object... args) { + // by default, path is contextPath / action return new String[]{CONTEXT_PATH, action}; } public Map<String, File> getAttachments(Object... args) { + // by default, no attachments return null; } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/ProjectScopeRequestBuilder.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/ProjectScopeRequestBuilder.java 2009-11-07 10:48:58 UTC (rev 45) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/ProjectScopeRequestBuilder.java 2009-11-12 20:41:02 UTC (rev 46) @@ -22,7 +22,7 @@ /** * Builder of requests which are in a project context. - * + * * @author chemit * @since 1.0.0 */ @@ -35,14 +35,14 @@ @Override public String[] getPath(Object... args) { - // one args : projectId + // one args : projectName - String projectId = (String) args[0]; + String projectName = (String) args[0]; return new String[]{ - CONTEXT_PATH, - action, - projectId - }; + CONTEXT_PATH, + action, + projectName + }; } } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRestClient.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRestClient.java 2009-11-07 10:48:58 UTC (rev 45) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRestClient.java 2009-11-12 20:41:02 UTC (rev 46) @@ -26,6 +26,7 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; + import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.StatusLine; @@ -49,12 +50,10 @@ /** * Implementation of a {@link RestClient} to access a Redmine server via the * {@code redmine_rest} rails plugin. - * + * * @author chemit + * @plexus.component role="org.nuiton.io.rest.RestClient" role-hint="redmine" * @since 1.0.0 - * - * @plexus.component role="org.nuiton.io.rest.RestClient" - * role-hint="redmine" */ public class RedmineRestClient extends RestClient { @@ -132,10 +131,10 @@ Version version = (Version) args[1]; String date = version.getEffectiveDate() == null ? "" : DATE_FORMAT.format(version.getEffectiveDate()); return new String[]{ - "version[name]", version.getName(), - "version[description]", version.getDescription(), - "version[effective_date]", date - }; + "version[name]", version.getName(), + "version[description]", version.getDescription(), + "version[effective_date]", date + }; } }); @@ -146,10 +145,10 @@ Version version = (Version) args[1]; String date = version.getEffectiveDate() == null ? "" : DATE_FORMAT.format(version.getEffectiveDate()); return new String[]{ - "version[name]", version.getName(), - "version[description]", version.getDescription(), - "version[effective_date]", date - }; + "version[name]", version.getName(), + "version[description]", version.getDescription(), + "version[effective_date]", date + }; } }); @@ -162,11 +161,11 @@ Version version = (Version) args[2]; String date = version.getEffectiveDate() == null ? "" : DATE_FORMAT.format(version.getEffectiveDate()); return new String[]{ - "oldVersionName", oldVersionId, - "version[name]", version.getName(), - "version[description]", version.getDescription(), - "version[effective_date]", date - }; + "oldVersionName", oldVersionId, + "version[name]", version.getName(), + "version[description]", version.getDescription(), + "version[effective_date]", date + }; } }); @@ -176,10 +175,10 @@ public String[] getParameters(Object... args) { News news = (News) args[1]; return new String[]{ - "news[title]", news.getTitle(), - "news[summary]", news.getSummary(), - "news[description]", news.getDescription() - }; + "news[title]", news.getTitle(), + "news[summary]", news.getSummary(), + "news[description]", news.getDescription() + }; } }); @@ -190,9 +189,9 @@ String versionId = (String) args[1]; Attachment attachment = (Attachment) args[2]; return new String[]{ - "version_name", versionId, - "attachment[description]", attachment.getDescription() - }; + "version_name", versionId, + "attachment[description]", attachment.getDescription() + }; } @Override Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/VersionScopeRequestBuilder.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/VersionScopeRequestBuilder.java 2009-11-07 10:48:58 UTC (rev 45) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/VersionScopeRequestBuilder.java 2009-11-12 20:41:02 UTC (rev 46) @@ -38,10 +38,10 @@ // args 1 = project id // args 2 = version name - String versionId = (String) args[1]; + String versionName = (String) args[1]; return new String[]{ - "version_name", versionId - }; + "version_name", versionName + }; } } Modified: trunk/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineServiceTest.java =================================================================== --- trunk/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineServiceTest.java 2009-11-07 10:48:58 UTC (rev 45) +++ trunk/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineServiceTest.java 2009-11-12 20:41:02 UTC (rev 46) @@ -41,7 +41,6 @@ import org.nuiton.jredmine.rest.RedmineRestClient; /** - * * @author chemit */ public class DefaultRedmineServiceTest { @@ -161,21 +160,26 @@ @Test public void addVersion() throws Exception { + //TODO } @Test public void addAttachment() throws Exception { + //TODO } @Test public void addNews() throws Exception { + //TODO } @Test public void updateVersion() throws Exception { + //TODO } @Test public void nextVersion() throws Exception { + //TODO } } 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 2009-11-07 10:48:58 UTC (rev 45) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2009-11-12 20:41:02 UTC (rev 46) @@ -92,7 +92,7 @@ */ protected String encoding; /** - * Project identifier. + * Redmine project name. * * @parameter expression="${redmine.projectId}" default-value="${project.artifactId}" * @required @@ -100,7 +100,7 @@ */ protected String projectId; /** - * Version identifier. + * redmine version name. * * @parameter expression="${redmine.versionId}" default-value="${project.version}" * @since 1.0.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-07 10:48:58 UTC (rev 45) +++ trunk/pom.xml 2009-11-12 20:41:02 UTC (rev 46) @@ -446,7 +446,7 @@ <maven.version>2.2.1</maven.version> <helper.version>1.1.0</helper.version> <license.version>2.0.0</license.version> - <jredmine.version>1.0.0-rc-2</jredmine.version> + <jredmine.version>1.0.0</jredmine.version>  <license.licenseName>lgpl_v3</license.licenseName>

1 0

r45 - in trunk/maven-jredmine-plugin/src/main: java/org/nuiton/jredmine/plugin java/org/nuiton/jredmine/plugin/report resources
by tchemit＠users.nuiton.org 07 Nov '09

07 Nov '09

Author: tchemit Date: 2009-11-07 11:48:58 +0100 (Sat, 07 Nov 2009) New Revision: 45 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/IssuesCollector.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java trunk/maven-jredmine-plugin/src/main/resources/redmine-report.properties trunk/maven-jredmine-plugin/src/main/resources/redmine-report_fr.properties Log: Anomalie #124: La g?\195?\169n?\195?\169ration du changes.xml n'est pas correcte Anomalie #125: Les heures dans le rapport des demandes sont pas correc 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 2009-11-07 10:47:15 UTC (rev 44) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2009-11-07 10:48:58 UTC (rev 45) @@ -20,49 +20,32 @@ */ package org.nuiton.jredmine.plugin; -import java.io.File; -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; import org.apache.maven.plugin.MojoExecutionException; -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.*; 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.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.Project; -import org.nuiton.jredmine.model.Tracker; -import org.nuiton.jredmine.model.User; -import org.nuiton.jredmine.model.Version; import org.nuiton.jredmine.RedmineServiceException; +import org.nuiton.jredmine.model.*; import org.nuiton.plugin.PluginHelper; +import java.io.File; +import java.util.*; +import java.util.Map.Entry; + /** * Generates the changes.xml file from the Redmine's server to be used * by the maven-changes-plugin to generates the release report and send * the annoncement mail at a release time. * - * @since 1.0.0 - * * @author tchemit * @goal generate-changes + * @since 1.0.0 */ public class GenerateChangesMojo extends AbstractRedmineMojo implements IssueCollectorConfiguration { /** * The actions understood by the changes.xml format. - * */ enum Actions { @@ -71,6 +54,7 @@ update, remove } + /** * The path of the <code>changes.xml</code> file that will be converted into an HTML report. * @@ -81,7 +65,7 @@ protected File xmlPath; /** * The description of the release. - * + * * Note : if not sets - will use the redmine version description (if exists). * * @parameter expression="${releaseDescription}" @@ -107,13 +91,13 @@ protected boolean onlyCurrentVersion; /** * The action mapping to the redmine tracker ids. - * + * * Possible actions are {@code add}, {@code fix}, {@code update}, {@code remove} - * + * * The syntax of mapping is {@code action:id [,action:id]*} - * + * * Example : - * + * * <pre> * fix:1 * fix:1, add:1 @@ -126,18 +110,20 @@ protected String actionMapping; /** * The comma separated list of statuses ids to include in the changes.xml - * + * * Note : If a value is set to empty - that means to include all status. * + * * @parameter expression="${redmine.statusIds}" * @since 1.0.0 */ protected String statusIds; /** * The comma separated list of category ids to include in the changes.xml - * + * * Note : If a value is set to empty - that means to include all categories. * + * * @parameter expression="${redmine.categoryIds}" * @since 1.0.0 */ @@ -558,20 +544,39 @@ if (issue.getDueDate() != null) { action.setDate(dateFormat.format(issue.getDueDate())); } else { - getLog().warn("issue " + issue.getSubject() + " has no dueDate..."); + if (verbose) { + getLog().warn("issue " + issue.getSubject() + " has no dueDate..."); + } } - int id = issue.getAssignedToId(); + User a; + int id; + + // created by + + id = issue.getAuthorId(); if (id == 0) { - getLog().warn("issue " + issue.getSubject() + " is not assigned to any user, this is not normal..."); + getLog().warn("issue " + issue.getSubject() + " is not created to any user, this is not normal..."); id = issue.getAuthorId(); } - User a = ModelHelper.byId(issue.getAuthorId(), users); + a = ModelHelper.byId(id, users); + if (a != null) { action.setDueTo(a.getFirstname() + " " + a.getLastname()); action.setDueToEmail(a.getMail()); + } + // resolved by + + id = issue.getAssignedToId(); + if (id == 0) { + getLog().warn("issue " + issue.getSubject() + " is not assigned to any user, this is not normal..."); + id = issue.getAuthorId(); + } + a = ModelHelper.byId(id, users); + if (a != null) { + //TODO should check this is a developper name on pom.xml action.setDev(a.getLogin()); } 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 2009-11-07 10:47:15 UTC (rev 44) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java 2009-11-07 10:48:58 UTC (rev 45) @@ -87,7 +87,7 @@ /** * Collects the issues given the configuration passed. * - * @param service + * @param service redmine service to obtain datas * @param config the collector configuration * * @throws RedmineServiceException if any pb while retreave datas from redmine @@ -189,7 +189,7 @@ /** * Prepare the collector filters due to the given collector configuration. * - * @param service + * @param service redmine service to obtain datas * @param config the collector configuration * @throws RedmineServiceException if any pb whiile retreaving redmine's datas */ 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 2009-11-07 10:47:15 UTC (rev 44) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java 2009-11-07 10:48:58 UTC (rev 45) @@ -301,7 +301,7 @@ * @param log the logger * @param columnNames The names of the columns to include in the report * @param groupBy the group by column name (or null if not grouped) - * @throws MavenReportException + * @throws MavenReportException if any pb */ public IssueReportGenerator(Log log, String columnNames, String groupBy) throws MavenReportException { @@ -669,7 +669,7 @@ } protected void sinkDate(Sink sink, Date d) { - String text = null; + String text; if (d == null) { text = " - "; } else { @@ -679,7 +679,7 @@ } protected void sinkI18nAble(Sink sink, int id, I18nAble obj) { - String t = null; + String t; if (obj == null) { t = id == 0 ? " - " : id + ""; } else { Modified: trunk/maven-jredmine-plugin/src/main/resources/redmine-report.properties =================================================================== --- trunk/maven-jredmine-plugin/src/main/resources/redmine-report.properties 2009-11-07 10:47:15 UTC (rev 44) +++ trunk/maven-jredmine-plugin/src/main/resources/redmine-report.properties 2009-11-07 10:48:58 UTC (rev 45) @@ -50,7 +50,7 @@ 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 +report.date.format=yyy-MM-dd 'at' hh:mm report.label.key=Key report.label.summary=Summary report.label.status=Status Modified: trunk/maven-jredmine-plugin/src/main/resources/redmine-report_fr.properties =================================================================== --- trunk/maven-jredmine-plugin/src/main/resources/redmine-report_fr.properties 2009-11-07 10:47:15 UTC (rev 44) +++ trunk/maven-jredmine-plugin/src/main/resources/redmine-report_fr.properties 2009-11-07 10:48:58 UTC (rev 45) @@ -50,7 +50,7 @@ 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 +report.date.format=dd/MM/yyyy '\u00E0' hh:mm report.label.key=Sujet report.label.summary=Description report.label.status=Statut

1 0

r44 - trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model
by tchemit＠users.nuiton.org 07 Nov '09

07 Nov '09

Author: tchemit Date: 2009-11-07 11:47:15 +0100 (Sat, 07 Nov 2009) New Revision: 44 Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java Log: remove unsued code 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 2009-11-02 02:03:43 UTC (rev 43) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java 2009-11-07 10:47:15 UTC (rev 44) @@ -29,35 +29,7 @@ * @since 1.0.0 */ public class Issue implements IdAble { -// -// public static Issue[] filterByTrackerId(int trackerId, Issue... issues) { -// List<Issue> result = new ArrayList<Issue>(); -// for (Issue i : issues) { -// if (i.getTrackerId() == trackerId) { -// result.add(i); -// } -// } -// return result.toArray(new Issue[result.size()]); -// } -// -// public static Issue[] filterByVersionId(int versionId, Issue... issues) { -// List<Issue> result = new ArrayList<Issue>(); -// for (Issue i : issues) { -// if (i.getFixedVersionId() == versionId) { -// result.add(i); -// } -// } -// return result.toArray(new Issue[result.size()]); -// } -// -// public static Issue getIssueById(int id, Issue... issues) { -// for (Issue i : issues) { -// if (i.getId() == id) { -// return i; -// } -// } -// return null; -// } + protected int assignedToId; protected int authorId; protected int categoryId;

1 0

r43 - in trunk: jredmine-client/src/site jredmine-client/src/site/apt maven-jredmine-plugin/src/site src/site
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 03:03:43 +0100 (Mon, 02 Nov 2009) New Revision: 43 Modified: trunk/jredmine-client/src/site/apt/index.apt trunk/jredmine-client/src/site/site.xml trunk/maven-jredmine-plugin/src/site/site.xml trunk/src/site/site.xml Log: fix site Modified: trunk/jredmine-client/src/site/apt/index.apt =================================================================== --- trunk/jredmine-client/src/site/apt/index.apt 2009-11-02 01:42:52 UTC (rev 42) +++ trunk/jredmine-client/src/site/apt/index.apt 2009-11-02 02:03:43 UTC (rev 43) @@ -110,6 +110,7 @@ et transforme les données retournées en xml en objets java. La classe à utiliser est la suivante + -------------------------------------------------------------------------------- org.nuiton.jredmine.DefaultRedmineService -------------------------------------------------------------------------------- Modified: trunk/jredmine-client/src/site/site.xml =================================================================== --- trunk/jredmine-client/src/site/site.xml 2009-11-02 01:42:52 UTC (rev 42) +++ trunk/jredmine-client/src/site/site.xml 2009-11-02 02:03:43 UTC (rev 43) @@ -9,7 +9,7 @@ <body> <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> + <item name="${project.name}" href="${project.url}"/> </breadcrumbs> <menu ref="parent"/> @@ -24,12 +24,18 @@ </menu> <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-model/${project.version}/${project.build.finalName}.jar" + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}.jar" name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-model/${project.version}/${project.build.finalName}-javadoc.jar" + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-javadoc.jar" name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-model/${project.version}/${project.build.finalName}-sources.jar" + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-tests.jar" + name="Test Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-test-javadoc.jar" + name="Test Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-test-sources.jar" + name="Test Sources (jar)"/> </menu> <menu ref="reports"/> Modified: trunk/maven-jredmine-plugin/src/site/site.xml =================================================================== --- trunk/maven-jredmine-plugin/src/site/site.xml 2009-11-02 01:42:52 UTC (rev 42) +++ trunk/maven-jredmine-plugin/src/site/site.xml 2009-11-02 02:03:43 UTC (rev 43) @@ -9,7 +9,7 @@ <body> <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> + <item name="${project.name}" href="${project.url}"/> </breadcrumbs> <menu ref="parent"/> @@ -39,13 +39,13 @@ <item name="issues-report-by-version" href="issues-report-by-version-mojo.html"/> </item> </menu> - + <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/maven-redmine-plugin/${project.version}/${project.build.finalName}.jar" + <item href="${repository.home.url}/org/nuiton/jredmine/maven-jredmine-plugin/${project.version}/${project.build.finalName}.jar" name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/maven-redmine-plugin/${project.version}/${project.build.finalName}-javadoc.jar" + <item href="${repository.home.url}/org/nuiton/jredmine/maven-jredmine-plugin/${project.version}/${project.build.finalName}-javadoc.jar" name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/maven-redmine-plugin/${project.version}/${project.build.finalName}-sources.jar" + <item href="${repository.home.url}/org/nuiton/jredmine/maven-jredmine-plugin/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> </menu> Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-11-02 01:42:52 UTC (rev 42) +++ trunk/src/site/site.xml 2009-11-02 02:03:43 UTC (rev 43) @@ -24,8 +24,16 @@ <body> + <links> + <item name="Chorem" href="http://www.chorem.org"/> + <item name="Nuiton" href="http://www.nuiton.org"/> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="${project.organization.name}" href="${project.organization.url}"/> + <item name="dépôt maven" href="${repository.home.url}"/> + </links> + <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> + <item name="${project.name}" href="${project.url}"/> </breadcrumbs> <menu name="Utilisateur"> @@ -37,7 +45,7 @@ </menu> <menu ref="modules"/> - + <menu ref="reports"/> </body>

1 0

r42 - tags/jredmine-1.0.0/maven-jredmine-plugin/src/site
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 02:42:52 +0100 (Mon, 02 Nov 2009) New Revision: 42 Modified: tags/jredmine-1.0.0/maven-jredmine-plugin/src/site/site.xml Log: fix site Modified: tags/jredmine-1.0.0/maven-jredmine-plugin/src/site/site.xml =================================================================== --- tags/jredmine-1.0.0/maven-jredmine-plugin/src/site/site.xml 2009-11-02 01:39:34 UTC (rev 41) +++ tags/jredmine-1.0.0/maven-jredmine-plugin/src/site/site.xml 2009-11-02 01:42:52 UTC (rev 42) @@ -41,11 +41,11 @@ </menu> <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/maven-redmine-plugin/${project.version}/${project.build.finalName}.jar" + <item href="${repository.home.url}/org/nuiton/jredmine/maven-jredmine-plugin/${project.version}/${project.build.finalName}.jar" name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/maven-redmine-plugin/${project.version}/${project.build.finalName}-javadoc.jar" + <item href="${repository.home.url}/org/nuiton/jredmine/maven-jredmine-plugin/${project.version}/${project.build.finalName}-javadoc.jar" name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/maven-redmine-plugin/${project.version}/${project.build.finalName}-sources.jar" + <item href="${repository.home.url}/org/nuiton/jredmine/maven-jredmine-plugin/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> </menu>

1 0