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

r257 - in trunk: jredmine-client/src/main/java/org/nuiton/jredmine jredmine-client/src/test/java/org/nuiton/jredmine jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report
by tchemit＠users.nuiton.org March 25, 2012

March 25, 2012

Author: tchemit Date: 2012-03-25 17:48:53 +0200 (Sun, 25 Mar 2012) New Revision: 257 Url: http://nuiton.org/repositories/revision/jredmine/257 Log: refs #2030 (introduce the jersey api, and change redmine service api to no more have RestClient api pubic, apply it to mojo) Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineAnonymousServiceJersey.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceConfiguration.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceImplementorJersey.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceJersey.java trunk/jredmine-client/src/test/java/org/nuiton/jredmine/FakeRedmineServiceConfiguration.java trunk/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousServiceJerseyTest.java Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceImplementor.java trunk/jredmine-client/src/test/java/org/nuiton/jredmine/AbstractRedmineServiceTest.java trunk/jredmine-client/src/test/java/org/nuiton/jredmine/TestHelper.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 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-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java 2012-03-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java 2012-03-25 15:48:53 UTC (rev 257) @@ -26,8 +26,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.io.rest.RestClient; -import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.model.Attachment; import org.nuiton.jredmine.model.Issue; import org.nuiton.jredmine.model.IssueCategory; @@ -50,7 +48,7 @@ * * @author tchemit <chemit(a)codelutin.com> * @plexus.component role="org.nuiton.jredmine.RedmineAnonymousService" role-hint="default" - * @see RestClientConfiguration#isAnonymous() + * @see RedmineServiceConfiguration#isAnonymous() * @since 1.0.3 */ public class DefaultRedmineAnonymousService implements RedmineServiceImplementor, RedmineAnonymousService { @@ -207,7 +205,7 @@ /// RedmineServiceImplementor implementation /////////////////////////////////////////////////////////////////////////// @Override - public RedmineServiceImplementor init(RestClientConfiguration configuration) throws RedmineServiceException { + public RedmineServiceImplementor init(RedmineServiceConfiguration configuration) throws RedmineServiceException { // Force to not be loggued configuration.setAnonymous(true); if (log.isDebugEnabled()) { @@ -217,13 +215,18 @@ return result; } +// @Override +// public RedmineServiceImplementor init(RestClient session) throws RedmineServiceException { +// if (log.isDebugEnabled()) { +// log.debug("init session for " + this); +// } +// checkNotLoggued(session); +// return delegateImplementor.init(session); +// } + @Override - public RedmineServiceImplementor init(RestClient session) throws RedmineServiceException { - if (log.isDebugEnabled()) { - log.debug("init session for " + this); - } - checkNotLoggued(session); - return delegateImplementor.init(session); + public int ping() { + return delegateImplementor.ping(); } @Override @@ -265,8 +268,8 @@ } @Override - public void checkNotLoggued(RestClient session) throws IllegalStateException, RedmineServiceLoginException, NullPointerException { - delegateImplementor.checkNotLoggued(session); + public void checkNotLoggued() throws IllegalStateException, RedmineServiceLoginException, NullPointerException { + delegateImplementor.checkNotLoggued(); } @Override Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java 2012-03-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java 2012-03-25 15:48:53 UTC (rev 257) @@ -27,7 +27,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.io.rest.RestClient; -import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.model.Attachment; import org.nuiton.jredmine.model.News; import org.nuiton.jredmine.model.Project; @@ -50,15 +49,15 @@ /// RedmineServiceImplementor implementation /////////////////////////////////////////////////////////////////////////// @Override - public RedmineServiceImplementor init(RestClientConfiguration configuration) throws RedmineServiceException { + public RedmineServiceImplementor init(RedmineServiceConfiguration configuration) throws RedmineServiceException { RedmineServiceImplementor result = delegateImplementor.init(configuration); return result; } - @Override - public RedmineServiceImplementor init(RestClient session) throws RedmineServiceException { - return delegateImplementor.init(session); - } +// @Override +// public RedmineServiceImplementor init(RestClient session) throws RedmineServiceException { +// return delegateImplementor.init(session); +// } /////////////////////////////////////////////////////////////////////////// /// RedmineLogguedService implementation Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java 2012-03-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java 2012-03-25 15:48:53 UTC (rev 257) @@ -27,7 +27,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.io.rest.RestClient; -import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.io.rest.RestException; import org.nuiton.io.rest.RestRequest; import org.nuiton.jredmine.model.io.xpp3.RedmineXpp3Helper; @@ -82,13 +81,12 @@ } @Override - public RedmineServiceImplementor init(RestClientConfiguration configuration) throws RedmineServiceException { + public RedmineServiceImplementor init(RedmineServiceConfiguration configuration) throws RedmineServiceException { session.setConfiguration(configuration); RedmineServiceImplementor result = init(session); return result; } - @Override public RedmineServiceImplementor init(RestClient session) throws RedmineServiceException { if (init) { throw new IllegalStateException( @@ -110,6 +108,11 @@ } @Override + public int ping() { + return 0; + } + + @Override public void destroy() throws RedmineServiceException { checkInit(); try { @@ -183,7 +186,7 @@ } @Override - public void checkNotLoggued(RestClient session) throws RedmineServiceLoginException, NullPointerException { + public void checkNotLoggued() throws RedmineServiceLoginException, NullPointerException { // checkInit(); checkSessionNotNull(session); checkSessionConfigurationNotNull(session); Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineAnonymousServiceJersey.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineAnonymousServiceJersey.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineAnonymousServiceJersey.java 2012-03-25 15:48:53 UTC (rev 257) @@ -0,0 +1,300 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.jredmine; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.io.rest.RestClient; +import org.nuiton.io.rest.RestClientConfiguration; +import org.nuiton.jredmine.model.Attachment; +import org.nuiton.jredmine.model.Issue; +import org.nuiton.jredmine.model.IssueCategory; +import org.nuiton.jredmine.model.IssuePriority; +import org.nuiton.jredmine.model.IssueStatus; +import org.nuiton.jredmine.model.News; +import org.nuiton.jredmine.model.Project; +import org.nuiton.jredmine.model.TimeEntry; +import org.nuiton.jredmine.model.Tracker; +import org.nuiton.jredmine.model.User; +import org.nuiton.jredmine.model.Version; + +import static org.nuiton.jredmine.request.RedmineRequestFactory.DEFAULT_REQUESTS; + +/** + * Implemntation of the {@link RedmineAnonymousService} using Jersey for REST + * query instead of the {@link RestClient} api. + * + * @author tchemit <chemit(a)codelutin.com> + * @plexus.component role="org.nuiton.jredmine.RedmineAnonymousService" role-hint="jersey" + * @see RestClientConfiguration#isAnonymous() + * @since 1.4 + */ +public class RedmineAnonymousServiceJersey implements RedmineServiceImplementor, RedmineAnonymousService { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(RedmineAnonymousServiceJersey.class); + + /** @plexus.requirement role="org.nuiton.jredmine.RedmineServiceImplementor" role-hint="jersey" */ + protected RedmineServiceImplementor delegateImplementor; + + public RedmineAnonymousServiceJersey() { + } + + /////////////////////////////////////////////////////////////////////////// + /// RedmineAnonymousService implementation + /////////////////////////////////////////////////////////////////////////// + + @Override + public IssueStatus[] getIssueStatuses() throws RedmineServiceException { + return getDatas(DEFAULT_REQUESTS.GET_ISSUE_STATUS_LIST.requestName(), + IssueStatus.class + ); + } + + @Override + public IssuePriority[] getIssuePriorities() throws RedmineServiceException { + return getDatas(DEFAULT_REQUESTS.GET_ISSUE_PRIORITY_LIST, + IssuePriority.class + ); + } + + @Override + public Project[] getProjects() throws RedmineServiceException { + return getDatas(DEFAULT_REQUESTS.GET_PROJECT_LIST, Project.class); + } + + @Override + public IssueCategory[] getIssueCategories(String projectName) throws RedmineServiceException { + return getDatas(DEFAULT_REQUESTS.GET_ISSUE_CATEGORY_LIST, + IssueCategory.class, + projectName + ); + } + + @Override + public Project getProject(String projectName) throws RedmineServiceException { + return getData(DEFAULT_REQUESTS.GET_PROJECT, + Project.class, + projectName + ); + } + + @Override + public Tracker[] getTrackers(String projectName) throws RedmineServiceException { + return getDatas(DEFAULT_REQUESTS.GET_TRACKER_LIST, + Tracker.class, + projectName + ); + } + + @Override + public News[] getNews(String projectName) throws RedmineServiceException { + return getDatas(DEFAULT_REQUESTS.GET_NEWS_LIST, + News.class, + projectName + ); + } + + @Override + public User[] getProjectMembers(String projectName) throws RedmineServiceException { + return getDatas(DEFAULT_REQUESTS.GET_USER_LIST, + User.class, + projectName + ); + } + + @Override + public Version[] getVersions(String projectName) throws RedmineServiceException { + return getDatas(DEFAULT_REQUESTS.GET_VERSION_LIST, + Version.class, + projectName + ); + } + + @Override + public Version getVersion(String projectName, + String versionName) throws RedmineServiceException { + return getData(DEFAULT_REQUESTS.GET_VERSION, + Version.class, + projectName, + versionName + ); + } + + @Override + public Attachment[] getAttachments(String projectName, + String versionName) throws RedmineServiceException { + return getDatas(DEFAULT_REQUESTS.GET_ATTACHMENTS_LIST, + Attachment.class, + projectName, + versionName + ); + } + + @Override + public Issue[] getIssues(String projectName, + String versionName) throws RedmineServiceException { + return getDatas(DEFAULT_REQUESTS.GET_ISSUE_LIST, + Issue.class, + projectName, + versionName + ); + } + + @Override + public TimeEntry[] getIssueTimeEntries(String projectName, + String issueId) throws RedmineServiceException { + return getDatas(DEFAULT_REQUESTS.GET_ISSUE_TIME_ENTRY_LIST, + TimeEntry.class, + projectName, + issueId + ); + } + + @Override + public Issue[] getIssues(String projectName) throws RedmineServiceException { + Issue[] result = getDatas(DEFAULT_REQUESTS.GET_PROJECT_ISSUES, + Issue.class, + projectName + ); + return result; + } + + @Override + public Issue[] getOpenedIssues(String projectName) throws RedmineServiceException { + Issue[] result = getDatas(DEFAULT_REQUESTS.GET_PROJECT_OPENED_ISSUES, + Issue.class, + projectName + ); + return result; + } + + @Override + public Issue[] getClosedIssues(String projectName) throws RedmineServiceException { + Issue[] result = getDatas(DEFAULT_REQUESTS.GET_PROJECT_CLOSED_ISSUES, + Issue.class, + projectName + ); + return result; + } + + /////////////////////////////////////////////////////////////////////////// + /// RedmineServiceImplementor implementation + /////////////////////////////////////////////////////////////////////////// + @Override + public RedmineServiceImplementor init(RedmineServiceConfiguration configuration) throws RedmineServiceException { + // Force to not be loggued + configuration.setAnonymous(true); + if (log.isDebugEnabled()) { + log.debug("init configuration for " + this); + } + RedmineServiceImplementor result = delegateImplementor.init(configuration); + return result; + } + + @Override + public int ping() { + int status = delegateImplementor.ping(); + return status; + } + + @Override + public <T> T getData(String requestName, + Class<T> type, + Object... args) throws RedmineServiceException { + return delegateImplementor.getData(requestName, type, args); + } + + @Override + public <T> T[] getDatas(String requestName, + Class<T> type, + Object... args) throws RedmineServiceException { + return delegateImplementor.getDatas(requestName, type, args); + } + + @Override + public <T> T sendData(String requestName, + Class<T> klazz, + Object... args) throws RedmineServiceException { + return delegateImplementor.sendData(requestName, klazz, args); + } + + @Override + public <T> T[] sendDatas(String requestName, + Class<T> klazz, + Object... args) throws RedmineServiceException { + return delegateImplementor.sendDatas(requestName, klazz, args); + } + + @Override + public boolean isInit() { + return delegateImplementor.isInit(); + } + + @Override + public void destroy() throws RedmineServiceException { + delegateImplementor.destroy(); + } + + @Override + public void checkNotLoggued() throws IllegalStateException, RedmineServiceLoginException, NullPointerException { + delegateImplementor.checkNotLoggued(); + } + + @Override + public void checkLoggued() throws IllegalStateException, RedmineServiceLoginException, NullPointerException { + delegateImplementor.checkLoggued(); + } + + /////////////////////////////////////////////////////////////////////////// + /// Internal methods + /////////////////////////////////////////////////////////////////////////// + + protected <T> T getData(DEFAULT_REQUESTS request, + Class<T> type, + Object... args) throws RedmineServiceException { + return delegateImplementor.getData(request.requestName(), type, args); + } + + protected <T> T[] getDatas(DEFAULT_REQUESTS request, + Class<T> type, + Object... args) throws RedmineServiceException { + return delegateImplementor.getDatas(request.requestName(), type, args); + } + + protected <T> T sendData(DEFAULT_REQUESTS request, + Class<T> klazz, + Object... args) throws RedmineServiceException { + return delegateImplementor.sendData(request.requestName(), klazz, args); + } + + protected <T> T[] sendDatas(DEFAULT_REQUESTS request, + Class<T> klazz, + Object... args) throws RedmineServiceException { + return delegateImplementor.sendDatas(request.requestName(), klazz, args); + } + +} Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineAnonymousServiceJersey.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceConfiguration.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceConfiguration.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceConfiguration.java 2012-03-25 15:48:53 UTC (rev 257) @@ -0,0 +1,62 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.jredmine; + +import org.nuiton.io.rest.RestClientConfiguration; + +import java.net.URL; + +/** + * Contract of a redmine service configuration. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public interface RedmineServiceConfiguration extends RestClientConfiguration { + + String getEncoding(); + + void setEncoding(String encoding); + + String getRestPassword(); + + void setRestPassword(String restPassword); + + URL getRestUrl(); + + void setRestUrl(URL restUrl); + + String getRestUsername(); + + void setRestUsername(String restUsername); + + boolean isVerbose(); + + void setVerbose(boolean verbose); + + boolean isAnonymous(); + + void setAnonymous(boolean anonymous); +} Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceImplementor.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceImplementor.java 2012-03-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceImplementor.java 2012-03-25 15:48:53 UTC (rev 257) @@ -24,8 +24,6 @@ */ package org.nuiton.jredmine; -import org.nuiton.io.rest.RestClient; -import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.rest.RedmineRestClient; /** @@ -51,23 +49,13 @@ boolean isInit(); /** - * Initialize the service given a redmine client already initialized. - * - * @param session the redmine client to be used by the service - * @return the initialized service - * @throws RedmineServiceException if any pb - * @see RedmineRestClient - */ - RedmineServiceImplementor init(RestClient session) throws RedmineServiceException; - - /** * Initialize the service given a client configuration. * * @param configuration the configuration to be used to init the internal redmine client * @return the initialized service * @throws RedmineServiceException if any pb */ - RedmineServiceImplementor init(RestClientConfiguration configuration) throws RedmineServiceException; + RedmineServiceImplementor init(RedmineServiceConfiguration configuration) throws RedmineServiceException; /** * Close the service and destroy any connexion to the redmine service. @@ -77,6 +65,14 @@ void destroy() throws RedmineServiceException; /** + * Try to ping the redmine remote service and return his status. + * + * @return status code of the ping request, or {@code -1} if something was + * wrong (unknown host,...). + */ + int ping(); + + /** * Generic method to obtain a single data from a redmine server. * * @param <T> the type of data to obtain @@ -139,9 +135,8 @@ /** * Checks if the current session is anonymous. * - * @param session the session to test * @throws RedmineServiceLoginException if not anonymous * @throws NullPointerException if something is null */ - void checkNotLoggued(RestClient session) throws RedmineServiceLoginException, NullPointerException; + void checkNotLoggued() throws RedmineServiceLoginException, NullPointerException; } Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceImplementorJersey.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceImplementorJersey.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceImplementorJersey.java 2012-03-25 15:48:53 UTC (rev 257) @@ -0,0 +1,355 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.jredmine; + +import com.google.common.base.Preconditions; +import com.sun.jersey.api.client.Client; +import com.sun.jersey.api.client.ClientHandlerException; +import com.sun.jersey.api.client.ClientResponse; +import com.sun.jersey.api.client.WebResource; +import com.sun.jersey.core.util.MultivaluedMapImpl; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.io.rest.RestClientConfiguration; +import org.nuiton.jredmine.model.io.xpp3.RedmineXpp3Helper; +import org.nuiton.jredmine.request.RedmineRequest; +import org.nuiton.jredmine.request.RedmineRequestFactory; + +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.MultivaluedMap; +import java.io.File; +import java.io.InputStream; +import java.util.Map; + +/** + * Implementation of {@link RedmineServiceImplementor} using Jersey REST api. + * + * @author tchemit <chemit(a)codelutin.com> + * @plexus.component role="org.nuiton.jredmine.RedmineServiceImplementor" role-hint="jersey" + * @see RedmineServiceImplementor + * @since 1.4 + */ +public class RedmineServiceImplementorJersey implements RedmineServiceImplementor { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(RedmineServiceImplementorJersey.class); + + protected RestClientConfiguration configuration; + + /** request factory. */ + protected final RedmineRequestFactory requestFactory; + + /** xpp3Helper to transform xml stream to pojo */ + protected final RedmineXpp3Helper xpp3Helper; + + protected Client client; + + /** internal state to known if service was init */ + protected boolean init; + + public RedmineServiceImplementorJersey() { + xpp3Helper = new RedmineXpp3Helper(); + requestFactory = new RedmineRequestFactory(); + requestFactory.addDefaultRequests(); + } + + /////////////////////////////////////////////////////////////////////////// + /// RedmineServiceImplementor implementation + /////////////////////////////////////////////////////////////////////////// + + @Override + public boolean isInit() { + return init; + } + + @Override + public RedmineServiceImplementor init(RedmineServiceConfiguration configuration) throws RedmineServiceException { + Preconditions.checkNotNull(configuration); + this.configuration = configuration; + client = Client.create(); + init = true; + return this; + } + + @Override + public void destroy() throws RedmineServiceException { + checkInit(); + init = false; + configuration = null; + client.destroy(); + client = null; + } + + @Override + public <T> T getData(String requestName, + Class<T> type, + Object... args) throws RedmineServiceException { + checkInit(); + InputStream stream = askDataStream(requestName, args); + T result = getDataFromStream(type, stream); + return result; + } + + @Override + public <T> T[] getDatas(String requestName, + Class<T> type, + Object... args) throws RedmineServiceException { + checkInit(); + InputStream stream = askDataStream(requestName, args); + T[] result = getDatasFromStream(type, stream); + return result; + } + + @Override + public <T> T sendData(String requestName, + Class<T> klazz, + Object... args) throws RedmineServiceException { + checkLoggued(); + InputStream stream = sendDataStream(requestName, args); + T result = getDataFromStream(klazz, stream); + return result; + } + + @Override + public <T> T[] sendDatas(String requestName, + Class<T> klazz, + Object... args) throws RedmineServiceException { + checkLoggued(); + InputStream stream = sendDataStream(requestName, args); + T[] result = getDatasFromStream(klazz, stream); + return result; + } + + @Override + public void checkLoggued() throws IllegalStateException, RedmineServiceLoginException, NullPointerException { + checkInit(); + //TODO + } + + @Override + public void checkNotLoggued() throws RedmineServiceLoginException, NullPointerException { + checkInit(); + //TODO + } + + @Override + public int ping() { + WebResource request = requestToWebResource("ping"); + int status; + try { + ClientResponse clientResponse = request.head(); + status = clientResponse.getStatus(); + } catch (ClientHandlerException e) { + if (log.isErrorEnabled()) { + log.error("Could not ping " + request.toString(), e); + } + status = -1; + } + return status; + } + + protected <T> T getDataFromStream(Class<T> type, + InputStream stream) throws RedmineServiceException { + if (stream == null) { + return null; + } + + try { + T result = xpp3Helper.readObject(type, stream, true); + return result; + } catch (Exception ex) { + throw new RedmineServiceException( + "could not obtain datas of type " + type + " for reason " + + ex.getMessage(), ex); + } + } + + protected <T> T[] getDatasFromStream(Class<T> type, + InputStream stream) throws RedmineServiceException { + if (stream == null) { + return null; + } + try { + T[] result = xpp3Helper.readObjects(type, stream, true); + return result; + } catch (Exception ex) { + throw new RedmineServiceException( + "could not obtain datas of type " + type + " for reason " + + ex.getMessage(), ex); + } + } + + protected InputStream askDataStream(String requestName, + Object... args) throws RedmineServiceException { + + try { + + // get the webresource to grab + WebResource webResource = requestToWebResource(requestName, args); + + // transform it to a input stream + InputStream result = webResource.accept( + MediaType.APPLICATION_XML_TYPE). + get(InputStream.class); + return result; + } catch (Exception e) { + throw new RedmineServiceException( + "could not obtain data stream for request " + requestName + + " for reason " + e.getMessage(), e); + } + } + + protected WebResource requestToWebResource(String requestName, + Object... args) { + + RedmineRequest request = requestFactory.getRequest(requestName, args); + + String url = configuration.getRestUrl().toString(); + for (String path : request.getPath()) { + url += '/' + path; + } + WebResource result = client.resource(url); + String[] parameters = request.getParameters(); + Map<String, File> attachments = request.getAttachments(); + + if (attachments == null) { + + // not a multi-part request + + if (parameters.length > 0) { + + MultivaluedMap<String, String> params = new MultivaluedMapImpl(); + + // add parameters + + int nbParams = parameters.length / 2; + for (int i = 0; i < nbParams; i++) { + String key = parameters[2 * i]; + String value = parameters[2 * i + 1]; + if (value == null) { + if (log.isDebugEnabled()) { + log.debug("skip null parameter " + key); + } + continue; + } + params.add(key, value); + } + result = result.queryParams(params); + } + } else { + + // multi-part request + +// List<Part> paramParts = new ArrayList<Part>(); +// +// if (parameters.length > 0) { +// +// // add parameters as part of multi-part +// +// int nbParams = parameters.length / 2; +// for (int i = 0; i < nbParams; i++) { +// String key = parameters[2 * i]; +// String value = parameters[2 * i + 1]; +// if (value == null) { +// if (log.isDebugEnabled()) { +// log.debug("skip null parameter " + key); +// } +// continue; +// } +// paramParts.add(new StringPart(key, value)); +// if (log.isDebugEnabled()) { +// log.debug("add parameter [" + key + "]=" + value); +// } +// } +// } +// +// // add file parts +// for (Map.Entry<String, File> entry : attachments.entrySet()) { +// String key = entry.getKey(); +// File file = entry.getValue(); +// if (log.isDebugEnabled()) { +// log.debug("add attachment " + key + "=" + file); +// } +// paramParts.add(new FilePart( +// key, +// file.getName(), +// file, +// FilePart.DEFAULT_CONTENT_TYPE, +// configuration.getEncoding()) +// ); +// } +// if (attachments.isEmpty()) { +// log.warn("no attachment in a multi-part request!"); +// } +// +// Part[] parts = paramParts.toArray(new Part[paramParts.size()]); +// +// MultipartRequestEntity entity = +// new MultipartRequestEntity(parts, gm.getParams()); +// if (log.isDebugEnabled()) { +// entity.writeRequest(System.out); +// } +// gm.setRequestEntity(entity); +//// gm.addRequestHeader("content-type", "multipart/form-data"); +// gm.addRequestHeader("content-type", entity.getContentType()); +// gm.addRequestHeader("content-length", entity.getContentLength() + +// ""); +// if (showRequest) { +// log.info("content-type : " + entity.getContentType() + +// ", content-length : " + entity.getContentLength()); +// } + } + if (log.isInfoEnabled()) { + log.info("request = " + result.toString()); + } + return result; + } + + protected InputStream sendDataStream(String requestName, + Object... args) throws RedmineServiceException { + +// RestRequest request = requestFactory.getRequest(requestName, args); + + // obtain data from rest client + try { + +// InputStream stream = session.sendData(r); + InputStream stream = null; + return stream; + } catch (Exception e) { + throw new RedmineServiceException( + "could not send data stream for request " + requestName + + " for reason " + e.getMessage(), e); + } + } + + protected void checkInit() throws IllegalStateException { + if (!init) { + throw new IllegalStateException( + "the client " + this + " is not init!"); + } + } +} Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceImplementorJersey.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceJersey.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceJersey.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceJersey.java 2012-03-25 15:48:53 UTC (rev 257) @@ -0,0 +1,112 @@ +package org.nuiton.jredmine; + +import org.nuiton.jredmine.model.Attachment; +import org.nuiton.jredmine.model.News; +import org.nuiton.jredmine.model.Project; +import org.nuiton.jredmine.model.TimeEntry; +import org.nuiton.jredmine.model.Version; + +import static org.nuiton.jredmine.request.RedmineRequestFactory.DEFAULT_REQUESTS; + +/** + * Implementation fo the {@link RedmineService} using Jersey REST layer. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class RedmineServiceJersey extends RedmineAnonymousServiceJersey implements RedmineService { + + /////////////////////////////////////////////////////////////////////////// + /// RedmineLogguedService implementation + /////////////////////////////////////////////////////////////////////////// + + @Override + public Project[] getUserProjects() throws RedmineServiceException { + checkLoggued(); + Project[] result = getDatas(DEFAULT_REQUESTS.GET_USER_PROJECTS, + Project.class); + return result; + } + + @Override + public Version addVersion(String projectName, + Version version) throws RedmineServiceException { + + // send data and obtain created version + Version result = sendData(DEFAULT_REQUESTS.ADD_VERSION, + Version.class, + projectName, + version + ); + return result; + } + + @Override + public Version updateVersion(String projectName, + Version version) throws RedmineServiceException { + + // send data and obtain updated version + Version result = sendData(DEFAULT_REQUESTS.UPDATE_VERSION, + Version.class, + projectName, + version + ); + return result; + } + + @Override + public Version nextVersion(String projectName, + String oldVersionName, + Version newVersion) throws RedmineServiceException { + + // send data and obtain updated or created new version + Version result = sendData(DEFAULT_REQUESTS.NEXT_VERSION, + Version.class, + projectName, + newVersion, + oldVersionName + ); + return result; + } + + @Override + public Attachment addAttachment(String projectName, + String versionName, + Attachment attachement) throws RedmineServiceException { + + // send data and obtain created attachment + Attachment result = sendData(DEFAULT_REQUESTS.ADD_ATTACHMENT, + Attachment.class, + projectName, + versionName, + attachement + ); + return result; + } + + @Override + public News addNews(String projectName, + News news) throws RedmineServiceException { + // send data and obtain created news + News result = sendData(DEFAULT_REQUESTS.ADD_NEWS, + News.class, + projectName, + news + ); + return result; + } + + @Override + public TimeEntry addIssueTimeEntry(String projectName, + String issueId, + TimeEntry entry) throws RedmineServiceException { + // send data and obtain updated version + TimeEntry result = sendData(DEFAULT_REQUESTS.ADD_ISSUE_TIME_ENTRY, + TimeEntry.class, + projectName, + issueId, + entry + ); + return result; + } +} Modified: trunk/jredmine-client/src/test/java/org/nuiton/jredmine/AbstractRedmineServiceTest.java =================================================================== --- trunk/jredmine-client/src/test/java/org/nuiton/jredmine/AbstractRedmineServiceTest.java 2012-03-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-client/src/test/java/org/nuiton/jredmine/AbstractRedmineServiceTest.java 2012-03-25 15:48:53 UTC (rev 257) @@ -123,7 +123,7 @@ } protected final S newService() throws Exception { - return serviceType.newInstance(); + return serviceType.getConstructor().newInstance(); } protected RedmineRestClient newClient(RestClientConfiguration configuration) { @@ -159,7 +159,7 @@ service = newService(); - ((RedmineServiceImplementor) service).init(client); + ((DefaultRedmineServiceImplementor) service).init(client); } @After Added: trunk/jredmine-client/src/test/java/org/nuiton/jredmine/FakeRedmineServiceConfiguration.java =================================================================== --- trunk/jredmine-client/src/test/java/org/nuiton/jredmine/FakeRedmineServiceConfiguration.java (rev 0) +++ trunk/jredmine-client/src/test/java/org/nuiton/jredmine/FakeRedmineServiceConfiguration.java 2012-03-25 15:48:53 UTC (rev 257) @@ -0,0 +1,128 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.jredmine; + +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; + +import java.net.URL; + +/** + * Configuration of a redmine service for test purposes. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class FakeRedmineServiceConfiguration implements RedmineServiceConfiguration { + + URL restUrl; + + String restUsername; + + String restPassword; + + boolean verbose; + + boolean anonymous; + + String encoding; + + @Override + public String getEncoding() { + return encoding; + } + + @Override + public void setEncoding(String encoding) { + this.encoding = encoding; + } + + @Override + public String getRestPassword() { + return restPassword; + } + + @Override + public void setRestPassword(String restPassword) { + this.restPassword = restPassword; + } + + @Override + public URL getRestUrl() { + return restUrl; + } + + @Override + public void setRestUrl(URL restUrl) { + this.restUrl = restUrl; + } + + @Override + public String getRestUsername() { + return restUsername; + } + + @Override + public void setRestUsername(String restUsername) { + this.restUsername = restUsername; + } + + @Override + public boolean isVerbose() { + return verbose; + } + + @Override + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } + + @Override + public boolean isAnonymous() { + return anonymous; + } + + @Override + public void setAnonymous(boolean anonymous) { + this.anonymous = anonymous; + } + + @Override + public String toString() { + ToStringBuilder b = new ToStringBuilder(this, + ToStringStyle.MULTI_LINE_STYLE + ); + b.append("redmineUrl", restUrl); + if (anonymous) { + b.append("anonymous", true); + } else { + b.append("redmineUsername", restUsername); + b.append("redminePassword", "***"); + } + b.append("encoding", encoding); + b.append("verbose", verbose); + return b.toString(); + } +} Property changes on: trunk/jredmine-client/src/test/java/org/nuiton/jredmine/FakeRedmineServiceConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousServiceJerseyTest.java =================================================================== --- trunk/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousServiceJerseyTest.java (rev 0) +++ trunk/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousServiceJerseyTest.java 2012-03-25 15:48:53 UTC (rev 257) @@ -0,0 +1,222 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.jredmine; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.After; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.jredmine.model.Attachment; +import org.nuiton.jredmine.model.Issue; +import org.nuiton.jredmine.model.IssueCategory; +import org.nuiton.jredmine.model.IssuePriority; +import org.nuiton.jredmine.model.IssueStatus; +import org.nuiton.jredmine.model.News; +import org.nuiton.jredmine.model.Project; +import org.nuiton.jredmine.model.TimeEntry; +import org.nuiton.jredmine.model.Tracker; +import org.nuiton.jredmine.model.User; +import org.nuiton.jredmine.model.Version; + +import java.net.URL; + +/** + * To test the {@link RedmineAnonymousServiceJersey}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class RedmineAnonymousServiceJerseyTest { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(RedmineAnonymousServiceJerseyTest.class); + + protected static RedmineServiceConfiguration configuration; + + protected RedmineAnonymousServiceJersey service; + + @BeforeClass + public static void beforeClass() throws Exception { + configuration = new FakeRedmineServiceConfiguration(); + configuration.setAnonymous(true); + configuration.setRestUrl(new URL("http://nuiton.org/jredmine")); + configuration.setVerbose(true); + + // test if can access service + RedmineAnonymousServiceJersey service = + new RedmineAnonymousServiceJersey(); + service.delegateImplementor = new RedmineServiceImplementorJersey(); + service.init(configuration); + + int status = service.ping(); + + if (status != 200) { + + // ping was not ok + if (log.isInfoEnabled()) { + log.info("Will skip test " + + RedmineAnonymousServiceJerseyTest.class.getName() + + ", since ping status is " + status + + " (should be 200 to pass tests...)"); + } + } + Assume.assumeTrue(status == 200); + } + + @Before + public void setUp() throws Exception { + + service = new RedmineAnonymousServiceJersey(); + service.delegateImplementor = new RedmineServiceImplementorJersey(); + service.init(configuration); + } + + @After + public void tearDown() throws Exception { + service.destroy(); + } + + @Test + public void getProjects() throws Exception { + Project[] projects = service.getProjects(); + Assert.assertNotNull(projects); + } + + @Test + public void getIssuePriorities() throws Exception { + IssuePriority[] issuePriorities = service.getIssuePriorities(); + Assert.assertNotNull(issuePriorities); + } + + @Test + public void getIssueStatuses() throws Exception { + + IssueStatus[] issueStatuses = service.getIssueStatuses(); + Assert.assertNotNull(issueStatuses); + } + + public static final String PROJECT_NAME = "jredmine"; + + public static final String VERSION_NAME = "1.4"; + + public static final String ISSUE_ID = "2030"; + + @Test + public void getProject() throws Exception { + Project project = service.getProject(PROJECT_NAME); + Assert.assertNotNull(project); + Assert.assertEquals(PROJECT_NAME, project.getName()); + Assert.assertEquals(PROJECT_NAME, project.getIdentifier()); + Assert.assertEquals(true, project.isIsPublic()); + Assert.assertEquals("http://maven-site.nuiton.org/jredmine", + project.getHomepage()); + Assert.assertEquals("Permet de communiquer en java avec un serveur " + + "redmine qui a installé le plugin rails jredmine", + project.getDescription()); + Assert.assertEquals(36, project.getId()); + Assert.assertEquals(1, project.getStatus()); + } + + @Test + public void getIssueCategories() throws Exception { + IssueCategory[] issueCategories = + service.getIssueCategories(PROJECT_NAME); + Assert.assertNotNull(issueCategories); + } + + @Test + public void getTrackers() throws Exception { + Tracker[] trackers = service.getTrackers(PROJECT_NAME); + Assert.assertNotNull(trackers); + } + + @Test + public void getNews() throws Exception { + News[] news = service.getNews(PROJECT_NAME); + Assert.assertNotNull(news); + } + + @Test + public void getProjectMembers() throws Exception { + User[] projectMembers = service.getProjectMembers(PROJECT_NAME); + Assert.assertNotNull(projectMembers); + } + + @Test + public void getProjectIssues() throws Exception { + Issue[] issues = service.getIssues(PROJECT_NAME); + Assert.assertNotNull(issues); + } + + @Test + public void getVersions() throws Exception { + Version[] versions = service.getVersions(PROJECT_NAME); + Assert.assertNotNull(versions); + } + + @Test + public void getOpenedIssues() throws Exception { + Issue[] issues = service.getOpenedIssues(PROJECT_NAME); + Assert.assertNotNull(issues); + } + + @Test + public void getClosedIssues() throws Exception { + Issue[] issues = service.getClosedIssues(PROJECT_NAME); + Assert.assertNotNull(issues); + } + + @Test + public void getVersion() throws Exception { + Version version = service.getVersion(PROJECT_NAME, VERSION_NAME); + Assert.assertNotNull(version); + } + + @Test + public void getVersionIssues() throws Exception { + Issue[] issues = service.getIssues(PROJECT_NAME, VERSION_NAME); + Assert.assertNotNull(issues); + } + + @Test + public void getIssueTimeEntries() throws Exception { + TimeEntry[] issueTimeEntries = + service.getIssueTimeEntries(PROJECT_NAME, ISSUE_ID); + Assert.assertNotNull(issueTimeEntries); + } + + @Test + public void getAttachments() throws Exception { + Attachment[] attachments = + service.getAttachments(PROJECT_NAME, VERSION_NAME); + Assert.assertNotNull(attachments); + } + +} Property changes on: trunk/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousServiceJerseyTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jredmine-client/src/test/java/org/nuiton/jredmine/TestHelper.java =================================================================== --- trunk/jredmine-client/src/test/java/org/nuiton/jredmine/TestHelper.java 2012-03-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-client/src/test/java/org/nuiton/jredmine/TestHelper.java 2012-03-25 15:48:53 UTC (rev 257) @@ -78,10 +78,14 @@ return; } - InputStream stream = TestHelper.class.getResourceAsStream("/test-config.properties"); - defaultConfig = new Properties(); - defaultConfig.load(stream); + InputStream stream = TestHelper.class.getResourceAsStream( + "/test-config.properties"); + try { + defaultConfig.load(stream); + } finally { + stream.close(); + } userConfig = new Properties(defaultConfig); for (String key : System.getenv().keySet()) { @@ -237,6 +241,18 @@ return (List<T>) memoryModel.get(RedmineModelEnum.valueOf(type)); } + public static <T> T getModel(Class<T> type, int pos) { + if (memoryModel == null) { + try { + loadMemoryModel(); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } + List<T> ts = (List<T>) memoryModel.get(RedmineModelEnum.valueOf(type)); + return ts.get(pos); + } + public static void tearDownClass() throws Exception { //basedir = null; if (memoryModel != null) { @@ -245,7 +261,7 @@ } } - public static <T> void assertMyListEquals(Class<T> type, List<T> expecteds, T... actuals) throws Exception { + public static <T> void assertMyListEquals(Class<T> type, List<T> expecteds, T[] actuals) throws Exception { Assert.assertNotNull(actuals); Assert.assertEquals(expecteds.size(), actuals.length); Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2012-03-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2012-03-25 15:48:53 UTC (rev 257) @@ -28,8 +28,8 @@ import org.apache.maven.model.IssueManagement; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProject; -import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.RedmineService; +import org.nuiton.jredmine.RedmineServiceConfiguration; import org.nuiton.jredmine.RedmineServiceException; import org.nuiton.jredmine.RedmineServiceImplementor; import org.nuiton.jredmine.model.ModelHelper; @@ -50,7 +50,7 @@ * @requiresProject true * @since 1.0.0 */ -public abstract class AbstractRedmineMojo extends AbstractPlugin implements RestClientConfiguration { +public abstract class AbstractRedmineMojo extends AbstractPlugin implements RedmineServiceConfiguration { public static final String REDMINE_SYSTEM = "redmine"; @@ -386,7 +386,7 @@ } /////////////////////////////////////////////////////////////////////////// - /// RestClientConfiguration + /// RedmineServiceConfiguration /////////////////////////////////////////////////////////////////////////// @Override @@ -439,7 +439,8 @@ releaseProject = p; return true; } catch (RedmineServiceException e) { - getLog().warn("could not retreave project '" + projectId + "', for reason " + e.getMessage(), e); + getLog().warn("could not retreave project '" + projectId + + "', for reason " + e.getMessage(), e); return false; } } @@ -462,7 +463,8 @@ releaseVersion = v; return true; } catch (RedmineServiceException e) { - getLog().warn("could not retreave version '" + versionId + "', for reason " + e.getMessage(), e); + getLog().warn("could not retreave version '" + versionId + + "', for reason " + e.getMessage(), e); return false; } } @@ -482,7 +484,8 @@ releaseUser = user; return true; } catch (RedmineServiceException e) { - getLog().warn("could not retreave user '" + username + "', for reason " + e.getMessage(), e); + getLog().warn("could not retreave user '" + username + + "', for reason " + e.getMessage(), e); return false; } } @@ -499,7 +502,9 @@ } i.destroy(); } catch (Exception ex) { - getLog().error("could not close redmine client for reason " + ex.getMessage(), ex); + getLog().error( + "could not close redmine client for reason " + + ex.getMessage(), ex); } } } Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2012-03-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2012-03-25 15:48:53 UTC (rev 257) @@ -291,7 +291,9 @@ statuses = service.getIssueStatuses(); } catch (RedmineServiceException e) { - throw new MojoExecutionException("could not obtain statuses for reason " + e.getMessage(), e); + throw new MojoExecutionException( + "could not obtain statuses for reason " + e.getMessage(), + e); } // get categories @@ -302,7 +304,9 @@ categories = service.getIssueCategories(projectId); } catch (RedmineServiceException e) { - throw new MojoExecutionException("could not obtain categories for reason " + e.getMessage(), e); + throw new MojoExecutionException( + "could not obtain categories for reason " + e.getMessage(), + e); } // get versions @@ -312,7 +316,9 @@ versions = service.getVersions(projectId); } catch (RedmineServiceException e) { - throw new MojoExecutionException("could not obtain versions for reason " + e.getMessage(), e); + throw new MojoExecutionException( + "could not obtain versions for reason " + e.getMessage(), + e); } filters = new HashMap<String, String>(); @@ -327,14 +333,18 @@ String[] parts = entry.split(":"); if (parts.length != 2) { // error in syntax - throw new MojoExecutionException("the trackerMapping entry " + Arrays.toString(parts) + " is not well formed"); + throw new MojoExecutionException( + "the trackerMapping entry " + Arrays.toString(parts) + + " is not well formed"); } String action = parts[0].trim().toLowerCase(); try { Actions.valueOf(action); } catch (Exception e) { - throw new MojoExecutionException("the action " + action + " is unknown... authorized : " + Arrays.toString(Actions.values())); + throw new MojoExecutionException( + "the action " + action + " is unknown... authorized : " + + Arrays.toString(Actions.values())); } Integer id = Integer.valueOf(parts[1].trim()); @@ -342,7 +352,8 @@ Tracker t = ModelHelper.byId(id, releaseTrackers); if (t == null) { - throw new MojoExecutionException("could not obtain the tracker with id " + id); + throw new MojoExecutionException( + "could not obtain the tracker with id " + id); } trackerToAction.put(id, action); @@ -360,7 +371,8 @@ IssueStatus t = ModelHelper.byId(id, statuses); if (t == null) { - throw new MojoExecutionException("could not obtain the status with id " + id); + throw new MojoExecutionException( + "could not obtain the status with id " + id); } } @@ -378,7 +390,8 @@ IssueCategory t = ModelHelper.byId(id, categories); if (t == null) { - throw new MojoExecutionException("could not obtain the category with id " + id); + throw new MojoExecutionException( + "could not obtain the category with id " + id); } } @@ -397,7 +410,8 @@ versionExist = false; // la version n'existe pas encore sur redmine - getLog().warn("The version " + versionId + " does not exist on redmine"); + getLog().warn("The version " + versionId + + " does not exist on redmine"); releaseVersion = new Version(); releaseVersion.setName(versionId); @@ -454,13 +468,16 @@ if (isRunOnceDone()) { if (!xmlPath.exists()) { - getLog().info("Use already generated " + xmlPath.getName() + " (" + cacheChangesFile + ")"); + getLog().info("Use already generated " + xmlPath.getName() + + " (" + cacheChangesFile + ")"); try { createDirectoryIfNecessary(xmlPath.getParentFile()); copyFile(cacheChangesFile, xmlPath); } catch (IOException e) { - throw new IllegalStateException("could not copy already generated file " + xmlPath + " from " + cacheChangesFile); + throw new IllegalStateException( + "could not copy already generated file " + + xmlPath + " from " + cacheChangesFile); } } } @@ -476,7 +493,9 @@ if (releaseVersion.getEffectiveDate() == null) { - getLog().debug("The version " + versionId + " is not effective on redmine, should update effective-date property to today"); + getLog().debug("The version " + versionId + + " is not effective on redmine, should update " + + "effective-date property to today"); releaseVersion.setEffectiveDate(new Date()); } @@ -484,7 +503,8 @@ getLog().info("release project " + releaseProject.getName()); getLog().info("release version " + releaseVersion.getName()); getLog().info("release date " + releaseVersion.getEffectiveDate()); - getLog().info("release user " + releaseUser.getFirstname() + " " + releaseUser.getLastname()); + getLog().info("release user " + releaseUser.getFirstname() + " " + + releaseUser.getLastname()); // init issues collector @@ -498,12 +518,15 @@ } catch (RedmineServiceException ex) { collector.clearFilters(); - throw new MojoExecutionException("could not obtain issues for reason " + ex.getMessage(), ex); + throw new MojoExecutionException( + "could not obtain issues for reason " + ex.getMessage(), + ex); } //TODO make some logic checks : version must be // build the maven changes.xml as memory model - ChangesDocument doc = buildChangesDocument(releaseVersion, releaseUser, collector); + ChangesDocument doc = buildChangesDocument(releaseVersion, releaseUser, + collector); // store the generated file ChangesXpp3Writer xppWriter = new ChangesXpp3Writer(); @@ -518,7 +541,9 @@ cacheChangesFile = xmlPath; } - protected ChangesDocument buildChangesDocument(Version version, User user, IssuesCollector collector) throws RedmineServiceException { + protected ChangesDocument buildChangesDocument(Version version, + User user, + IssuesCollector collector) throws RedmineServiceException { ChangesDocument doc = new ChangesDocument(); Properties properties = new Properties(); Author author = new Author(); @@ -540,7 +565,8 @@ boolean treateReleaseVersion = v.getId() == version.getId(); - Issue[] issuesForVersion = ModelHelper.byVersionId(v.getId(), issues); + Issue[] issuesForVersion = + ModelHelper.byVersionId(v.getId(), issues); Release release = new Release(); body.addRelease(release); @@ -576,7 +602,8 @@ String type = entry.getValue(); // get issues for the tracker - Issue[] issuesForTracker = ModelHelper.byTrackerId(entry.getKey(), issuesForVersion); + Issue[] issuesForTracker = ModelHelper.byTrackerId( + entry.getKey(), issuesForVersion); for (Issue issue : issuesForTracker) { @@ -591,7 +618,8 @@ action.setDate(dateFormat.format(issue.getDueDate())); } else { if (verbose) { - getLog().warn("issue " + issue.getSubject() + " has no dueDate..."); + getLog().warn("issue " + issue.getSubject() + + " has no dueDate..."); } } @@ -603,7 +631,9 @@ id = issue.getAuthorId(); if (id == 0) { - getLog().warn("issue " + issue.getSubject() + " is not created 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(); } a = ModelHelper.byId(id, users); @@ -617,7 +647,9 @@ id = issue.getAssignedToId(); 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 assigned to any user, " + + "this is not normal..."); id = issue.getAuthorId(); } a = ModelHelper.byId(id, users); Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java 2012-03-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java 2012-03-25 15:48:53 UTC (rev 257) @@ -168,7 +168,7 @@ * clean all internal states. * <p/> * Note : this method is invoked at the begin of each - * {@link #collect(org.nuiton.jredmine.RedmineService, org.nuiton.jredmine.plugin.IssueCollectorConfiguration)} method. + * {@link #collect(RedmineService, IssueCollectorConfiguration)} method. */ public void clearFilters() { maxEntries = null; Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java 2012-03-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java 2012-03-25 15:48:53 UTC (rev 257) @@ -29,8 +29,8 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.settings.Settings; import org.nuiton.helper.plugin.ShareServerSecretPlugin; -import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.RedmineService; +import org.nuiton.jredmine.RedmineServiceConfiguration; import org.nuiton.jredmine.RedmineServiceImplementor; import org.nuiton.plugin.AbstractPlugin; import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher; @@ -48,7 +48,7 @@ * @goal login * @since 1.2.1 */ -public class LoginMojo extends AbstractPlugin implements RestClientConfiguration { +public class LoginMojo extends AbstractPlugin implements RedmineServiceConfiguration { /** * Dependance du projet. @@ -175,10 +175,15 @@ if (issueManagement == null) { throw new MojoExecutionException("No Issue Management set."); - } else if ((issueManagement.getUrl() == null) || (issueManagement.getUrl().trim().equals(""))) { + } else if (issueManagement.getUrl() == null || + issueManagement.getUrl().trim().equals("")) { throw new MojoExecutionException("No URL set in Issue Management."); - } else if ((issueManagement.getSystem() != null) && !(issueManagement.getSystem().equalsIgnoreCase(AbstractRedmineMojo.REDMINE_SYSTEM))) { - throw new MojoExecutionException("Redmine's Plugin only supports 'redmine' Issue Management system."); + } else if (issueManagement.getSystem() != null && + !issueManagement.getSystem().equalsIgnoreCase( + AbstractRedmineMojo.REDMINE_SYSTEM)) { + throw new MojoExecutionException( + "Redmine's Plugin only supports 'redmine' " + + "Issue Management system."); } // prepare Redmine service configuration @@ -218,7 +223,7 @@ plugin.setRunOnce(false); plugin.execute(); plugin.setRunOnce(true); - + if (!checkLogin) { // no more thing to do return; @@ -230,7 +235,8 @@ ((RedmineServiceImplementor) service).init(this); if (!((RedmineServiceImplementor) service).isInit()) { - throw new MojoExecutionException("could not logged to redmine server"); + throw new MojoExecutionException( + "could not logged to redmine server"); } } catch (Exception e) { @@ -238,7 +244,8 @@ throw e; } // if (verbose) { - getLog().error("could not init Redmine service [" + getRestUrl() + "] with user '" + getRestUsername() + "'", e); + getLog().error("could not init Redmine service [" + getRestUrl() + + "] with user '" + getRestUsername() + "'", e); // } // return false; } @@ -251,7 +258,7 @@ protected void afterExecute() { if (service != null) { RedmineServiceImplementor i; - i = ((RedmineServiceImplementor) service); + i = (RedmineServiceImplementor) service; if (i.isInit()) { try { @@ -260,7 +267,8 @@ } i.destroy(); } catch (Exception ex) { - getLog().error("could not close redmine client for reason " + ex.getMessage(), ex); + getLog().error("could not close redmine client for reason " + + ex.getMessage(), ex); } } } Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2012-03-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2012-03-25 15:48:53 UTC (rev 257) @@ -167,7 +167,9 @@ try { date = dateFormat.parse(effectiveDate); } catch (ParseException e) { - throw new MojoExecutionException("could not parse effectivate date " + effectiveDate + " for reason " + e.getMessage(), e); + throw new MojoExecutionException( + "could not parse effectivate date " + effectiveDate + + " for reason " + e.getMessage(), e); } } super.init(); @@ -186,11 +188,14 @@ Version v = ModelHelper.byVersionName(versionId, versions); boolean usePreviousVersion = false; - if (previousVersionName != null && !previousVersionName.trim().isEmpty()) { + if (previousVersionName != null && + !previousVersionName.trim().isEmpty()) { // retrieve previous version - Version previousVersion = ModelHelper.byVersionName(previousVersionName, versions); + Version previousVersion = ModelHelper.byVersionName( + previousVersionName, versions); if (previousVersion == null) { - getLog().warn("can not find the previous version " + previousVersionName); + getLog().warn("can not find the previous version " + + previousVersionName); } else { usePreviousVersion = true; } @@ -215,9 +220,13 @@ if (!dryRun) { // create version - getLog().info("next version " + releaseVersion.getName() + (usePreviousVersion ? " from previous version " + previousVersionName : "")); + getLog().info("next version " + releaseVersion.getName() + + (usePreviousVersion ? " from previous version " + + previousVersionName : "")); - service.nextVersion(projectId, usePreviousVersion ? previousVersionName : null, releaseVersion); + service.nextVersion(projectId, + usePreviousVersion ? + previousVersionName : null, releaseVersion); } } Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2012-03-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2012-03-25 15:48:53 UTC (rev 257) @@ -143,13 +143,15 @@ if (filesFromProperties != null && !filesFromProperties.exists()) { // no file to publish... - getLog().warn("could not find the properties file " + filesFromProperties); + getLog().warn("could not find the properties file " + + filesFromProperties); getLog().warn("will not use this source"); filesFromProperties = null; } if (filesFromProperties != null && files != null && files.length > 0) { - throw new MojoExecutionException("can not use both sources files and filesFromProperties"); + throw new MojoExecutionException( + "can not use both sources files and filesFromProperties"); } if (filesFromProperties != null) { @@ -204,7 +206,8 @@ } if (f.getAbsolutePath().startsWith(basedir)) { - getLog().info("upload " + f.getAbsolutePath().substring(basedirLength)); + getLog().info("upload " + + f.getAbsolutePath().substring(basedirLength)); } else { getLog().info("upload " + f.getAbsolutePath()); } @@ -224,10 +227,14 @@ a.setToUpload(f); // do upload - Attachment result = service.addAttachment(projectId, releaseVersion.getName(), a); + Attachment result = service.addAttachment( + projectId, releaseVersion.getName(), a); long t1 = System.nanoTime(); if (verbose) { - getLog().info("done in " + PluginHelper.convertTime(t1 - t0) + ". attachment id : " + result.getId() + ", size : " + PluginHelper.convertMemory(result.getFilesize())); + getLog().info("done in " + PluginHelper.convertTime(t1 - t0) + + ". attachment id : " + result.getId() + + ", size : " + + PluginHelper.convertMemory(result.getFilesize())); } } } @@ -241,7 +248,8 @@ incoming = new CollectFilesMojo().getFiles(filesFromProperties); getLog().info("Loaded " + filesFromProperties); } catch (IOException ex) { - throw new MojoExecutionException("could not load file " + filesFromProperties, ex); + throw new MojoExecutionException("could not load file " + + filesFromProperties, ex); } // sort attachments by file names Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2012-03-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2012-03-25 15:48:53 UTC (rev 257) @@ -149,12 +149,14 @@ if (!newsContentFile.exists()) { // no file to publish... - throw new MojoExecutionException("could not find the template " + newsContentFile); + throw new MojoExecutionException("could not find the template " + + newsContentFile); } newsTitle = newsTitle.trim(); if (newsTitle.length() > 60) { - getLog().warn("News title can not be longer than 60 caracters, but was " + newsTitle.length()); + getLog().warn("News title can not be longer than 60 " + + "caracters, but was " + newsTitle.length()); newsTitle = newsTitle.substring(0, 59); getLog().warn("will use the restricted title : " + newsTitle); } @@ -177,7 +179,8 @@ news.setTitle(newsTitle); news.setSummary(newsSummary); - String newsContent = PluginHelper.readAsString(newsContentFile, encoding); + String newsContent = PluginHelper.readAsString(newsContentFile, + encoding); news.setDescription(newsContent); Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2012-03-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2012-03-25 15:48:53 UTC (rev 257) @@ -309,8 +309,9 @@ if (artifactsFile != null) { if (!artifactsFile.exists()) { - throw new MojoExecutionException("The artifactsFile [" + - artifactsFile + "] does not exists"); + throw new MojoExecutionException( + "The artifactsFile [" + + artifactsFile + "] does not exists"); } @@ -326,7 +327,9 @@ getLog().info("Deploy url = " + url); } - artifactUrls = generator.getArtifactsUrls(url, versionId, isVerbose(), files); + artifactUrls = generator.getArtifactsUrls(url, + versionId, isVerbose(), + files); } super.init(); @@ -350,7 +353,8 @@ for (Map.Entry<Attachment, String> e : attachmentUrls.entrySet()) { Attachment key = e.getKey(); String value = e.getValue(); - getLog().info("attachment file " + key.getFilename() + " --> " + value); + getLog().info("attachment file " + key.getFilename() + + " --> " + value); } } 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-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2012-03-25 15:48:53 UTC (rev 257) @@ -135,7 +135,9 @@ issuesCache.put(this, issues); } catch (RedmineServiceException ex) { - throw new MavenReportException("could not obtains issues for reason " + ex.getMessage(), ex); + throw new MavenReportException( + "could not obtains issues for reason " + + ex.getMessage(), ex); } finally { collector.clearFilters(); } @@ -150,21 +152,27 @@ public void executeReport(Locale locale) throws MavenReportException { if (isOnlyCurrentVersion()) { - getLog().info(getBundle(locale).getString("report.message.only.for.current.version") + " " + getVersionId()); + getLog().info(getBundle(locale).getString( + "report.message.only.for.current.version") + " " + + getVersionId()); } String id = getProjectId(); try { if (issues == null || issues.length == 0) { - getLog().warn("no issue to treate, will generate an empty raport."); + getLog().warn("no issue to treate, " + + "will generate an empty raport."); - IssueReportGenerator reportGenerator = new IssueReportGenerator(); + IssueReportGenerator reportGenerator = + new IssueReportGenerator(); - reportGenerator.doGenerateEmptyReport(getBundle(locale), getSink()); + reportGenerator.doGenerateEmptyReport(getBundle(locale), + getSink()); } else { - IssueReportGenerator report = new IssueReportGenerator(getLog(), getColumnNames(), getGroup()); + IssueReportGenerator report = new IssueReportGenerator( + getLog(), getColumnNames(), getGroup()); report.setIssueLinkTemplate(getIssueLinkTemplate()); report.setVersionLinkTemplate(getVersionLinkTemplate()); 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-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2012-03-25 15:48:53 UTC (rev 257) @@ -153,7 +153,9 @@ /** @return {@code true} if report should be skip */ protected abstract boolean skipReport(); - public AbstractRedmineReport(boolean requireProject, boolean requireVersion, boolean requireUser) { + public AbstractRedmineReport(boolean requireProject, + boolean requireVersion, + boolean requireUser) { super(requireProject, requireVersion, requireUser); } @@ -179,15 +181,18 @@ Map<String, String> attributes = new HashMap<String, String>(); attributes.put("outputEncoding", encoding); Locale currentLocale = Locale.getDefault(); - SiteRenderingContext siteContext = siteRenderer.createContextForSkin(getSkinArtifactFile(), attributes, - model, getName(currentLocale), currentLocale); + SiteRenderingContext siteContext = + siteRenderer.createContextForSkin( + getSkinArtifactFile(), attributes, + model, getName(currentLocale), currentLocale); createDirectoryIfNecessary(outputDirectory); String filename = getOutputName() + ".html"; File file = new File(outputDirectory, filename); - RenderingContext context = new RenderingContext(outputDirectory, getOutputName() + ".html"); + RenderingContext context = new RenderingContext( + outputDirectory, getOutputName() + ".html"); //SiteRendererSink sink = SinkFactory.createSink(outputDirectory, filename); @@ -205,18 +210,23 @@ writer.close(); } - siteRenderer.copyResources(siteContext, new File(project.getBasedir(), "src/site/resources"), - outputDirectory); + siteRenderer.copyResources( + siteContext, + new File(project.getBasedir(), "src/site/resources"), + outputDirectory); } catch (RendererException e) { throw new MojoExecutionException( - "An error has occurred in " + getName(Locale.ENGLISH) + " report generation.", e); + "An error has occurred in " + getName(Locale.ENGLISH) + + " report generation.", e); } catch (IOException e) { throw new MojoExecutionException( - "An error has occurred in " + getName(Locale.ENGLISH) + " report generation.", e); + "An error has occurred in " + getName(Locale.ENGLISH) + + " report generation.", e); } catch (MavenReportException e) { throw new MojoExecutionException( - "An error has occurred in " + getName(Locale.ENGLISH) + " report generation.", e); + "An error has occurred in " + getName(Locale.ENGLISH) + + " report generation.", e); } finally { closeService(); @@ -234,12 +244,14 @@ getLog().debug("check can use report"); } if (skipReport()) { - getLog().info("User ask to skip report \"" + getName(Locale.ENGLISH) + "\"."); + 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."); + getLog().info("Skipped \"" + getName(Locale.ENGLISH) + + "\" report in offline mode."); return false; } try { @@ -247,14 +259,17 @@ init = true; } catch (Exception ex) { if (isVerbose()) { - getLog().error("could not init report goal for reason " + ex.getMessage(), ex); + getLog().error("could not init report goal for reason " + + ex.getMessage(), ex); } else { - getLog().error("could not init report goal for reason " + ex.getMessage()); + getLog().error("could not init report goal for reason " + + ex.getMessage()); } init = false; } if (!init) { - getLog().info("Skipped \"" + getName(Locale.ENGLISH) + "\" report, goal could be initialized."); + getLog().info("Skipped \"" + getName(Locale.ENGLISH) + + "\" report, goal could be initialized."); } if (getLog().isDebugEnabled()) { getLog().debug("check can use report : " + init); @@ -316,7 +331,9 @@ } protected ResourceBundle getBundle(Locale locale) { - return ResourceBundle.getBundle("redmine-report", locale, getClass().getClassLoader()); + return ResourceBundle.getBundle("redmine-report", + locale, + getClass().getClassLoader()); } protected File getSkinArtifactFile() @@ -329,17 +346,28 @@ if (version == null) { version = Artifact.RELEASE_VERSION; } - VersionRange versionSpec = VersionRange.createFromVersionSpec(version); - artifact = factory.createDependencyArtifact(skin.getGroupId(), skin.getArtifactId(), versionSpec, "jar", - null, null); + VersionRange versionSpec = + VersionRange.createFromVersionSpec(version); + artifact = factory.createDependencyArtifact( + skin.getGroupId(), + skin.getArtifactId(), + versionSpec, + "jar", + null, + null); - resolver.resolve(artifact, project.getRemoteArtifactRepositories(), localRepository); + resolver.resolve(artifact, + project.getRemoteArtifactRepositories(), + localRepository); } catch (InvalidVersionSpecificationException e) { - throw new MojoExecutionException("The skin version '" + version + "' is not valid: " + e.getMessage()); + throw new MojoExecutionException( + "The skin version '" + version + + "' is not valid: " + e.getMessage()); } catch (ArtifactResolutionException e) { throw new MojoExecutionException("Unable to find skin", e); } catch (ArtifactNotFoundException e) { - throw new MojoExecutionException("The skin does not exist: " + e.getMessage()); + throw new MojoExecutionException("The skin does not exist: " + + e.getMessage()); } return artifact.getFile(); 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-25 15:37:26 UTC (rev 256) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java 2012-03-25 15:48:53 UTC (rev 257) @@ -77,29 +77,37 @@ key(false, "report.label.key") { @Override - public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { + public void sinkInsideCell(Sink sink, + IssueReportGenerator generator, + Issue issue) { generator.constructIssueLink(issue, sink); } @Override protected Integer getGroupId(Issue issue) { - throw new UnsupportedOperationException(name() + "does not supports grouping"); + throw new UnsupportedOperationException( + name() + "does not supports grouping"); } }, summary(false, "report.label.summary") { @Override - public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { + public void sinkInsideCell(Sink sink, + IssueReportGenerator generator, + Issue issue) { generator.sinkRawText(sink, issue.getDescription()); } @Override protected Integer getGroupId(Issue issue) { - throw new UnsupportedOperationException(name() + "does not supports grouping"); + throw new UnsupportedOperationException( + name() + "does not supports grouping"); } }, status(true, "report.label.status") { @Override - public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { + public void sinkInsideCell(Sink sink, + IssueReportGenerator generator, + Issue issue) { int id = issue.getStatusId(); // String t = id + ""; @@ -120,7 +128,9 @@ }, assignee(true, "report.label.by") { @Override - public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { + public void sinkInsideCell(Sink sink, + IssueReportGenerator generator, + Issue issue) { int id = issue.getAssignedToId(); User u = generator.getUser(id); String t = issue.getAssignedToId() + ""; @@ -141,7 +151,9 @@ }, reporter(true, "report.label.reporter") { @Override - public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { + public void sinkInsideCell(Sink sink, + IssueReportGenerator generator, + Issue issue) { int id = issue.getAuthorId(); User u = generator.getUser(id); String t = issue.getAuthorId() + ""; @@ -162,7 +174,9 @@ }, tracker(true, "report.label.type") { @Override - public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { + public void sinkInsideCell(Sink sink, + IssueReportGenerator generator, + Issue issue) { int id = issue.getTrackerId(); Tracker status = generator.getTracker(id); generator.sinkI18nAble(sink, id, status); @@ -175,7 +189,9 @@ }, priority(true, "report.label.priority") { @Override - public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { + public void sinkInsideCell(Sink sink, + IssueReportGenerator generator, + Issue issue) { int id = issue.getPriorityId(); IssuePriority p = generator.getIssuePriority(id); generator.sinkI18nAble(sink, id, p); @@ -188,7 +204,9 @@ }, version(true, "report.label.version") { @Override - public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { + public void sinkInsideCell(Sink sink, + IssueReportGenerator generator, + Issue issue) { int id = issue.getFixedVersionId(); Version v2 = generator.getVersion(id); generator.sinkI18nAble(sink, id, v2); @@ -201,7 +219,9 @@ }, category(true, "report.label.category") { @Override - public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { + public void sinkInsideCell(Sink sink, + IssueReportGenerator generator, + Issue issue) { int id = issue.getCategoryId(); IssueCategory status = generator.getIssueCategory(id); generator.sinkI18nAble(sink, id, status); @@ -214,26 +234,32 @@ }, createdon(false, "report.label.created") { @Override - public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { + public void sinkInsideCell(Sink sink, + IssueReportGenerator generator, + Issue issue) { Date d = issue.getCreatedOn(); generator.sinkDate(sink, d); } @Override protected Integer getGroupId(Issue issue) { - throw new UnsupportedOperationException(name() + "does not supports grouping"); + throw new UnsupportedOperationException( + name() + "does not supports grouping"); } }, updatedon(false, "report.label.updated") { @Override - public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { + public void sinkInsideCell(Sink sink, + IssueReportGenerator generator, + Issue issue) { Date d = issue.getUpdatedOn(); generator.sinkDate(sink, d); } @Override protected Integer getGroupId(Issue issue) { - throw new UnsupportedOperationException(name() + "does not supports grouping"); + throw new UnsupportedOperationException( + name() + "does not supports grouping"); } }; @@ -254,11 +280,14 @@ return i18nKey; } - public abstract void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue); + public abstract void sinkInsideCell(Sink sink, + IssueReportGenerator generator, + Issue issue); protected abstract Integer getGroupId(Issue issue); - public void collectGroups(Issue[] issues, Map<Integer, List<Issue>> groups) { + public void collectGroups(Issue[] issues, + Map<Integer, List<Issue>> groups) { for (Issue issue : issues) { Integer id = getGroupId(issue); List<Issue> c = groups.get(id); @@ -314,10 +343,12 @@ List<ReportColumn> tmp = new ArrayList<ReportColumn>(nbCols); for (String col : columnNames.split(",")) { try { - ReportColumn valueOf = ReportColumn.valueOf(col.trim().toLowerCase()); + ReportColumn valueOf = + ReportColumn.valueOf(col.trim().toLowerCase()); tmp.add(valueOf); } catch (Exception e) { - log.warn(col + " is an unkown column name, authorized : " + Arrays.toString(ReportColumn.values())); + log.warn(col + " is an unkown column name, authorized : " + + Arrays.toString(ReportColumn.values())); if (log.isDebugEnabled()) { log.debug(e); } @@ -326,14 +357,17 @@ if (tmp.isEmpty()) { // This can happen if the user has configured column names and they are all invalid throw new MavenReportException( - "maven-redmine-plugin: None of the configured columnNames '" + columnNames + "' are valid."); + "maven-redmine-plugin: None of the configured " + + "columnNames '" + columnNames + "' are valid."); } if (groupBy != null && !groupBy.trim().isEmpty()) { try { - groupColumn = ReportColumn.valueOf(groupBy.trim().toLowerCase()); + groupColumn = ReportColumn.valueOf( + groupBy.trim().toLowerCase()); if (!groupColumn.isCanGroup()) { - log.warn(groupColumn + " is not a grouping columne, grouping will be skip."); + log.warn(groupColumn + " is not a grouping columne, " + + "grouping will be skip."); groupColumn = null; } else { // remove the group column from the table @@ -343,7 +377,8 @@ log.info("group by " + groupColumn); } catch (Exception e) { - log.warn(groupBy + " is an unkown group column name, grouping will be skip."); + log.warn(groupBy + " is an unkown group column name, " + + "grouping will be skip."); if (log.isDebugEnabled()) { log.debug(e); } @@ -366,7 +401,8 @@ if (issues != null && issues.length == 0) { throw new MojoExecutionException( - "maven-redmine-plugin: Can not generate report if no issues, use the doGenerateEmptyReport instead"); + "maven-redmine-plugin: Can not generate report if no " + + "issues, use the doGenerateEmptyReport instead"); } String d = bundle.getString("report.date.format"); @@ -399,7 +435,8 @@ sink.sectionTitle2(); - sinkRawText(sink, bundle.getString(groupColumn.getI18nKey()) + " : "); + sinkRawText(sink, bundle.getString( + groupColumn.getI18nKey()) + " : "); groupColumn.sinkInsideCell(sink, this, currentIssues.get(0)); @@ -409,7 +446,8 @@ constructHeaderRow(sink, bundle); - constructDetailRows(sink, currentIssues.toArray(new Issue[currentIssues.size()])); + constructDetailRows(sink, currentIssues.toArray( + new Issue[currentIssues.size()])); sink.table_(); } @@ -425,7 +463,9 @@ * @return {@code true} if issue links can be generated, {@code false} otherwise. */ public boolean canGenerateIssueLinks() { - return !StringUtils.isEmpty(issueLinkTemplate) && (!StringUtils.isBlank(getUrl()) || !issueLinkTemplate.contains(URL_TOKEN)); + return !StringUtils.isEmpty(issueLinkTemplate) && + (!StringUtils.isBlank(getUrl()) || + !issueLinkTemplate.contains(URL_TOKEN)); } /** @@ -434,7 +474,9 @@ * @return {@code true} if issue links can be generated, {@code false} otherwise. */ public boolean canGenerateVersionLinks() { - return !StringUtils.isEmpty(versionLinkTemplate) && (!StringUtils.isBlank(getUrl()) || !versionLinkTemplate.contains(URL_TOKEN)); + return !StringUtils.isEmpty(versionLinkTemplate) && + (!StringUtils.isBlank(getUrl()) || + !versionLinkTemplate.contains(URL_TOKEN)); } public void setUrl(String url) {

1 0

r256 - in trunk/jredmine-client/src/main/java/org/nuiton/jredmine: . request
by tchemit＠users.nuiton.org March 25, 2012

March 25, 2012

Author: tchemit Date: 2012-03-25 17:37:26 +0200 (Sun, 25 Mar 2012) New Revision: 256 Url: http://nuiton.org/repositories/revision/jredmine/256 Log: refs #2030 introduce request package for redmine request builder (wno more use of the helper-m-p api) Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/DefaultRedmineRequestBuilder.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/IssueScopeRedmineRequestBuilder.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/ProjectScopeRedmineRequestBuilder.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/RedmineRequest.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/RedmineRequestBuilder.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/RedmineRequestFactory.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/VersionScopeRedmineRequestBuilder.java Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/DefaultRedmineRequestBuilder.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/DefaultRedmineRequestBuilder.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/DefaultRedmineRequestBuilder.java 2012-03-25 15:37:26 UTC (rev 256) @@ -0,0 +1,107 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.jredmine.request; + +import org.apache.commons.lang.ArrayUtils; + +import java.io.File; +import java.util.Map; + +/** + * The default implementation of the redmine request builder. + * + * @author tchemit <chemit(a)codelutin.com> + * @see RedmineRequestBuilder + * @see RedmineRequest + * @since 1.4 + */ +public class DefaultRedmineRequestBuilder implements RedmineRequestBuilder { + + private static final long serialVersionUID = 1L; + + protected final String name; + + protected final String action; + + public DefaultRedmineRequestBuilder(String action) { + this(action, action); + } + + public DefaultRedmineRequestBuilder(String name, String action) { + this.name = name; + this.action = action; + } + + @Override + public String getName() { + return name; + } + + /** + * Compute a array of pair (key-value) from the given arguments. + * <p/> + * Order is important to do this, define it. + * + * @param args the args of the request + * @return parameters to use in request by pari of key-value + * (key,value,key2, value2) + */ + public String[] getParameters(Object... args) { + // by default, no parameter + return ArrayUtils.EMPTY_STRING_ARRAY; + } + + public String[] getPath(Object... args) { + // by default, path is action + return new String[]{action}; + } + + public Map<String, File> getAttachments(Object... args) { + // by default, no attachments + return null; + } + + @Override + public RedmineRequest create(final Object... args) { + + return new RedmineRequest() { + + @Override + public String[] getPath() { + return DefaultRedmineRequestBuilder.this.getPath(args); + } + + @Override + public String[] getParameters() { + return DefaultRedmineRequestBuilder.this.getParameters(args); + } + + @Override + public Map<String, File> getAttachments() { + return DefaultRedmineRequestBuilder.this.getAttachments(args); + } + }; + } +} Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/DefaultRedmineRequestBuilder.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/IssueScopeRedmineRequestBuilder.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/IssueScopeRedmineRequestBuilder.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/IssueScopeRedmineRequestBuilder.java 2012-03-25 15:37:26 UTC (rev 256) @@ -0,0 +1,57 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.jredmine.request; + +/** + * To build request with a project and issue scope. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class IssueScopeRedmineRequestBuilder extends ProjectScopeRedmineRequestBuilder { + + private static final long serialVersionUID = 1L; + + public IssueScopeRedmineRequestBuilder(String name, String action) { + super(name, action); + } + + public IssueScopeRedmineRequestBuilder(String action) { + super(action); + } + + @Override + public String[] getParameters(Object... args) { + + // args 1 = project id + // args 2 = issue id + + String issueId = (String) args[1]; + + return new String[]{ + "issue_id", issueId + }; + } +} Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/IssueScopeRedmineRequestBuilder.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/ProjectScopeRedmineRequestBuilder.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/ProjectScopeRedmineRequestBuilder.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/ProjectScopeRedmineRequestBuilder.java 2012-03-25 15:37:26 UTC (rev 256) @@ -0,0 +1,57 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.jredmine.request; + +/** + * To build request with a project scope. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class ProjectScopeRedmineRequestBuilder extends DefaultRedmineRequestBuilder { + + private static final long serialVersionUID = 1L; + + public ProjectScopeRedmineRequestBuilder(String name, String action) { + super(name, action); + } + + public ProjectScopeRedmineRequestBuilder(String action) { + super(action); + } + + @Override + public String[] getPath(Object... args) { + + // one args : projectName + + String projectName = (String) args[0]; + + return new String[]{ + action, + projectName + }; + } +} Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/ProjectScopeRedmineRequestBuilder.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/RedmineRequest.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/RedmineRequest.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/RedmineRequest.java 2012-03-25 15:37:26 UTC (rev 256) @@ -0,0 +1,49 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.jredmine.request; + +import java.io.File; +import java.util.Map; + +/** + * To define a redmine request. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public interface RedmineRequest { + + /** @return the splitted path to add to url */ + String[] getPath(); + + /** + * @return an array of pair (parameter name - parameter value) to pass + * to request + */ + String[] getParameters(); + + /** @return the map of attachment to pass to request */ + Map<String, File> getAttachments(); +} Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/RedmineRequest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/RedmineRequestBuilder.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/RedmineRequestBuilder.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/RedmineRequestBuilder.java 2012-03-25 15:37:26 UTC (rev 256) @@ -0,0 +1,47 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.jredmine.request; + +import java.io.Serializable; + +/** + * The contract of a redmine request builder. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public interface RedmineRequestBuilder extends Serializable { + + /** @return the unique name of the request builder */ + String getName(); + + /** + * Create the request given the {@code args}. + * + * @param args args to create the request + * @return the created request + */ + RedmineRequest create(Object... args); +} Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/RedmineRequestBuilder.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/RedmineRequestFactory.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/RedmineRequestFactory.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/RedmineRequestFactory.java 2012-03-25 15:37:26 UTC (rev 256) @@ -0,0 +1,292 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.jredmine.request; + +import com.google.common.base.Strings; +import com.google.common.collect.Maps; +import org.nuiton.jredmine.model.Attachment; +import org.nuiton.jredmine.model.News; +import org.nuiton.jredmine.model.TimeEntry; +import org.nuiton.jredmine.model.Version; +import org.nuiton.jredmine.model.VersionStatusEnum; + +import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * Factory of {@link RedmineRequest}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class RedmineRequestFactory { + + public static final DateFormat DATE_FORMAT = + new SimpleDateFormat("yyyy-MM-dd"); + + /** registred requests */ + protected final Map<String, RedmineRequestBuilder> requestBuilders; + + public RedmineRequestFactory() { + requestBuilders = Maps.newTreeMap(); + } + + public void addDefaultRequests() { + for (DEFAULT_REQUESTS request : DEFAULT_REQUESTS.values()) { + addRequestBuilder(request.requestBuilder); + } + } + + /** + * Add a request into the factory. + * + * @param builder the new request to add + */ + public void addRequestBuilder(RedmineRequestBuilder builder) { + String name = builder.getName(); + if (requestBuilders.containsKey(name)) { + throw new IllegalArgumentException("a request builder with name " + + name + " already exists."); + } + requestBuilders.put(name, builder); + } + + /** + * Obtain a request given his id and the args given. + * + * @param id id of the request + * @param args args passed to build the request + * @return the new request + */ + public RedmineRequest getRequest(String id, Object... args) { + + RedmineRequest r; + RedmineRequestBuilder builder = requestBuilders.get(id); + if (builder == null) { + + throw new IllegalArgumentException( + "Could not find any request builder for request named '" + + id + "'"); + } + r = builder.create(args); + if (r == null) { + throw new IllegalArgumentException( + "Could not find any request named '" + id + + "' using builder " + builder); + } + return r; + } + + public enum DEFAULT_REQUESTS { + + // misc requests + + PING(new DefaultRedmineRequestBuilder("ping")), + LOGOUT(new DefaultRedmineRequestBuilder("logout")), + LOGIN(new DefaultRedmineRequestBuilder("login") { + private static final long serialVersionUID = 1L; + + @Override + public String[] getParameters(Object... args) { + String login = (String) args[0]; + String password = (String) args[1]; + return new String[]{"username", login, "password", password}; + } + }), + + // with no scope + + GET_PROJECT_LIST(new DefaultRedmineRequestBuilder("get_projects.xml")), + GET_USER_PROJECTS(new DefaultRedmineRequestBuilder("get_user_projects.xml")), + GET_ISSUE_STATUS_LIST(new DefaultRedmineRequestBuilder("get_issue_statuses.xml")), + GET_ISSUE_PRIORITY_LIST(new DefaultRedmineRequestBuilder("get_issue_priorities.xml")), + + // with project scope + + GET_PROJECT(new ProjectScopeRedmineRequestBuilder("get_project.xml")), + GET_PROJECT_ISSUES(new ProjectScopeRedmineRequestBuilder("get_project_issues.xml")), + GET_PROJECT_OPENED_ISSUES(new ProjectScopeRedmineRequestBuilder("get_project_opened_issues.xml")), + GET_PROJECT_CLOSED_ISSUES(new ProjectScopeRedmineRequestBuilder("get_project_closed_issues.xml")), + GET_VERSION_LIST(new ProjectScopeRedmineRequestBuilder("get_project_versions.xml")), + GET_ISSUE_CATEGORY_LIST(new ProjectScopeRedmineRequestBuilder("get_issue_categories.xml")), + GET_TRACKER_LIST(new ProjectScopeRedmineRequestBuilder("get_project_trackers.xml")), + GET_USER_LIST(new ProjectScopeRedmineRequestBuilder("get_project_users.xml")), + GET_NEWS_LIST(new ProjectScopeRedmineRequestBuilder("get_project_news.xml")), + + ADD_VERSION(new ProjectScopeRedmineRequestBuilder("add_version.xml") { + private static final long serialVersionUID = 1L; + + @Override + public String[] getParameters(Object... args) { + Version version = (Version) args[1]; + String date = getVersionEffectiveDate(version); + String status = getVersionStatus(version); + return new String[]{ + "version[name]", version.getName(), + "version[description]", version.getDescription(), + "version[effective_date]", date, + "version[status]", status + }; + } + }), + UPDATE_VERSION(new ProjectScopeRedmineRequestBuilder("update_version.xml") { + private static final long serialVersionUID = 1L; + + @Override + public String[] getParameters(Object... args) { + Version version = (Version) args[1]; + String date = getVersionEffectiveDate(version); + String status = getVersionStatus(version); + return new String[]{ + "version[name]", version.getName(), + "version[description]", version.getDescription(), + "version[effective_date]", date, + "version[status]", status + }; + } + }), + NEXT_VERSION(new ProjectScopeRedmineRequestBuilder("next_version.xml") { + private static final long serialVersionUID = 1L; + + @Override + public String[] getParameters(Object... args) { + + + Version version = (Version) args[1]; + String date = getVersionEffectiveDate(version); + String status = getVersionStatus(version); + String oldVersionName = (String) args[2]; + return new String[]{ + "oldVersionName", oldVersionName, + "version[name]", version.getName(), + "version[description]", version.getDescription(), + "version[effective_date]", date, + "version[status]", status + }; + } + }), + ADD_NEWS(new ProjectScopeRedmineRequestBuilder("add_news.xml") { + private static final long serialVersionUID = 1L; + + @Override + 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() + }; + } + }), + + // version scope + GET_VERSION(new VersionScopeRedmineRequestBuilder("get_version.xml")), + GET_ISSUE_LIST(new VersionScopeRedmineRequestBuilder("get_version_issues.xml")), + GET_ATTACHMENTS_LIST(new VersionScopeRedmineRequestBuilder("get_version_attachments.xml")), + ADD_ATTACHMENT(new VersionScopeRedmineRequestBuilder("add_version_attachment.xml") { + private static final long serialVersionUID = 1L; + + @Override + public String[] getParameters(Object... args) { + String versionId = (String) args[1]; + Attachment attachment = (Attachment) args[2]; + return new String[]{ + "version_name", versionId, + "attachment[description]", attachment.getDescription() + }; + } + + @Override + public Map<String, File> getAttachments(Object... args) { + Map<String, File> upload = new HashMap<String, File>(); + Attachment attachment = (Attachment) args[2]; + upload.put("attachment[file]", attachment.getToUpload()); + return upload; + } + }), + + // issue scope + + GET_ISSUE_TIME_ENTRY_LIST(new IssueScopeRedmineRequestBuilder("get_issue_times.xml")), + + ADD_ISSUE_TIME_ENTRY(new IssueScopeRedmineRequestBuilder("add_issue_time.xml") { + private static final long serialVersionUID = 1L; + + @Override + public String[] getParameters(Object... args) { + String issueId = (String) args[1]; + TimeEntry timeEntry = (TimeEntry) args[2]; + Date d = timeEntry.getSpentOn(); + if (d == null) { + d = new Date(); + } + String date = DATE_FORMAT.format(d); + return new String[]{ + "issue_id", issueId, + //"timeEntry[issue_id]", issueId, + "time_entry[activity_id]", timeEntry.getActivityId() + "", + "time_entry[spent_on]", date, + "time_entry[hours]", timeEntry.getHours() + "", + "time_entry[comments]", timeEntry.getComments() == null ? "" : timeEntry.getComments() + }; + } + }); + + private final RedmineRequestBuilder requestBuilder; + + DEFAULT_REQUESTS(RedmineRequestBuilder requestBuilder) { + this.requestBuilder = requestBuilder; + } + + public RedmineRequestBuilder getRequestBuilder() { + return requestBuilder; + } + + public String requestName() { + return requestBuilder.getName(); + } + } + + protected static String getVersionStatus(Version version) { + String status = version.getStatus(); + if (Strings.isNullOrEmpty(status)) { + + // use default open status + status = VersionStatusEnum.open.name(); + } + return status; + } + + protected static String getVersionEffectiveDate(Version version) { + return version.getEffectiveDate() == null ? "" : + DATE_FORMAT.format(version.getEffectiveDate()); + } + + +} Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/RedmineRequestFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/VersionScopeRedmineRequestBuilder.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/VersionScopeRedmineRequestBuilder.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/VersionScopeRedmineRequestBuilder.java 2012-03-25 15:37:26 UTC (rev 256) @@ -0,0 +1,57 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.jredmine.request; + +/** + * To build request with a project and version scope. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class VersionScopeRedmineRequestBuilder extends ProjectScopeRedmineRequestBuilder { + + private static final long serialVersionUID = 1L; + + public VersionScopeRedmineRequestBuilder(String name, String action) { + super(name, action); + } + + public VersionScopeRedmineRequestBuilder(String action) { + super(action); + } + + @Override + public String[] getParameters(Object... args) { + + // args 1 = project id + // args 2 = version name + + String versionName = (String) args[1]; + + return new String[]{ + "version_name", versionName + }; + } +} Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/request/VersionScopeRedmineRequestBuilder.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r255 - in trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model: . io/xpp3
by tchemit＠users.nuiton.org March 25, 2012

March 25, 2012

Author: tchemit Date: 2012-03-25 17:36:04 +0200 (Sun, 25 Mar 2012) New Revision: 255 Url: http://nuiton.org/repositories/revision/jredmine/255 Log: refs #2024 (add headers + svn properties) Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/CustomField.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/ProjectRef.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/UserRef.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/CustomFieldXpp3Reader.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserRefXpp3Reader.java Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/CustomField.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/CustomField.java 2012-03-25 15:35:17 UTC (rev 254) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/CustomField.java 2012-03-25 15:36:04 UTC (rev 255) @@ -1,3 +1,27 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.jredmine.model; /** Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/CustomField.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/ProjectRef.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/ProjectRef.java 2012-03-25 15:35:17 UTC (rev 254) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/ProjectRef.java 2012-03-25 15:36:04 UTC (rev 255) @@ -1,3 +1,27 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.jredmine.model; /** Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/ProjectRef.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/UserRef.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/UserRef.java 2012-03-25 15:35:17 UTC (rev 254) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/UserRef.java 2012-03-25 15:36:04 UTC (rev 255) @@ -1,3 +1,27 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.jredmine.model; /** Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/UserRef.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/CustomFieldXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/CustomFieldXpp3Reader.java 2012-03-25 15:35:17 UTC (rev 254) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/CustomFieldXpp3Reader.java 2012-03-25 15:36:04 UTC (rev 255) @@ -1,3 +1,27 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.jredmine.model.io.xpp3; import org.nuiton.io.xpp3.AbstractXpp3Reader; Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/CustomFieldXpp3Reader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserRefXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserRefXpp3Reader.java 2012-03-25 15:35:17 UTC (rev 254) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserRefXpp3Reader.java 2012-03-25 15:36:04 UTC (rev 255) @@ -2,8 +2,8 @@ * #%L * JRedmine :: Client * - * $Id: ProjectXpp3Reader.java 211 2011-06-04 17:01:31Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client/src/main/java/org/… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2010 Tony Chemit, CodeLutin * %% Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserRefXpp3Reader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r254 - trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2
by tchemit＠users.nuiton.org March 25, 2012

March 25, 2012

Author: tchemit Date: 2012-03-25 17:35:17 +0200 (Sun, 25 Mar 2012) New Revision: 254 Url: http://nuiton.org/repositories/revision/jredmine/254 Log: refs #2033 add header + svn properties Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/attachment.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issue.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueCategory.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issuePriority.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueStatus.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/news.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/project.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/timeEntry.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/tracker.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/user.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/version.xml Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/attachment.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/attachment.xml 2012-03-25 14:40:04 UTC (rev 253) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/attachment.xml 2012-03-25 15:35:17 UTC (rev 254) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: attachments.xml 186 2011-05-20 12:32:08Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client/src/test/resources… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2010 Tony Chemit, CodeLutin %% Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/attachment.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issue.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issue.xml 2012-03-25 14:40:04 UTC (rev 253) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issue.xml 2012-03-25 15:35:17 UTC (rev 254) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: issues.xml 186 2011-05-20 12:32:08Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client/src/test/resources… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2010 Tony Chemit, CodeLutin %% Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issue.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueCategory.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueCategory.xml 2012-03-25 14:40:04 UTC (rev 253) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueCategory.xml 2012-03-25 15:35:17 UTC (rev 254) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: issueCategorys.xml 186 2011-05-20 12:32:08Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client/src/test/resources… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2010 Tony Chemit, CodeLutin %% Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueCategory.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issuePriority.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issuePriority.xml 2012-03-25 14:40:04 UTC (rev 253) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issuePriority.xml 2012-03-25 15:35:17 UTC (rev 254) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: issuePrioritys.xml 193 2011-05-20 22:44:58Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client/src/test/resources… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2010 Tony Chemit, CodeLutin %% Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issuePriority.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueStatus.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueStatus.xml 2012-03-25 14:40:04 UTC (rev 253) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueStatus.xml 2012-03-25 15:35:17 UTC (rev 254) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: issueStatuss.xml 186 2011-05-20 12:32:08Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client/src/test/resources… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2010 Tony Chemit, CodeLutin %% Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueStatus.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/news.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/news.xml 2012-03-25 14:40:04 UTC (rev 253) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/news.xml 2012-03-25 15:35:17 UTC (rev 254) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: newss.xml 186 2011-05-20 12:32:08Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client/src/test/resources… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2010 Tony Chemit, CodeLutin %% Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/news.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/project.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/project.xml 2012-03-25 14:40:04 UTC (rev 253) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/project.xml 2012-03-25 15:35:17 UTC (rev 254) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: projects.xml 186 2011-05-20 12:32:08Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client/src/test/resources… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2010 Tony Chemit, CodeLutin %% Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/project.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/timeEntry.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/timeEntry.xml 2012-03-25 14:40:04 UTC (rev 253) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/timeEntry.xml 2012-03-25 15:35:17 UTC (rev 254) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: timeEntrys.xml 186 2011-05-20 12:32:08Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client/src/test/resources… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2010 Tony Chemit, CodeLutin %% Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/timeEntry.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/tracker.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/tracker.xml 2012-03-25 14:40:04 UTC (rev 253) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/tracker.xml 2012-03-25 15:35:17 UTC (rev 254) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: trackers.xml 186 2011-05-20 12:32:08Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client/src/test/resources… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2010 Tony Chemit, CodeLutin %% Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/tracker.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/user.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/user.xml 2012-03-25 14:40:04 UTC (rev 253) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/user.xml 2012-03-25 15:35:17 UTC (rev 254) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: users.xml 186 2011-05-20 12:32:08Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client/src/test/resources… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2010 Tony Chemit, CodeLutin %% Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/user.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/version.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/version.xml 2012-03-25 14:40:04 UTC (rev 253) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/version.xml 2012-03-25 15:35:17 UTC (rev 254) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: versions.xml 186 2011-05-20 12:32:08Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client/src/test/resources… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2010 Tony Chemit, CodeLutin %% Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/version.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r253 - trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model
by tchemit＠users.nuiton.org March 25, 2012

March 25, 2012

Author: tchemit Date: 2012-03-25 16:40:04 +0200 (Sun, 25 Mar 2012) New Revision: 253 Url: http://nuiton.org/repositories/revision/jredmine/253 Log: refs #2024 (Use redmine REST Api instead of the jredmine redmine plugin) Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/CustomField.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/ProjectRef.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/UserRef.java Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/News.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Project.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Version.java Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/CustomField.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/CustomField.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/CustomField.java 2012-03-25 14:40:04 UTC (rev 253) @@ -0,0 +1,42 @@ +package org.nuiton.jredmine.model; + +/** + * Represents a project custom field. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class CustomField implements IdAble, I18nAble { + + protected String name; + + protected int id; + + protected String value; + + @Override + public String getName() { + return name; + } + + @Override + public int getId() { + return id; + } + + public String getValue() { + return value; + } + + public void setName(String name) { + this.name = name; + } + + public void setId(int id) { + this.id = id; + } + + public void setValue(String value) { + this.value = value; + } +} 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 2012-03-25 14:37:37 UTC (rev 252) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/News.java 2012-03-25 14:40:04 UTC (rev 253) @@ -48,6 +48,10 @@ protected Date createdOn; + protected ProjectRef project; + + protected UserRef author; + @Override public int getId() { return id; @@ -86,6 +90,14 @@ return title; } + public ProjectRef getProject() { + return project; + } + + public UserRef getAuthor() { + return author; + } + public void setAuthorId(int authorId) { this.authorId = authorId; } @@ -118,4 +130,11 @@ this.title = title; } + public void setProject(ProjectRef project) { + this.project = project; + } + + public void setAuthor(UserRef author) { + this.author = author; + } } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Project.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Project.java 2012-03-25 14:37:37 UTC (rev 252) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Project.java 2012-03-25 14:40:04 UTC (rev 253) @@ -60,6 +60,10 @@ protected boolean isPublic; + protected CustomField[] customFields; + + protected ProjectRef parent; + public Date getCreatedOn() { return createdOn; } @@ -114,6 +118,14 @@ return rgt; } + public CustomField[] getCustomFields() { + return customFields; + } + + public ProjectRef getParent() { + return parent; + } + public void setCreatedOn(Date createdOn) { this.createdOn = createdOn; } @@ -165,4 +177,12 @@ public void setRgt(int rgt) { this.rgt = rgt; } + + public void setCustomFields(CustomField[] customFields) { + this.customFields = customFields; + } + + public void setParent(ProjectRef parent) { + this.parent = parent; + } } Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/ProjectRef.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/ProjectRef.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/ProjectRef.java 2012-03-25 14:40:04 UTC (rev 253) @@ -0,0 +1,31 @@ +package org.nuiton.jredmine.model; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class ProjectRef implements IdAble, I18nAble { + + protected String name; + + protected int id; + + public String getName() { + return name; + } + + public int getId() { + return id; + } + + + public void setName(String name) { + this.name = name; + } + + public void setId(int id) { + this.id = id; + } +} \ No newline at end of file Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/UserRef.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/UserRef.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/UserRef.java 2012-03-25 14:40:04 UTC (rev 253) @@ -0,0 +1,31 @@ +package org.nuiton.jredmine.model; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class UserRef implements IdAble, I18nAble { + + protected String name; + + protected int id; + + public String getName() { + return name; + } + + public int getId() { + return id; + } + + + public void setName(String name) { + this.name = name; + } + + public void setId(int id) { + this.id = id; + } +} \ No newline at end of file Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Version.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Version.java 2012-03-25 14:37:37 UTC (rev 252) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Version.java 2012-03-25 14:40:04 UTC (rev 253) @@ -38,6 +38,8 @@ protected Date effectiveDate; + protected Date dueDate; + protected String name; protected String description; @@ -52,6 +54,8 @@ protected int projectId; + protected ProjectRef project; + public Date getCreatedOn() { return createdOn; } @@ -64,6 +68,10 @@ return effectiveDate; } + public Date getDueDate() { + return dueDate; + } + @Override public int getId() { return id; @@ -94,6 +102,10 @@ return status; } + public ProjectRef getProject() { + return project; + } + public void setCreatedOn(Date createdOn) { this.createdOn = createdOn; } @@ -106,6 +118,10 @@ this.effectiveDate = effectiveDate; } + public void setDueDate(Date dueDate) { + this.dueDate = dueDate; + } + public void setId(int id) { this.id = id; } @@ -133,4 +149,8 @@ public void setStatus(String status) { this.status = status; } + + public void setProject(ProjectRef project) { + this.project = project; + } }

1 0

r252 - in trunk/jredmine-client/src: main/java/org/nuiton/jredmine/model/io/xpp3 main/resources/META-INF/services test/java/org/nuiton/jredmine/model/io/xpp3 test/resources/org/nuiton/jredmine/model/io/xpp3 test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2 test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton
by tchemit＠users.nuiton.org March 25, 2012

March 25, 2012

Author: tchemit Date: 2012-03-25 16:37:37 +0200 (Sun, 25 Mar 2012) New Revision: 252 Url: http://nuiton.org/repositories/revision/jredmine/252 Log: fixes #2033 (improve xpp3 api) Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/CustomFieldXpp3Reader.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/ProjectRefXpp3Reader.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserRefXpp3Reader.java trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/attachment.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issue.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueCategory.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issuePriority.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueStatus.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/news.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/project.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/timeEntry.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/tracker.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/user.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/version.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/attachment.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issue.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueCategory.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issuePriority.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueStatus.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/news.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/project.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/timeEntry.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/tracker.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/user.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/version.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/attachment.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issue.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueCategory.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issuePriority.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueStatus.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/news.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/project.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/timeEntry.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/tracker.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/user.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/version.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/attachment.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issue.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueCategory.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issuePriority.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueStatus.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/news.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/project.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/timeEntry.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/tracker.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/user.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/version.xml Removed: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/attachments.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueCategorys.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issuePrioritys.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueStatuss.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issues.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/newss.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/projects.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/timeEntrys.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/trackers.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/users.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/versions.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/attachments.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueCategorys.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issuePrioritys.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueStatuss.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issues.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/newss.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/projects.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/timeEntrys.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/trackers.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/users.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/versions.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/attachments.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueCategorys.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issuePrioritys.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueStatuss.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issues.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/newss.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/projects.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/timeEntrys.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/trackers.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/users.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/versions.xml Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/AttachmentXpp3Reader.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueCategoryXpp3Reader.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssuePriorityXpp3Reader.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueStatusXpp3Reader.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/NewsXpp3Reader.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/ProjectXpp3Reader.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3Helper.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TimeEntryXpp3Reader.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TrackerXpp3Reader.java 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/VersionXpp3Reader.java trunk/jredmine-client/src/main/resources/META-INF/services/org.nuiton.io.xpp3.Xpp3Reader trunk/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/AttachmentXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/AttachmentXpp3Reader.java 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/AttachmentXpp3Reader.java 2012-03-25 14:37:37 UTC (rev 252) @@ -29,8 +29,6 @@ import java.beans.IntrospectionException; -import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; - /** * {@link Attachment} reader. * @@ -46,17 +44,17 @@ @Override protected void initMappers() throws IntrospectionException { - addTagTextContentMappers(Attachment.class, RedmineDataConverter.Integer, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Integer, true, "author-id", "container-id", "filesize", "downloads", "id"); - addTagTextContentMappers(Attachment.class, RedmineDataConverter.Datetime, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Datetime, true, "created-on"); - addTagTextContentMappers(Attachment.class, RedmineDataConverter.Text, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Text, true, "container-type", "content-type", "description", Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/CustomFieldXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/CustomFieldXpp3Reader.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/CustomFieldXpp3Reader.java 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,36 @@ +package org.nuiton.jredmine.model.io.xpp3; + +import org.nuiton.io.xpp3.AbstractXpp3Reader; +import org.nuiton.jredmine.model.CustomField; + +import java.beans.IntrospectionException; + +/** + * {@link CustomField} reader. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class CustomFieldXpp3Reader extends AbstractXpp3Reader<CustomField> { + + public CustomFieldXpp3Reader() { + super(CustomField.class, "custom_fields", "custom_field"); + } + + @Override + protected void initMappers() throws IntrospectionException { + + addAttributeValueMappers(RedmineDataConverter.Integer, true, + "id" + ); + + addAttributeValueMappers(RedmineDataConverter.Text, true, + "name" + ); + + addTagTextContentMappers(RedmineDataConverter.Text, + true, + "value"); + } + +} Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueCategoryXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueCategoryXpp3Reader.java 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueCategoryXpp3Reader.java 2012-03-25 14:37:37 UTC (rev 252) @@ -30,8 +30,6 @@ import java.beans.IntrospectionException; -import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; - /** * {@link Issue} reader. * @@ -47,12 +45,12 @@ @Override protected void initMappers() throws IntrospectionException { - addTagTextContentMappers(IssueCategory.class, RedmineDataConverter.Integer, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Integer, true, "project-id", "assigned-to-id", "id"); - addTagTextContentMappers(IssueCategory.class, RedmineDataConverter.Text, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Text, true, "name"); } } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssuePriorityXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssuePriorityXpp3Reader.java 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssuePriorityXpp3Reader.java 2012-03-25 14:37:37 UTC (rev 252) @@ -30,8 +30,6 @@ import java.beans.IntrospectionException; -import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; - /** * {@link Issue} reader. * @@ -48,17 +46,17 @@ protected void initMappers() throws IntrospectionException { - addTagTextContentMappers(IssuePriority.class, RedmineDataConverter.Integer, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Integer, true, "id", "parent-id", "project-id", "position"); - addTagTextContentMappers(IssuePriority.class, RedmineDataConverter.Boolean, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Boolean, true, "is-default", "active"); - addTagTextContentMappers(IssuePriority.class, RedmineDataConverter.Text, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Text, true, "name", "opt"); } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueStatusXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueStatusXpp3Reader.java 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueStatusXpp3Reader.java 2012-03-25 14:37:37 UTC (rev 252) @@ -30,8 +30,6 @@ import java.beans.IntrospectionException; -import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; - /** * {@link Issue} reader. * @@ -47,16 +45,18 @@ @Override protected void initMappers() throws IntrospectionException { - addTagTextContentMappers(IssueStatus.class, RedmineDataConverter.Integer, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Integer, true, "id", "position", "default-done-ratio"); - addTagTextContentMappers(IssueStatus.class, RedmineDataConverter.Boolean, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Boolean, true, "is-closed", - "is-default"); + "is-default", + "is_closed", + "is_default"); - addTagTextContentMappers(IssueStatus.class, RedmineDataConverter.Text, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Text, true, "name"); } } 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-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueXpp3Reader.java 2012-03-25 14:37:37 UTC (rev 252) @@ -26,12 +26,9 @@ import org.nuiton.io.xpp3.AbstractXpp3Reader; import org.nuiton.jredmine.model.Issue; -import org.nuiton.jredmine.model.Project; import java.beans.IntrospectionException; -import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; - /** * {@link Issue} reader. * @@ -47,7 +44,7 @@ @Override protected void initMappers() throws IntrospectionException { - addTagTextContentMappers(Issue.class, RedmineDataConverter.Integer, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Integer, true, "assigned-to-id", "author-id", "category-id", @@ -64,22 +61,22 @@ "lft", "rgt"); - addTagTextContentMappers(Issue.class, RedmineDataConverter.Float, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Float, true, "estimated-hours"); - addTagTextContentMappers(Issue.class, RedmineDataConverter.Datetime, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Datetime, true, "created-on", "updated-on"); - addTagTextContentMappers(Issue.class, RedmineDataConverter.Date, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Date, true, "due-date", "start-date"); - addTagTextContentMappers(Issue.class, RedmineDataConverter.Text, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Text, true, "description", "subject"); - addTagTextContentMappers(Issue.class, RedmineDataConverter.Boolean, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Boolean, true, "is-private"); } } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/NewsXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/NewsXpp3Reader.java 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/NewsXpp3Reader.java 2012-03-25 14:37:37 UTC (rev 252) @@ -26,11 +26,11 @@ import org.nuiton.io.xpp3.AbstractXpp3Reader; import org.nuiton.jredmine.model.News; +import org.nuiton.jredmine.model.ProjectRef; +import org.nuiton.jredmine.model.UserRef; import java.beans.IntrospectionException; -import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; - /** * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 @@ -44,18 +44,25 @@ @Override protected void initMappers() throws IntrospectionException { - addTagTextContentMappers(News.class, RedmineDataConverter.Integer, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Integer, true, "id", "author-id", "project-id", "comments-count"); - addTagTextContentMappers(News.class, RedmineDataConverter.Datetime, true, allMappers, - "created-on"); + addTagTextContentMappers(RedmineDataConverter.Datetime, true, + "created-on", + "created_on"); - addTagTextContentMappers(News.class, RedmineDataConverter.Text, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Text, true, "description", "summary", "title"); + + addTagContentMapper(ProjectRef.class, true, + new ProjectRefXpp3Reader("project")); + + addTagContentMapper(UserRef.class, true, + new UserRefXpp3Reader("author")); } } Copied: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/ProjectRefXpp3Reader.java (from rev 249, trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/ProjectXpp3Reader.java) =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/ProjectRefXpp3Reader.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/ProjectRefXpp3Reader.java 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,56 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Tony Chemit, CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.jredmine.model.io.xpp3; + +import org.nuiton.io.xpp3.AbstractXpp3Reader; +import org.nuiton.jredmine.model.Project; +import org.nuiton.jredmine.model.ProjectRef; + +import java.beans.IntrospectionException; + +/** + * {@link Project} reader. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0.0 + */ +public class ProjectRefXpp3Reader extends AbstractXpp3Reader<ProjectRef> { + + public ProjectRefXpp3Reader(String rootTagsName, String rootTagName) { + super(ProjectRef.class, rootTagsName, rootTagName); + } + + public ProjectRefXpp3Reader(String rootTagName) { + this(null, rootTagName); + } + + @Override + protected void initMappers() throws IntrospectionException { + addAttributeValueMappers(RedmineDataConverter.Integer, true, "id"); + addAttributeValueMappers(RedmineDataConverter.Text, true, "name"); + } + + +} Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/ProjectXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/ProjectXpp3Reader.java 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/ProjectXpp3Reader.java 2012-03-25 14:37:37 UTC (rev 252) @@ -25,12 +25,12 @@ package org.nuiton.jredmine.model.io.xpp3; import org.nuiton.io.xpp3.AbstractXpp3Reader; +import org.nuiton.jredmine.model.CustomField; import org.nuiton.jredmine.model.Project; +import org.nuiton.jredmine.model.ProjectRef; import java.beans.IntrospectionException; -import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; - /** * {@link Project} reader. * @@ -46,7 +46,7 @@ @Override protected void initMappers() throws IntrospectionException { - addTagTextContentMappers(Project.class, RedmineDataConverter.Integer, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Integer, true, "id", "lft", "rgt", @@ -54,17 +54,26 @@ "projects-count", "status"); - addTagTextContentMappers(Project.class, RedmineDataConverter.Boolean, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Boolean, true, "is-public"); - addTagTextContentMappers(Project.class, RedmineDataConverter.Datetime, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Datetime, true, "created-on", - "updated-on"); + "updated-on", + "created_on", + "updated_on"); - addTagTextContentMappers(Project.class, RedmineDataConverter.Text, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Text, true, "description", "homepage", "identifier", "name"); + addTagContentsMapper(CustomField.class, false, + new CustomFieldXpp3Reader()); + + addTagContentMapper(ProjectRef.class, true, + new ProjectRefXpp3Reader("parent")); } + + } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3Helper.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3Helper.java 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3Helper.java 2012-03-25 14:37:37 UTC (rev 252) @@ -157,17 +157,20 @@ try { - StringWriter sWriter = new StringWriter(); - IOUtil.copy(reader, sWriter); + if (log.isDebugEnabled()) { - String rawInput = sWriter.toString(); - if (log.isDebugEnabled()) { + StringWriter sWriter = new StringWriter(); + + IOUtil.copy(reader, sWriter); + + String rawInput = sWriter.toString(); + log.debug("content to read : \n" + rawInput); + reader = new StringReader(rawInput); } - StringReader sReader = new StringReader(rawInput); - result = modelReader.readArray(sReader, strict); + result = modelReader.readArray(reader, strict); } finally { IOUtil.close(reader); @@ -209,17 +212,18 @@ try { - StringWriter sWriter = new StringWriter(); - IOUtil.copy(reader, sWriter); + if (log.isDebugEnabled()) { + StringWriter sWriter = new StringWriter(); - String rawInput = sWriter.toString(); - if (log.isDebugEnabled()) { + IOUtil.copy(reader, sWriter); + + String rawInput = sWriter.toString(); log.debug("content to read : \n" + rawInput); + reader = new StringReader(rawInput); } - StringReader sReader = new StringReader(rawInput); - result = modelReader.read(sReader, strict); + result = modelReader.read(reader, strict); } finally { IOUtil.close(reader); Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TimeEntryXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TimeEntryXpp3Reader.java 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TimeEntryXpp3Reader.java 2012-03-25 14:37:37 UTC (rev 252) @@ -29,8 +29,6 @@ import java.beans.IntrospectionException; -import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; - /** * Created: 31 déc. 2009 * @@ -45,7 +43,7 @@ @Override protected void initMappers() throws IntrospectionException { - addTagTextContentMappers(TimeEntry.class, RedmineDataConverter.Integer, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Integer, true, "id", "activity-id", "issue-id", @@ -56,18 +54,18 @@ "tweek" ); - addTagTextContentMappers(TimeEntry.class, RedmineDataConverter.Float, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Float, true, "hours" ); - addTagTextContentMappers(TimeEntry.class, RedmineDataConverter.Datetime, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Datetime, true, "created-on", "updated-on"); - addTagTextContentMappers(TimeEntry.class, RedmineDataConverter.Date, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Date, true, "spent-on"); - addTagTextContentMappers(TimeEntry.class, RedmineDataConverter.Text, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Text, true, "comments"); } } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TrackerXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TrackerXpp3Reader.java 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TrackerXpp3Reader.java 2012-03-25 14:37:37 UTC (rev 252) @@ -29,8 +29,6 @@ import java.beans.IntrospectionException; -import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; - /** * {@link Tracker} reader. * @@ -46,17 +44,17 @@ @Override protected void initMappers() throws IntrospectionException { - addTagTextContentMappers(Tracker.class, RedmineDataConverter.Integer, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Integer, true, "id", "project-id", "tracker-id", "position"); - addTagTextContentMappers(Tracker.class, RedmineDataConverter.Boolean, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Boolean, true, "is-in-chlog", "is-in-roadmap"); - addTagTextContentMappers(Tracker.class, RedmineDataConverter.Text, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Text, true, "name"); } } Added: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserRefXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserRefXpp3Reader.java (rev 0) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserRefXpp3Reader.java 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,56 @@ +/* + * #%L + * JRedmine :: Client + * + * $Id: ProjectXpp3Reader.java 211 2011-06-04 17:01:31Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client/src/main/java/org/… $ + * %% + * Copyright (C) 2009 - 2010 Tony Chemit, CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.jredmine.model.io.xpp3; + +import org.nuiton.io.xpp3.AbstractXpp3Reader; +import org.nuiton.jredmine.model.Project; +import org.nuiton.jredmine.model.UserRef; + +import java.beans.IntrospectionException; + +/** + * {@link Project} reader. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0.0 + */ +public class UserRefXpp3Reader extends AbstractXpp3Reader<UserRef> { + + public UserRefXpp3Reader(String rootTagsName, String rootTagName) { + super(UserRef.class, rootTagsName, rootTagName); + } + + public UserRefXpp3Reader(String rootTagName) { + this(null, rootTagName); + } + + @Override + protected void initMappers() throws IntrospectionException { + addAttributeValueMappers(RedmineDataConverter.Integer, true, "id"); + addAttributeValueMappers(RedmineDataConverter.Text, true, "name"); + } + + +} 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-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserXpp3Reader.java 2012-03-25 14:37:37 UTC (rev 252) @@ -29,8 +29,6 @@ import java.beans.IntrospectionException; -import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; - /** * {@link User} reader. * @@ -46,23 +44,23 @@ @Override protected void initMappers() throws IntrospectionException { - addTagTextContentMappers(User.class, RedmineDataConverter.Integer, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Integer, true, "id", "auth-source-id", "member-id", "role-id", "status"); - addTagTextContentMappers(User.class, RedmineDataConverter.Boolean, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Boolean, true, "admin", "mail-notification"); - addTagTextContentMappers(User.class, RedmineDataConverter.Datetime, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Datetime, true, "created-on", "updated-on", "last-login-on"); - addTagTextContentMappers(User.class, RedmineDataConverter.Text, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Text, true, "firstname", "hashed-password", "language", Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/VersionXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/VersionXpp3Reader.java 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/VersionXpp3Reader.java 2012-03-25 14:37:37 UTC (rev 252) @@ -25,12 +25,11 @@ package org.nuiton.jredmine.model.io.xpp3; import org.nuiton.io.xpp3.AbstractXpp3Reader; +import org.nuiton.jredmine.model.ProjectRef; import org.nuiton.jredmine.model.Version; import java.beans.IntrospectionException; -import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; - /** * {@link Version} reader. * @@ -46,21 +45,26 @@ @Override protected void initMappers() throws IntrospectionException { - addTagTextContentMappers(Version.class, RedmineDataConverter.Integer, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Integer, true, "id", "project-id"); - addTagTextContentMappers(Version.class, RedmineDataConverter.Datetime, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Datetime, true, "created-on", - "updated-on"); - addTagTextContentMappers(Version.class, RedmineDataConverter.Date, true, allMappers, - "effective-date"); + "updated-on", + "created_on", + "updated_on"); + addTagTextContentMappers(RedmineDataConverter.Date, true, + "effective-date", "due_date"); - addTagTextContentMappers(Version.class, RedmineDataConverter.Text, true, allMappers, + addTagTextContentMappers(RedmineDataConverter.Text, true, "name", "description", "wiki-page-title", "sharing", "status"); + + addTagContentMapper(ProjectRef.class, true, + new ProjectRefXpp3Reader("project")); } } Modified: trunk/jredmine-client/src/main/resources/META-INF/services/org.nuiton.io.xpp3.Xpp3Reader =================================================================== --- trunk/jredmine-client/src/main/resources/META-INF/services/org.nuiton.io.xpp3.Xpp3Reader 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/main/resources/META-INF/services/org.nuiton.io.xpp3.Xpp3Reader 2012-03-25 14:37:37 UTC (rev 252) @@ -9,3 +9,4 @@ org.nuiton.jredmine.model.io.xpp3.UserXpp3Reader org.nuiton.jredmine.model.io.xpp3.VersionXpp3Reader org.nuiton.jredmine.model.io.xpp3.TimeEntryXpp3Reader +org.nuiton.jredmine.model.io.xpp3.CustomFieldXpp3Reader 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-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java 2012-03-25 14:37:37 UTC (rev 252) @@ -24,15 +24,15 @@ */ package org.nuiton.jredmine.model.io.xpp3; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codehaus.plexus.util.IOUtil; +import com.google.common.base.Preconditions; +import com.google.common.base.Supplier; +import com.google.common.collect.Lists; import org.junit.After; import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; import org.nuiton.jredmine.TestHelper; import org.nuiton.jredmine.model.Attachment; import org.nuiton.jredmine.model.Issue; @@ -41,54 +41,146 @@ import org.nuiton.jredmine.model.IssueStatus; import org.nuiton.jredmine.model.News; import org.nuiton.jredmine.model.Project; -import org.nuiton.jredmine.model.RedmineModelEnum; import org.nuiton.jredmine.model.TimeEntry; import org.nuiton.jredmine.model.Tracker; import org.nuiton.jredmine.model.User; import org.nuiton.jredmine.model.Version; import java.beans.Introspector; +import java.io.Closeable; import java.io.File; -import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Set; /** * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ -public class RedmineXpp3HelperTest { +(a)RunWith(Parameterized.class) +public class RedmineXpp3HelperTest<T> { - protected static final Log log = - LogFactory.getLog(RedmineXpp3HelperTest.class); + @Parameterized.Parameters + public static List<Object[]> data() { + return Arrays.asList(new Object[][]{ + {"single", Attachment.class, newSingleData(Attachment.class)}, + {"single", Issue.class, newSingleData(Issue.class)}, + {"single", IssueCategory.class, newSingleData(IssueCategory.class)}, + {"single", IssuePriority.class, newSingleData(IssuePriority.class)}, + {"single", IssueStatus.class, newSingleData(IssueStatus.class)}, + {"single", News.class, newSingleData(News.class)}, + {"single", Project.class, newSingleData(Project.class)}, + {"single", TimeEntry.class, newSingleData(TimeEntry.class)}, + {"single", Tracker.class, newSingleData(Tracker.class)}, + {"single", User.class, newSingleData(User.class)}, + {"single", Version.class, newSingleData(Version.class)}, + {"single2", Issue.class, new SingleDataSupplier<Issue>(Issue.class) { - //TODO use the RedmineModelEnum and finish the model mock (miss some types) - private static final RedmineModelEnum[] TYPE_ORDER = new RedmineModelEnum[]{ - RedmineModelEnum.attachment, - RedmineModelEnum.issue, - RedmineModelEnum.project, - RedmineModelEnum.tracker, - RedmineModelEnum.user, - RedmineModelEnum.version, - RedmineModelEnum.issueStatus, - RedmineModelEnum.issuePriority, - RedmineModelEnum.issueCategory, - RedmineModelEnum.news, - RedmineModelEnum.timeEntry - }; + @Override + public Issue get() { + Issue issue = super.get(); + issue.setIsPrivate(true); + return issue; + } + @Override + public void close() throws IOException { + super.close(); + Issue issue = get(); + issue.setIsPrivate(false); + } + }}, + {"single2", User.class, new SingleDataSupplier<User>(User.class) { + + @Override + public User get() { + User user = super.get(); + user.setSalt("38006729a049cd820aafd6c2bb3b193f"); + return user; + } + + @Override + public void close() throws IOException { + super.close(); + User issue = get(); + issue.setSalt(null); + } + }}, + + {"array-empty", Attachment.class, newEmptyListData(Attachment.class)}, + {"array-empty", Issue.class, newEmptyListData(Issue.class)}, + {"array-empty", IssueCategory.class, newEmptyListData(Attachment.class)}, + {"array-empty", IssuePriority.class, newEmptyListData(IssuePriority.class)}, + {"array-empty", IssueStatus.class, newEmptyListData(IssueStatus.class)}, + {"array-empty", News.class, newEmptyListData(News.class)}, + {"array-empty", Project.class, newEmptyListData(Project.class)}, + {"array-empty", TimeEntry.class, newEmptyListData(TimeEntry.class)}, + {"array-empty", Tracker.class, newEmptyListData(Tracker.class)}, + {"array-empty", User.class, newEmptyListData(User.class)}, + {"array-empty", Version.class, newEmptyListData(Version.class)}, + + {"array-empty2", Attachment.class, newEmptyListData(Attachment.class)}, + {"array-empty2", Issue.class, newEmptyListData(Issue.class)}, + {"array-empty2", IssueCategory.class, newEmptyListData(IssueCategory.class)}, + {"array-empty2", IssuePriority.class, newEmptyListData(IssuePriority.class)}, + {"array-empty2", IssueStatus.class, newEmptyListData(IssueStatus.class)}, + {"array-empty2", News.class, newEmptyListData(News.class)}, + {"array-empty2", Project.class, newEmptyListData(Project.class)}, + {"array-empty2", TimeEntry.class, newEmptyListData(TimeEntry.class)}, + {"array-empty2", Tracker.class, newEmptyListData(Tracker.class)}, + {"array-empty2", User.class, newEmptyListData(User.class)}, + {"array-empty2", Version.class, newEmptyListData(Version.class)}, + + + {"array-singleton", Attachment.class, newSingletonListData(Attachment.class)}, + {"array-singleton", Issue.class, newSingletonListData(Issue.class)}, + {"array-singleton", IssueCategory.class, newSingletonListData(IssueCategory.class)}, + {"array-singleton", IssuePriority.class, newSingletonListData(IssuePriority.class)}, + {"array-singleton", IssueStatus.class, newSingletonListData(IssueStatus.class)}, + {"array-singleton", News.class, newSingletonListData(News.class)}, + {"array-singleton", Project.class, newSingletonListData(Project.class)}, + {"array-singleton", TimeEntry.class, newSingletonListData(TimeEntry.class)}, + {"array-singleton", Tracker.class, newSingletonListData(Tracker.class)}, + {"array-singleton", User.class, newSingletonListData(User.class)}, + {"array-singleton", Version.class, newSingletonListData(Version.class)}, + + {"array-multi", Attachment.class, newMultiListData(Attachment.class)}, + {"array-multi", Issue.class, newMultiListData(Issue.class)}, + {"array-multi", IssueCategory.class, newMultiListData(IssueCategory.class)}, + {"array-multi", IssuePriority.class, newMultiListData(IssuePriority.class)}, + {"array-multi", IssueStatus.class, newMultiListData(IssueStatus.class)}, + {"array-multi", News.class, newMultiListData(News.class)}, + {"array-multi", Project.class, newMultiListData(Project.class)}, + {"array-multi", TimeEntry.class, newMultiListData(TimeEntry.class)}, + {"array-multi", Tracker.class, newMultiListData(Tracker.class)}, + {"array-multi", User.class, newMultiListData(User.class)}, + {"array-multi", Version.class, newMultiListData(Version.class)}, + }); + } + protected static File testDir; protected static RedmineXpp3Helper builder; - File file; + private final Class<T> type; - protected boolean verbose; + private final Supplier<?> result; - protected static int universeSize; + protected final String resourcePath; + public RedmineXpp3HelperTest(String path, + Class<T> type, + Supplier<?> result) { + Preconditions.checkNotNull(path); + Preconditions.checkNotNull(type); + Preconditions.checkNotNull(result); + this.type = type; + this.result = result; + resourcePath = "/" + getClass().getPackage().getName().replaceAll("\\.", "/") + "/" + path + "/" + Introspector.decapitalize(type.getSimpleName()) + ".xml"; + } + @BeforeClass public static void setUpClass() throws Exception { @@ -96,23 +188,8 @@ builder = new RedmineXpp3Helper(); - log.info("test dir : " + TestHelper.getRelativePath(TestHelper.getBasedir(), testDir)); - // setup memory model TestHelper.loadMemoryModel(); - - universeSize = TYPE_ORDER.length; - - if (universeSize < RedmineModelEnum.values().length) { - log.warn("There is some types of the model which are not tested :"); - Set<RedmineModelEnum> keySet = TestHelper.getMemoryModel().keySet(); - for (RedmineModelEnum t : RedmineModelEnum.values()) { - if (!keySet.contains(t)) { - log.warn(t); - } - } - } - } @AfterClass @@ -121,14 +198,12 @@ builder = null; } - @Before - public void setUp() { - verbose = TestHelper.isVerbose(); - } + @After + public void tearDown() throws IOException { + if (result instanceof Closeable) { + ((Closeable) result).close(); + } - @After - public void tearDown() { - file = null; } /** @@ -139,187 +214,143 @@ @Test public void testRead() throws Exception { - TestAction action = new TestAction() { + Object expected = result.get(); - @Override - protected <T> void runForType(File rootDir, Class<T> type, List<?> expected) throws Exception { + InputStream stream = getClass().getResourceAsStream(resourcePath); + try { - File file = new File(rootDir, Introspector.decapitalize(type.getSimpleName()) + ".xml"); + if (expected instanceof List<?>) { - if (verbose) { - log.info("will test " + TestHelper.getRelativePath(TestHelper.getBasedir(), file)); - } + testForListData(stream, (List<T>) expected); - // test from file + } else { - T actual = builder.readObject(type, file, true); + testForSingleData(stream, (T) expected); + } + } finally { + if (stream != null) { + stream.close(); + } + } + } - TestHelper.assertMyEquals(type, expected.get(0), actual); + protected void testForSingleData(InputStream stream, T expected) throws Exception { - // test from string + T actual; - FileInputStream input = new FileInputStream(file); - try { - String txt = IOUtil.toString(input); + // test from file - actual = builder.readObject(type, txt, true); + try { + actual = builder.readObject(type, stream, true); + } catch (Exception e) { + throw new IllegalStateException("Could not read from resource " + resourcePath, e); + } + TestHelper.assertMyEquals(type, expected, actual); - TestHelper.assertMyEquals(type, expected.get(0), actual); - } finally { - input.close(); - } - } - }; + } - action.run("single", - Arrays.asList(TestHelper.getModel(Attachment.class).get(0)), - Arrays.asList(TestHelper.getModel(Issue.class).get(0)), - Arrays.asList(TestHelper.getModel(Project.class).get(0)), - Arrays.asList(TestHelper.getModel(Tracker.class).get(0)), - Arrays.asList(TestHelper.getModel(User.class).get(0)), - Arrays.asList(TestHelper.getModel(Version.class).get(0)), - Arrays.asList(TestHelper.getModel(IssueStatus.class).get(0)), - Arrays.asList(TestHelper.getModel(IssuePriority.class).get(0)), - Arrays.asList(TestHelper.getModel(IssueCategory.class).get(0)), - Arrays.asList(TestHelper.getModel(News.class).get(0)), - Arrays.asList(TestHelper.getModel(TimeEntry.class).get(0)) - ); + protected void testForListData(InputStream stream, List<T> expected) throws Exception { - Issue issue = TestHelper.getModel(Issue.class).get(0); - User user = TestHelper.getModel(User.class).get(0); - issue.setIsPrivate(true); - user.setSalt("38006729a049cd820aafd6c2bb3b193f"); + T[] actual; + + // test from file + 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); + actual = builder.readObjects(type, stream, true); + } catch (Exception e) { + throw new IllegalStateException("Could not read " + resourcePath, e); } + TestHelper.assertMyListEquals(type, expected, actual); } - /** - * Test the method {@code readArray} of class ModelBuilder. - * - * @throws Exception for any exceptions - */ - @Test - @SuppressWarnings("unchecked") - public void testReadArray() throws Exception { + static class SingleDataSupplier<T> implements Supplier<T>, Closeable { - TestAction action = new TestAction() { + protected final Class<T> type; - @Override - protected <T> void runForType(File rootDir, Class<T> type, List<?> expected) throws Exception { + SingleDataSupplier(Class<T> type) { + this.type = type; + } - File file = new File(rootDir, Introspector.decapitalize(type.getSimpleName()) + "s.xml"); + @Override + public T get() { + return TestHelper.getModel(type, 0); + } - if (verbose) { - log.info("will test " + TestHelper.getRelativePath(TestHelper.getBasedir(), file)); - } + @Override + public void close() throws IOException { + } + } - // test from file + static class EmptyListDataSupplier<T> implements Supplier<List<T>>, Closeable { - T[] actual = builder.readObjects(type, file, true); + protected final Class<T> type; - TestHelper.assertMyListEquals(type, (List<T>) expected, actual); + EmptyListDataSupplier(Class<T> type) { + this.type = type; + } - FileInputStream input = new FileInputStream(file); - try { - // test from text - String txt = IOUtil.toString(input); + @Override + public List<T> get() { + return Collections.emptyList(); + } - actual = builder.readObjects(type, txt, true); + @Override + public void close() throws IOException { + } + } - TestHelper.assertMyListEquals(type, (List<T>) expected, actual); - } finally { - input.close(); - } - } - }; + static class SingletonListDataSupplier<T> implements Supplier<List<T>>, Closeable { - action.run("array-empty", - Collections.emptyList(), - Collections.emptyList(), - Collections.emptyList(), - Collections.emptyList(), - Collections.emptyList(), - Collections.emptyList(), - Collections.emptyList(), - Collections.emptyList(), - Collections.emptyList(), - Collections.emptyList(), - Collections.emptyList()); + protected final Class<T> type; + SingletonListDataSupplier(Class<T> type) { + this.type = type; + } - action.run("array-singleton", - Arrays.asList(TestHelper.getModel(Attachment.class).get(0)), - Arrays.asList(TestHelper.getModel(Issue.class).get(0)), - Arrays.asList(TestHelper.getModel(Project.class).get(0)), - Arrays.asList(TestHelper.getModel(Tracker.class).get(0)), - Arrays.asList(TestHelper.getModel(User.class).get(0)), - Arrays.asList(TestHelper.getModel(Version.class).get(0)), - Arrays.asList(TestHelper.getModel(IssueStatus.class).get(0)), - Arrays.asList(TestHelper.getModel(IssuePriority.class).get(0)), - Arrays.asList(TestHelper.getModel(IssueCategory.class).get(0)), - Arrays.asList(TestHelper.getModel(News.class).get(0)), - Arrays.asList(TestHelper.getModel(TimeEntry.class).get(0)) - ); + @Override + public List<T> get() { + T model = TestHelper.getModel(type, 0); + List<T> result = Lists.newArrayList(); + result.add(model); + return result; + } - action.run("array-multi", - TestHelper.getModel(Attachment.class), - TestHelper.getModel(Issue.class), - TestHelper.getModel(Project.class), - TestHelper.getModel(Tracker.class), - TestHelper.getModel(User.class), - TestHelper.getModel(Version.class), - TestHelper.getModel(IssueStatus.class), - TestHelper.getModel(IssuePriority.class), - TestHelper.getModel(IssueCategory.class), - TestHelper.getModel(News.class), - TestHelper.getModel(TimeEntry.class) - ); - + @Override + public void close() throws IOException { + } } - /** A little action wrapper to simplify this test class :) */ - public static abstract class TestAction { + static class MultiListDataSupplier<T> implements Supplier<List<T>>, Closeable { - /** - * Implements the logic of action for the given {@code type} and - * the {@code expected} datas. - * - * @param <T> the type of data used - * @param rootDir the rootdir file of the local cache - * @param type the type of data used - * @param expected the list of expected datas - * @throws Exception if any pb - */ - protected abstract <T> void runForType(File rootDir, Class<T> type, List<?> expected) throws Exception; + protected final Class<T> type; - public void run(String name, List<?>... expected) throws Exception { - Assert.assertEquals(universeSize, expected.length); - File rootDir = new File(testDir, name); + MultiListDataSupplier(Class<T> type) { + this.type = type; + } - for (int i = 0; i < universeSize; i++) { + @Override + public List<T> get() { + return TestHelper.getModel(type); + } - RedmineModelEnum next = TYPE_ORDER[i]; - - if (expected[i] != null) { - runForType(rootDir, next.getModelType(), expected[i]); - } - } + @Override + public void close() throws IOException { } } + + public static <T> SingleDataSupplier<T> newSingleData(Class<T> type) { + return new SingleDataSupplier<T>(type); + } + + public static <T> EmptyListDataSupplier<T> newEmptyListData(Class<T> type) { + return new EmptyListDataSupplier<T>(type); + } + + public static <T> SingletonListDataSupplier<T> newSingletonListData(Class<T> type) { + return new SingletonListDataSupplier<T>(type); + } + + public static <T> MultiListDataSupplier<T> newMultiListData(Class<T> type) { + return new MultiListDataSupplier<T>(type); + } } Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/attachment.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/attachments.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/attachment.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/attachment.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<attachments type="array"> +</attachments> \ No newline at end of file Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/attachment.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/attachments.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/attachments.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/attachments.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<attachments type="array"> -</attachments> \ No newline at end of file Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issue.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issues.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issue.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issue.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issues type="array"> +</issues> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issue.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueCategory.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueCategorys.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueCategory.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueCategory.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issue-categories type="array"> +</issue-categories> \ No newline at end of file Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueCategory.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueCategorys.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueCategorys.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueCategorys.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<issue-categories type="array"> -</issue-categories> \ No newline at end of file Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issuePriority.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issuePrioritys.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issuePriority.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issuePriority.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issue-priorities type="array"> +</issue-priorities> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issuePriority.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issuePrioritys.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issuePrioritys.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issuePrioritys.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<issue-priorities type="array"/> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueStatus.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueStatuss.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueStatus.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueStatus.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issue-statuses type="array"> +</issue-statuses> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueStatus.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueStatuss.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueStatuss.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueStatuss.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<issue-statuses type="array"/> Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issues.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issues.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issues.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<issues type="array"> -</issues> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/news.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/newss.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/news.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/news.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<news type="array"> +</news> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/news.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/newss.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/newss.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/newss.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<news type="array"/> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/project.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/projects.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/project.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/project.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<projects type="array"> +</projects> \ No newline at end of file Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/project.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/projects.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/projects.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/projects.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<projects type="array"> -</projects> \ No newline at end of file Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/timeEntry.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/timeEntrys.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/timeEntry.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/timeEntry.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<time-entries type="array"> +</time-entries> \ No newline at end of file Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/timeEntry.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/timeEntrys.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/timeEntrys.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/timeEntrys.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<time-entries type="array"> -</time-entries> \ No newline at end of file Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/tracker.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/trackers.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/tracker.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/tracker.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<trackers type="array"> +</trackers> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/tracker.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/trackers.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/trackers.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/trackers.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<trackers type="array"> -</trackers> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/user.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/users.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/user.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/user.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<users type="array"> +</users> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/user.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/users.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/users.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/users.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<users type="array"> -</users> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/version.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/versions.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/version.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/version.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<versions type="array"> +</versions> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/version.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/versions.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/versions.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/versions.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<versions type="array"> -</versions> Added: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/attachment.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/attachment.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/attachment.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<attachments type="array"/> \ No newline at end of file Added: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issue.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issue.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issue.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issues type="array"/> Added: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueCategory.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueCategory.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueCategory.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issue-categories type="array"/> \ No newline at end of file Added: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issuePriority.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issuePriority.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issuePriority.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issue-priorities type="array"/> Added: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueStatus.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueStatus.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueStatus.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issue-statuses type="array"/> Added: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/news.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/news.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/news.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<news type="array"/> Added: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/project.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/project.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/project.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<projects type="array"/> \ No newline at end of file Added: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/timeEntry.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/timeEntry.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/timeEntry.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<time-entries type="array"/> \ No newline at end of file Added: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/tracker.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/tracker.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/tracker.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<trackers type="array"/> Added: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/user.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/user.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/user.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<users type="array"/> Added: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/version.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/version.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/version.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<versions type="array"/> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/attachment.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/attachments.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/attachment.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/attachment.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<attachments type="array"> + <attachment> + <author-id type="integer">4</author-id> + <container-id type="integer">1</container-id> + <id type="integer">1</id> + <filesize type="integer">411</filesize> + <downloads type="integer">0</downloads> + + <created-on type="datetime">2009-09-05T12:56:41+02:00</created-on> + + <container-type>Version</container-type> + <content-type>application/json</content-type> + <description></description> + <digest>6ea84342c7475c05fb077b4aca832f9a</digest> + <disk-filename>090905125641_get_issue.json</disk-filename> + <filename>get_issue.json</filename> + </attachment> + <attachment> + <author-id type="integer">4</author-id> + <container-id type="integer">1</container-id> + <id type="integer">1</id> + <filesize type="integer">411</filesize> + <downloads type="integer">0</downloads> + + <created-on type="datetime">2009-09-05T12:56:41+02:00</created-on> + + <container-type>Version</container-type> + <content-type>application/json</content-type> + <description></description> + <digest>6ea84342c7475c05fb077b4aca832f9a</digest> + <disk-filename>090905125641_get_issue.json2</disk-filename> + <filename>get_issue.json2</filename> + </attachment> +</attachments> \ No newline at end of file Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/attachment.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/attachments.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/attachments.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/attachments.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<attachments type="array"> - <attachment> - <author-id type="integer">4</author-id> - <container-id type="integer">1</container-id> - <id type="integer">1</id> - <filesize type="integer">411</filesize> - <downloads type="integer">0</downloads> - - <created-on type="datetime">2009-09-05T12:56:41+02:00</created-on> - - <container-type>Version</container-type> - <content-type>application/json</content-type> - <description></description> - <digest>6ea84342c7475c05fb077b4aca832f9a</digest> - <disk-filename>090905125641_get_issue.json</disk-filename> - <filename>get_issue.json</filename> - </attachment> - <attachment> - <author-id type="integer">4</author-id> - <container-id type="integer">1</container-id> - <id type="integer">1</id> - <filesize type="integer">411</filesize> - <downloads type="integer">0</downloads> - - <created-on type="datetime">2009-09-05T12:56:41+02:00</created-on> - - <container-type>Version</container-type> - <content-type>application/json</content-type> - <description></description> - <digest>6ea84342c7475c05fb077b4aca832f9a</digest> - <disk-filename>090905125641_get_issue.json2</disk-filename> - <filename>get_issue.json2</filename> - </attachment> -</attachments> \ No newline at end of file Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issue.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issues.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issue.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issue.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issues type="array"> + <issue> + <assigned-to-id type="integer" nil="true"></assigned-to-id> + <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 type="integer">3</parent-id> + <root-id type="integer">3</root-id> + + <estimated-hours type="float" nil="true"></estimated-hours> + + <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"></due-date> + <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> + </issue> + <issue> + <assigned-to-id type="integer" nil="true"></assigned-to-id> + <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">4</id> + + <estimated-hours type="float" nil="true"></estimated-hours> + + <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"></due-date> + <start-date type="date">2009-09-04</start-date> + + <description>avec une description !2</description> + <subject>yes!2</subject> + </issue> +</issues> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issue.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueCategory.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueCategorys.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueCategory.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueCategory.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issue-categories type="array"> + <issue-category> + <assigned-to-id type="integer" nil="true"/> + <id type="integer">1</id> + <name>categorie one</name> + <project-id type="integer">1</project-id> + </issue-category> + <issue-category> + <assigned-to-id type="integer" nil="true"/> + <id type="integer">2</id> + <name>categorie two</name> + <project-id type="integer">1</project-id> + </issue-category> +</issue-categories> \ No newline at end of file Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueCategory.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueCategorys.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueCategorys.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueCategorys.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<issue-categories type="array"> - <issue-category> - <assigned-to-id type="integer" nil="true"/> - <id type="integer">1</id> - <name>categorie one</name> - <project-id type="integer">1</project-id> - </issue-category> - <issue-category> - <assigned-to-id type="integer" nil="true"/> - <id type="integer">2</id> - <name>categorie two</name> - <project-id type="integer">1</project-id> - </issue-category> -</issue-categories> \ No newline at end of file Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issuePriority.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issuePrioritys.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issuePriority.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issuePriority.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issue-priorities type="array"> + <issue-priority> + <id type="integer">3</id> + <is-default type="boolean">false</is-default> + <name>Bas</name> + <opt>IPRI</opt> + <position type="integer">1</position> + <parent-id type="integer">1</parent-id> + <project-id type="integer">2</project-id> + <active type="boolean">true</active> + </issue-priority> + <issue-priority> + <id type="integer">4</id> + <is-default type="boolean">true</is-default> + <name>Normal</name> + <opt>IPRI</opt> + <position type="integer">2</position> + </issue-priority> + <issue-priority> + <id type="integer">5</id> + <is-default type="boolean">false</is-default> + <name>Haut</name> + <opt>IPRI</opt> + <position type="integer">3</position> + </issue-priority> + <issue-priority> + <id type="integer">6</id> + <is-default type="boolean">false</is-default> + <name>Urgent</name> + <opt>IPRI</opt> + <position type="integer">4</position> + </issue-priority> + <issue-priority> + <id type="integer">7</id> + <is-default type="boolean">false</is-default> + <name>Immédiat</name> + <opt>IPRI</opt> + <position type="integer">5</position> + </issue-priority> +</issue-priorities> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issuePriority.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issuePrioritys.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issuePrioritys.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issuePrioritys.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<issue-priorities type="array"> - <issue-priority> - <id type="integer">3</id> - <is-default type="boolean">false</is-default> - <name>Bas</name> - <opt>IPRI</opt> - <position type="integer">1</position> - <parent-id type="integer">1</parent-id> - <project-id type="integer">2</project-id> - <active type="boolean">true</active> - </issue-priority> - <issue-priority> - <id type="integer">4</id> - <is-default type="boolean">true</is-default> - <name>Normal</name> - <opt>IPRI</opt> - <position type="integer">2</position> - </issue-priority> - <issue-priority> - <id type="integer">5</id> - <is-default type="boolean">false</is-default> - <name>Haut</name> - <opt>IPRI</opt> - <position type="integer">3</position> - </issue-priority> - <issue-priority> - <id type="integer">6</id> - <is-default type="boolean">false</is-default> - <name>Urgent</name> - <opt>IPRI</opt> - <position type="integer">4</position> - </issue-priority> - <issue-priority> - <id type="integer">7</id> - <is-default type="boolean">false</is-default> - <name>Immédiat</name> - <opt>IPRI</opt> - <position type="integer">5</position> - </issue-priority> -</issue-priorities> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueStatus.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueStatuss.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueStatus.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueStatus.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issue-statuses type="array"> + + <issue-status> + <id type="integer">1</id> + <is-closed type="boolean">false</is-closed> + <is-default type="boolean">true</is-default> + <name>Nouveau</name> + <position type="integer">1</position> + <default-done-ratio>10</default-done-ratio> + </issue-status> + + <issue-status> + <id type="integer">2</id> + <is-closed type="boolean">false</is-closed> + <is-default type="boolean">false</is-default> + <name>Assigné</name> + <position type="integer">2</position> + </issue-status> + + <issue-status> + <id type="integer">3</id> + <is-closed type="boolean">false</is-closed> + <is-default type="boolean">false</is-default> + <name>Résolu</name> + <position type="integer">3</position> + </issue-status> + + <issue-status> + <id type="integer">4</id> + <is-closed type="boolean">false</is-closed> + <is-default type="boolean">false</is-default> + <name>Commentaire</name> + <position type="integer">4</position> + </issue-status> + <issue-status> + <id type="integer">5</id> + <is-closed type="boolean">true</is-closed> + <is-default type="boolean">false</is-default> + <name>Fermé</name> + <position type="integer">5</position> + </issue-status> + <issue-status> + <id type="integer">6</id> + <is-closed type="boolean">true</is-closed> + <is-default type="boolean">false</is-default> + <name>Rejeté</name> + <position type="integer">6</position> + </issue-status> +</issue-statuses> \ No newline at end of file Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueStatus.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueStatuss.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueStatuss.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueStatuss.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<issue-statuses type="array"> - - <issue-status> - <id type="integer">1</id> - <is-closed type="boolean">false</is-closed> - <is-default type="boolean">true</is-default> - <name>Nouveau</name> - <position type="integer">1</position> - <default-done-ratio>10</default-done-ratio> - </issue-status> - - <issue-status> - <id type="integer">2</id> - <is-closed type="boolean">false</is-closed> - <is-default type="boolean">false</is-default> - <name>Assigné</name> - <position type="integer">2</position> - </issue-status> - - <issue-status> - <id type="integer">3</id> - <is-closed type="boolean">false</is-closed> - <is-default type="boolean">false</is-default> - <name>Résolu</name> - <position type="integer">3</position> - </issue-status> - - <issue-status> - <id type="integer">4</id> - <is-closed type="boolean">false</is-closed> - <is-default type="boolean">false</is-default> - <name>Commentaire</name> - <position type="integer">4</position> - </issue-status> - <issue-status> - <id type="integer">5</id> - <is-closed type="boolean">true</is-closed> - <is-default type="boolean">false</is-default> - <name>Fermé</name> - <position type="integer">5</position> - </issue-status> - <issue-status> - <id type="integer">6</id> - <is-closed type="boolean">true</is-closed> - <is-default type="boolean">false</is-default> - <name>Rejeté</name> - <position type="integer">6</position> - </issue-status> -</issue-statuses> \ No newline at end of file Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issues.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issues.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issues.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<issues type="array"> - <issue> - <assigned-to-id type="integer" nil="true"></assigned-to-id> - <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 type="integer">3</parent-id> - <root-id type="integer">3</root-id> - - <estimated-hours type="float" nil="true"></estimated-hours> - - <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"></due-date> - <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> - </issue> - <issue> - <assigned-to-id type="integer" nil="true"></assigned-to-id> - <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">4</id> - - <estimated-hours type="float" nil="true"></estimated-hours> - - <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"></due-date> - <start-date type="date">2009-09-04</start-date> - - <description>avec une description !2</description> - <subject>yes!2</subject> - </issue> -</issues> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/news.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/newss.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/news.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/news.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<news type="array"> + <news> + <author-id type="integer">4</author-id> + <comments-count type="integer">0</comments-count> + <created-on type="datetime">2009-09-17T21:50:26+02:00</created-on> + <description>description</description> + <id type="integer">85</id> + <project-id type="integer">1</project-id> + <summary>summary</summary> + <title>title</title> + </news> + <news> + <author-id type="integer">4</author-id> + <comments-count type="integer">0</comments-count> + <created-on type="datetime">2009-09-17T21:55:26+02:00</created-on> + <description>description2</description> + <id type="integer">86</id> + <project-id type="integer">1</project-id> + <summary>summary2</summary> + <title>title2</title> + </news> +</news> \ No newline at end of file Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/news.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/newss.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/newss.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/newss.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<news type="array"> - <news> - <author-id type="integer">4</author-id> - <comments-count type="integer">0</comments-count> - <created-on type="datetime">2009-09-17T21:50:26+02:00</created-on> - <description>description</description> - <id type="integer">85</id> - <project-id type="integer">1</project-id> - <summary>summary</summary> - <title>title</title> - </news> - <news> - <author-id type="integer">4</author-id> - <comments-count type="integer">0</comments-count> - <created-on type="datetime">2009-09-17T21:55:26+02:00</created-on> - <description>description2</description> - <id type="integer">86</id> - <project-id type="integer">1</project-id> - <summary>summary2</summary> - <title>title2</title> - </news> -</news> \ No newline at end of file Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/project.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/projects.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/project.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/project.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<projects type="array"> + <project> + <created-on type="datetime">2009-09-04T18:11:54+02:00</created-on> + <description/> + <homepage/> + <id type="integer">1</id> + <identifier>one</identifier> + <is-public type="boolean">true</is-public> + <name>one</name> + <parent-id type="integer" nil="true"/> + <lft type="integer">1</lft> + <rgt type="integer">2</rgt> + <projects-count type="integer">0</projects-count> + <status type="integer">1</status> + <updated-on type="datetime">2009-09-04T18:11:54+02:00</updated-on> + </project> + <project> + <created-on type="datetime">2009-09-05T16:22:14+02:00</created-on> + <description/> + <homepage/> + <id type="integer">2</id> + <identifier>two</identifier> + <is-public type="boolean">false</is-public> + <name>two</name> + <parent-id type="integer" nil="true"/> + <projects-count type="integer">0</projects-count> + <status type="integer">1</status> + <updated-on type="datetime">2009-09-05T16:22:29+02:00</updated-on> + </project> +</projects> \ No newline at end of file Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/project.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/projects.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/projects.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/projects.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<projects type="array"> - <project> - <created-on type="datetime">2009-09-04T18:11:54+02:00</created-on> - <description/> - <homepage/> - <id type="integer">1</id> - <identifier>one</identifier> - <is-public type="boolean">true</is-public> - <name>one</name> - <parent-id type="integer" nil="true"/> - <lft type="integer">1</lft> - <rgt type="integer">2</rgt> - <projects-count type="integer">0</projects-count> - <status type="integer">1</status> - <updated-on type="datetime">2009-09-04T18:11:54+02:00</updated-on> - </project> - <project> - <created-on type="datetime">2009-09-05T16:22:14+02:00</created-on> - <description/> - <homepage/> - <id type="integer">2</id> - <identifier>two</identifier> - <is-public type="boolean">false</is-public> - <name>two</name> - <parent-id type="integer" nil="true"/> - <projects-count type="integer">0</projects-count> - <status type="integer">1</status> - <updated-on type="datetime">2009-09-05T16:22:29+02:00</updated-on> - </project> -</projects> \ No newline at end of file Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/timeEntry.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/timeEntrys.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/timeEntry.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/timeEntry.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<time-entries type="array"> + <time-entry> + <activity-id type="integer">8</activity-id> + <comments>Test</comments> + <created-on type="datetime">2009-12-31T23:02:02+01:00</created-on> + <hours type="float">1.0</hours> + <id type="integer">1</id> + <issue-id type="integer">6</issue-id> + <project-id type="integer">1</project-id> + <spent-on type="date">2009-12-31</spent-on> + <tmonth type="integer">12</tmonth> + <tweek type="integer">53</tweek> + <tyear type="integer">2009</tyear> + <updated-on type="datetime">2009-12-31T23:02:02+01:00</updated-on> + <user-id type="integer">4</user-id> + </time-entry> + <time-entry> + <activity-id type="integer">9</activity-id> + <comments>deuxième temps</comments> + <created-on type="datetime">2009-12-31T23:10:01+01:00</created-on> + <hours type="float">2.0</hours> + <id type="integer">2</id> + <issue-id type="integer">6</issue-id> + <project-id type="integer">1</project-id> + <spent-on type="date">2009-12-31</spent-on> + <tmonth type="integer">12</tmonth> + <tweek type="integer">53</tweek> + <tyear type="integer">2009</tyear> + <updated-on type="datetime">2009-12-31T23:10:01+01:00</updated-on> + <user-id type="integer">4</user-id> + </time-entry> +</time-entries> \ No newline at end of file Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/timeEntry.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/timeEntrys.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/timeEntrys.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/timeEntrys.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<time-entries type="array"> - <time-entry> - <activity-id type="integer">8</activity-id> - <comments>Test</comments> - <created-on type="datetime">2009-12-31T23:02:02+01:00</created-on> - <hours type="float">1.0</hours> - <id type="integer">1</id> - <issue-id type="integer">6</issue-id> - <project-id type="integer">1</project-id> - <spent-on type="date">2009-12-31</spent-on> - <tmonth type="integer">12</tmonth> - <tweek type="integer">53</tweek> - <tyear type="integer">2009</tyear> - <updated-on type="datetime">2009-12-31T23:02:02+01:00</updated-on> - <user-id type="integer">4</user-id> - </time-entry> - <time-entry> - <activity-id type="integer">9</activity-id> - <comments>deuxième temps</comments> - <created-on type="datetime">2009-12-31T23:10:01+01:00</created-on> - <hours type="float">2.0</hours> - <id type="integer">2</id> - <issue-id type="integer">6</issue-id> - <project-id type="integer">1</project-id> - <spent-on type="date">2009-12-31</spent-on> - <tmonth type="integer">12</tmonth> - <tweek type="integer">53</tweek> - <tyear type="integer">2009</tyear> - <updated-on type="datetime">2009-12-31T23:10:01+01:00</updated-on> - <user-id type="integer">4</user-id> - </time-entry> -</time-entries> \ No newline at end of file Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/tracker.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/trackers.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/tracker.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/tracker.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<trackers type="array"> + <tracker> + <id type="integer">1</id> + <project-id type="NilClass">1</project-id> + <tracker-id type="NilClass">1</tracker-id> + <position type="integer">1</position> + + <is-in-chlog type="boolean">true</is-in-chlog> + <is-in-roadmap type="boolean">false</is-in-roadmap> + + <name>Anomalie</name> + </tracker> + <tracker> + <id type="integer">2</id> + <is-in-chlog type="boolean">true</is-in-chlog> + <is-in-roadmap type="boolean">true</is-in-roadmap> + <name>Evolution</name> + <position type="integer">2</position> + <project-id type="NilClass">1</project-id> + <tracker-id type="NilClass">2</tracker-id> + </tracker> + <tracker> + <id type="integer">3</id> + <is-in-chlog type="boolean">false</is-in-chlog> + <is-in-roadmap type="boolean">false</is-in-roadmap> + <name>Assistance</name> + <position type="integer">3</position> + <project-id type="NilClass">1</project-id> + <tracker-id type="NilClass">3</tracker-id> + </tracker> +</trackers> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/tracker.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/trackers.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/trackers.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/trackers.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<trackers type="array"> - <tracker> - <id type="integer">1</id> - <project-id type="NilClass">1</project-id> - <tracker-id type="NilClass">1</tracker-id> - <position type="integer">1</position> - - <is-in-chlog type="boolean">true</is-in-chlog> - <is-in-roadmap type="boolean">false</is-in-roadmap> - - <name>Anomalie</name> - </tracker> - <tracker> - <id type="integer">2</id> - <is-in-chlog type="boolean">true</is-in-chlog> - <is-in-roadmap type="boolean">true</is-in-roadmap> - <name>Evolution</name> - <position type="integer">2</position> - <project-id type="NilClass">1</project-id> - <tracker-id type="NilClass">2</tracker-id> - </tracker> - <tracker> - <id type="integer">3</id> - <is-in-chlog type="boolean">false</is-in-chlog> - <is-in-roadmap type="boolean">false</is-in-roadmap> - <name>Assistance</name> - <position type="integer">3</position> - <project-id type="NilClass">1</project-id> - <tracker-id type="NilClass">3</tracker-id> - </tracker> -</trackers> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/user.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/users.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/user.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/user.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<users type="array"> + <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"></auth-source-id> + <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> + </user> + <user> + <admin type="boolean">true</admin> + <auth-source-id type="integer" nil="true"></auth-source-id> + <created-on type="datetime">2009-09-04T19:49:02+02:00</created-on> + <firstname>tony</firstname> + <hashed-password>8aed1322e5450badb078e1fb60a817a1df25a2ca</hashed-password> + <id type="integer">5</id> + <language>fr</language> + <last-login-on type="datetime">2009-09-04T19:49:38+02:00</last-login-on> + <lastname>chemit2</lastname> + <login>tchemit2</login> + <mail>chemit(a)codelutin.com</mail> + <mail-notification type="boolean">false</mail-notification> + <member-id type="NilClass">4</member-id> + <role-id type="NilClass">3</role-id> + <status type="integer">1</status> + <updated-on type="datetime">2009-09-04T19:49:38+02:00</updated-on> + </user> + <user> + <admin type="boolean">false</admin> + <auth-source-id type="integer" nil="true"></auth-source-id> + <created-on type="datetime">2009-09-05T16:24:11+02:00</created-on> + <firstname>dev</firstname> + <hashed-password>70c881d4a26984ddce795f6f71817c9cf4480e79</hashed-password> + <id type="integer">7</id> + <language>fr</language> + <last-login-on type="datetime">2009-09-06T16:34:39+02:00</last-login-on> + <lastname>dev</lastname> + <login>dev</login> + <mail>dev3(a)ynot-home.info</mail> + <mail-notification type="boolean">false</mail-notification> + <member-id type="NilClass">9</member-id> + <role-id type="NilClass">4</role-id> + <status type="integer">1</status> + <updated-on type="datetime">2009-09-06T16:34:39+02:00</updated-on> + </user> +</users> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/user.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/users.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/users.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/users.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<users type="array"> - <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"></auth-source-id> - <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> - </user> - <user> - <admin type="boolean">true</admin> - <auth-source-id type="integer" nil="true"></auth-source-id> - <created-on type="datetime">2009-09-04T19:49:02+02:00</created-on> - <firstname>tony</firstname> - <hashed-password>8aed1322e5450badb078e1fb60a817a1df25a2ca</hashed-password> - <id type="integer">5</id> - <language>fr</language> - <last-login-on type="datetime">2009-09-04T19:49:38+02:00</last-login-on> - <lastname>chemit2</lastname> - <login>tchemit2</login> - <mail>chemit(a)codelutin.com</mail> - <mail-notification type="boolean">false</mail-notification> - <member-id type="NilClass">4</member-id> - <role-id type="NilClass">3</role-id> - <status type="integer">1</status> - <updated-on type="datetime">2009-09-04T19:49:38+02:00</updated-on> - </user> - <user> - <admin type="boolean">false</admin> - <auth-source-id type="integer" nil="true"></auth-source-id> - <created-on type="datetime">2009-09-05T16:24:11+02:00</created-on> - <firstname>dev</firstname> - <hashed-password>70c881d4a26984ddce795f6f71817c9cf4480e79</hashed-password> - <id type="integer">7</id> - <language>fr</language> - <last-login-on type="datetime">2009-09-06T16:34:39+02:00</last-login-on> - <lastname>dev</lastname> - <login>dev</login> - <mail>dev3(a)ynot-home.info</mail> - <mail-notification type="boolean">false</mail-notification> - <member-id type="NilClass">9</member-id> - <role-id type="NilClass">4</role-id> - <status type="integer">1</status> - <updated-on type="datetime">2009-09-06T16:34:39+02:00</updated-on> - </user> -</users> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/version.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/versions.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/version.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/version.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,130 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<versions type="array"> + <version> + <created-on type="datetime">2009-09-06T02:47:39+02:00</created-on> + <description>yo</description> + <effective-date type="date" nil="true"></effective-date> + <id type="integer">9</id> + <name>yor</name> + <project-id type="integer">1</project-id> + <updated-on type="datetime">2009-09-06T02:50:49+02:00</updated-on> + <wiki-page-title nil="true"></wiki-page-title> + <sharing>none</sharing> + <status>open</status> + </version> + <version> + <created-on type="datetime">2009-09-06T03:05:09+02:00</created-on> + <description>ysssoye</description> + <effective-date type="date" nil="true"></effective-date> + <id type="integer">13</id> + <name>rrrrrrrrrouuuuuua</name> + <project-id type="integer">1</project-id> + <updated-on type="datetime">2009-09-06T03:05:09+02:00</updated-on> + <wiki-page-title nil="true"></wiki-page-title> + </version> + <version> + <created-on type="datetime">2009-09-06T03:07:58+02:00</created-on> + <description>ysssoye</description> + <effective-date type="date" nil="true"></effective-date> + <id type="integer">15</id> + <name>aaaauuuuuua</name> + <project-id type="integer">1</project-id> + <updated-on type="datetime">2009-09-06T03:07:58+02:00</updated-on> + <wiki-page-title nil="true"></wiki-page-title> + </version> + <version> + <created-on type="datetime">2009-09-06T04:12:25+02:00</created-on> + <description>ysssoyeppppppppppppppppp</description> + <effective-date type="date" nil="true"></effective-date> + <id type="integer">16</id> + <name>aaaau</name> + <project-id type="integer">1</project-id> + <updated-on type="datetime">2009-09-06T04:13:20+02:00</updated-on> + <wiki-page-title nil="true"></wiki-page-title> + </version> + <version> + <created-on type="datetime">2009-09-06T03:05:40+02:00</created-on> + <description>ysssoye</description> + <effective-date type="date" nil="true"></effective-date> + <id type="integer">14</id> + <name>aaaaaaaaaarrrrrrrrrouuuuuua</name> + <project-id type="integer">1</project-id> + <updated-on type="datetime">2009-09-06T03:05:40+02:00</updated-on> + <wiki-page-title nil="true"></wiki-page-title> + </version> + <version> + <created-on type="datetime">2009-09-05T00:39:15+02:00</created-on> + <description></description> + <effective-date type="date" nil="true"></effective-date> + <id type="integer">5</id> + <name>2</name> + <project-id type="integer">1</project-id> + <updated-on type="datetime">2009-09-05T00:39:15+02:00</updated-on> + <wiki-page-title nil="true"></wiki-page-title> + </version> + <version> + <created-on type="datetime">2009-09-04T18:13:05+02:00</created-on> + <description></description> + <effective-date type="date" nil="true"></effective-date> + <id type="integer">1</id> + <name>1.0.0</name> + <project-id type="integer">1</project-id> + <updated-on type="datetime">2009-09-04T18:13:05+02:00</updated-on> + <wiki-page-title nil="true"></wiki-page-title> + </version> + <version> + <created-on type="datetime">2009-09-06T03:00:12+02:00</created-on> + <description>yoye</description> + <effective-date type="date">2009-09-06</effective-date> + <id type="integer">11</id> + <name>yaouuuuuua</name> + <project-id type="integer">1</project-id> + <updated-on type="datetime">2009-09-06T03:00:12+02:00</updated-on> + <wiki-page-title nil="true"></wiki-page-title> + </version> + <version> + <created-on type="datetime">2009-09-06T02:50:59+02:00</created-on> + <description>yoye</description> + <effective-date type="date">2009-09-06</effective-date> + <id type="integer">10</id> + <name>ya</name> + <project-id type="integer">1</project-id> + <updated-on type="datetime">2009-09-06T02:54:16+02:00</updated-on> + <wiki-page-title nil="true"></wiki-page-title> + </version> + <version> + <created-on type="datetime">2009-09-06T03:00:37+02:00</created-on> + <description>ysssoye</description> + <effective-date type="date">2009-09-06</effective-date> + <id type="integer">12</id> + <name>ouuuuuua</name> + <project-id type="integer">1</project-id> + <updated-on type="datetime">2009-09-06T03:00:42+02:00</updated-on> + <wiki-page-title nil="true"></wiki-page-title> + </version> +</versions> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/version.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/versions.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/versions.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/versions.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,130 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<versions type="array"> - <version> - <created-on type="datetime">2009-09-06T02:47:39+02:00</created-on> - <description>yo</description> - <effective-date type="date" nil="true"></effective-date> - <id type="integer">9</id> - <name>yor</name> - <project-id type="integer">1</project-id> - <updated-on type="datetime">2009-09-06T02:50:49+02:00</updated-on> - <wiki-page-title nil="true"></wiki-page-title> - <sharing>none</sharing> - <status>open</status> - </version> - <version> - <created-on type="datetime">2009-09-06T03:05:09+02:00</created-on> - <description>ysssoye</description> - <effective-date type="date" nil="true"></effective-date> - <id type="integer">13</id> - <name>rrrrrrrrrouuuuuua</name> - <project-id type="integer">1</project-id> - <updated-on type="datetime">2009-09-06T03:05:09+02:00</updated-on> - <wiki-page-title nil="true"></wiki-page-title> - </version> - <version> - <created-on type="datetime">2009-09-06T03:07:58+02:00</created-on> - <description>ysssoye</description> - <effective-date type="date" nil="true"></effective-date> - <id type="integer">15</id> - <name>aaaauuuuuua</name> - <project-id type="integer">1</project-id> - <updated-on type="datetime">2009-09-06T03:07:58+02:00</updated-on> - <wiki-page-title nil="true"></wiki-page-title> - </version> - <version> - <created-on type="datetime">2009-09-06T04:12:25+02:00</created-on> - <description>ysssoyeppppppppppppppppp</description> - <effective-date type="date" nil="true"></effective-date> - <id type="integer">16</id> - <name>aaaau</name> - <project-id type="integer">1</project-id> - <updated-on type="datetime">2009-09-06T04:13:20+02:00</updated-on> - <wiki-page-title nil="true"></wiki-page-title> - </version> - <version> - <created-on type="datetime">2009-09-06T03:05:40+02:00</created-on> - <description>ysssoye</description> - <effective-date type="date" nil="true"></effective-date> - <id type="integer">14</id> - <name>aaaaaaaaaarrrrrrrrrouuuuuua</name> - <project-id type="integer">1</project-id> - <updated-on type="datetime">2009-09-06T03:05:40+02:00</updated-on> - <wiki-page-title nil="true"></wiki-page-title> - </version> - <version> - <created-on type="datetime">2009-09-05T00:39:15+02:00</created-on> - <description></description> - <effective-date type="date" nil="true"></effective-date> - <id type="integer">5</id> - <name>2</name> - <project-id type="integer">1</project-id> - <updated-on type="datetime">2009-09-05T00:39:15+02:00</updated-on> - <wiki-page-title nil="true"></wiki-page-title> - </version> - <version> - <created-on type="datetime">2009-09-04T18:13:05+02:00</created-on> - <description></description> - <effective-date type="date" nil="true"></effective-date> - <id type="integer">1</id> - <name>1.0.0</name> - <project-id type="integer">1</project-id> - <updated-on type="datetime">2009-09-04T18:13:05+02:00</updated-on> - <wiki-page-title nil="true"></wiki-page-title> - </version> - <version> - <created-on type="datetime">2009-09-06T03:00:12+02:00</created-on> - <description>yoye</description> - <effective-date type="date">2009-09-06</effective-date> - <id type="integer">11</id> - <name>yaouuuuuua</name> - <project-id type="integer">1</project-id> - <updated-on type="datetime">2009-09-06T03:00:12+02:00</updated-on> - <wiki-page-title nil="true"></wiki-page-title> - </version> - <version> - <created-on type="datetime">2009-09-06T02:50:59+02:00</created-on> - <description>yoye</description> - <effective-date type="date">2009-09-06</effective-date> - <id type="integer">10</id> - <name>ya</name> - <project-id type="integer">1</project-id> - <updated-on type="datetime">2009-09-06T02:54:16+02:00</updated-on> - <wiki-page-title nil="true"></wiki-page-title> - </version> - <version> - <created-on type="datetime">2009-09-06T03:00:37+02:00</created-on> - <description>ysssoye</description> - <effective-date type="date">2009-09-06</effective-date> - <id type="integer">12</id> - <name>ouuuuuua</name> - <project-id type="integer">1</project-id> - <updated-on type="datetime">2009-09-06T03:00:42+02:00</updated-on> - <wiki-page-title nil="true"></wiki-page-title> - </version> -</versions> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/attachment.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/attachments.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/attachment.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/attachment.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<attachments type="array"> + <attachment> + <author-id type="integer">4</author-id> + <container-id type="integer">1</container-id> + <id type="integer">1</id> + <filesize type="integer">411</filesize> + <downloads type="integer">0</downloads> + + <created-on type="datetime">2009-09-05T12:56:41+02:00</created-on> + + <container-type>Version</container-type> + <content-type>application/json</content-type> + <description></description> + <digest>6ea84342c7475c05fb077b4aca832f9a</digest> + <disk-filename>090905125641_get_issue.json</disk-filename> + <filename>get_issue.json</filename> + </attachment> +</attachments> \ No newline at end of file Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/attachment.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/attachments.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/attachments.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/attachments.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<attachments type="array"> - <attachment> - <author-id type="integer">4</author-id> - <container-id type="integer">1</container-id> - <id type="integer">1</id> - <filesize type="integer">411</filesize> - <downloads type="integer">0</downloads> - - <created-on type="datetime">2009-09-05T12:56:41+02:00</created-on> - - <container-type>Version</container-type> - <content-type>application/json</content-type> - <description></description> - <digest>6ea84342c7475c05fb077b4aca832f9a</digest> - <disk-filename>090905125641_get_issue.json</disk-filename> - <filename>get_issue.json</filename> - </attachment> -</attachments> \ No newline at end of file Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issue.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issues.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issue.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issue.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issues type="array"> + <issue> + <assigned-to-id type="integer" nil="true"></assigned-to-id> + <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 type="integer">3</parent-id> + <root-id type="integer">3</root-id> + + <estimated-hours type="float" nil="true"></estimated-hours> + + <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"></due-date> + <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> + </issue> +</issues> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issue.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueCategory.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueCategorys.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueCategory.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueCategory.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issue-categories type="array"> + <issue-category> + <assigned-to-id type="integer" nil="true"/> + <id type="integer">1</id> + <name>categorie one</name> + <project-id type="integer">1</project-id> + </issue-category> +</issue-categories> \ No newline at end of file Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueCategory.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueCategorys.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueCategorys.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueCategorys.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<issue-categories type="array"> - <issue-category> - <assigned-to-id type="integer" nil="true"/> - <id type="integer">1</id> - <name>categorie one</name> - <project-id type="integer">1</project-id> - </issue-category> -</issue-categories> \ No newline at end of file Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issuePriority.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issuePrioritys.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issuePriority.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issuePriority.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issue-priorities type="array"> + <issue-priority> + <id type="integer">3</id> + <is-default type="boolean">false</is-default> + <name>Bas</name> + <opt>IPRI</opt> + <position type="integer">1</position> + <active type="boolean">true</active> + <parent-id type="integer">1</parent-id> + <project-id type="integer">2</project-id> + </issue-priority> +</issue-priorities> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issuePriority.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issuePrioritys.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issuePrioritys.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issuePrioritys.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<issue-priorities type="array"> - <issue-priority> - <id type="integer">3</id> - <is-default type="boolean">false</is-default> - <name>Bas</name> - <opt>IPRI</opt> - <position type="integer">1</position> - <active type="boolean">true</active> - <parent-id type="integer">1</parent-id> - <project-id type="integer">2</project-id> - </issue-priority> -</issue-priorities> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueStatus.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueStatuss.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueStatus.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueStatus.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<issue-statuses type="array"> + + <issue-status> + <id type="integer">1</id> + <is-closed type="boolean">false</is-closed> + <is-default type="boolean">true</is-default> + <name>Nouveau</name> + <position type="integer">1</position> + <default-done-ratio>10</default-done-ratio> + </issue-status> + +</issue-statuses> \ No newline at end of file Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueStatus.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueStatuss.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueStatuss.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueStatuss.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<issue-statuses type="array"> - - <issue-status> - <id type="integer">1</id> - <is-closed type="boolean">false</is-closed> - <is-default type="boolean">true</is-default> - <name>Nouveau</name> - <position type="integer">1</position> - <default-done-ratio>10</default-done-ratio> - </issue-status> - -</issue-statuses> \ No newline at end of file Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issues.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issues.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issues.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<issues type="array"> - <issue> - <assigned-to-id type="integer" nil="true"></assigned-to-id> - <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 type="integer">3</parent-id> - <root-id type="integer">3</root-id> - - <estimated-hours type="float" nil="true"></estimated-hours> - - <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"></due-date> - <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> - </issue> -</issues> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/news.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/newss.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/news.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/news.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<news type="array"> + <news> + <author-id type="integer">4</author-id> + <comments-count type="integer">0</comments-count> + <created-on type="datetime">2009-09-17T21:50:26+02:00</created-on> + <description>description</description> + <id type="integer">85</id> + <project-id type="integer">1</project-id> + <summary>summary</summary> + <title>title</title> + </news> +</news> \ No newline at end of file Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/news.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/newss.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/newss.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/newss.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<news type="array"> - <news> - <author-id type="integer">4</author-id> - <comments-count type="integer">0</comments-count> - <created-on type="datetime">2009-09-17T21:50:26+02:00</created-on> - <description>description</description> - <id type="integer">85</id> - <project-id type="integer">1</project-id> - <summary>summary</summary> - <title>title</title> - </news> -</news> \ No newline at end of file Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/project.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/projects.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/project.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/project.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<projects type="array"> + <project> + <created-on type="datetime">2009-09-04T18:11:54+02:00</created-on> + <updated-on type="datetime">2009-09-04T18:11:54+02:00</updated-on> + + <description></description> + <homepage></homepage> + <identifier>one</identifier> + <name>one</name> + + <id type="integer">1</id> + <parent-id type="integer" nil="true"></parent-id> + <lft type="integer">1</lft> + <rgt type="integer">2</rgt> + <projects-count type="integer">0</projects-count> + <status type="integer">1</status> + + <is-public type="boolean">true</is-public> + </project> +</projects> \ No newline at end of file Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/project.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/projects.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/projects.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/projects.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<projects type="array"> - <project> - <created-on type="datetime">2009-09-04T18:11:54+02:00</created-on> - <updated-on type="datetime">2009-09-04T18:11:54+02:00</updated-on> - - <description></description> - <homepage></homepage> - <identifier>one</identifier> - <name>one</name> - - <id type="integer">1</id> - <parent-id type="integer" nil="true"></parent-id> - <lft type="integer">1</lft> - <rgt type="integer">2</rgt> - <projects-count type="integer">0</projects-count> - <status type="integer">1</status> - - <is-public type="boolean">true</is-public> - </project> -</projects> \ No newline at end of file Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/timeEntry.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/timeEntrys.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/timeEntry.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/timeEntry.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<time-entries type="array"> + <time-entry> + <activity-id type="integer">8</activity-id> + <comments>Test</comments> + <created-on type="datetime">2009-12-31T23:02:02+01:00</created-on> + <hours type="float">1.0</hours> + <id type="integer">1</id> + <issue-id type="integer">6</issue-id> + <project-id type="integer">1</project-id> + <spent-on type="date">2009-12-31</spent-on> + <tmonth type="integer">12</tmonth> + <tweek type="integer">53</tweek> + <tyear type="integer">2009</tyear> + <updated-on type="datetime">2009-12-31T23:02:02+01:00</updated-on> + <user-id type="integer">4</user-id> + </time-entry> +</time-entries> \ No newline at end of file Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/timeEntry.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/timeEntrys.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/timeEntrys.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/timeEntrys.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<time-entries type="array"> - <time-entry> - <activity-id type="integer">8</activity-id> - <comments>Test</comments> - <created-on type="datetime">2009-12-31T23:02:02+01:00</created-on> - <hours type="float">1.0</hours> - <id type="integer">1</id> - <issue-id type="integer">6</issue-id> - <project-id type="integer">1</project-id> - <spent-on type="date">2009-12-31</spent-on> - <tmonth type="integer">12</tmonth> - <tweek type="integer">53</tweek> - <tyear type="integer">2009</tyear> - <updated-on type="datetime">2009-12-31T23:02:02+01:00</updated-on> - <user-id type="integer">4</user-id> - </time-entry> -</time-entries> \ No newline at end of file Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/tracker.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/trackers.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/tracker.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/tracker.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<trackers type="array"> + <tracker> + <id type="integer">1</id> + <project-id type="NilClass">1</project-id> + <tracker-id type="NilClass">1</tracker-id> + <position type="integer">1</position> + + <is-in-chlog type="boolean">true</is-in-chlog> + <is-in-roadmap type="boolean">false</is-in-roadmap> + + <name>Anomalie</name> + </tracker> +</trackers> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/tracker.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/trackers.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/trackers.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/trackers.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<trackers type="array"> - <tracker> - <id type="integer">1</id> - <project-id type="NilClass">1</project-id> - <tracker-id type="NilClass">1</tracker-id> - <position type="integer">1</position> - - <is-in-chlog type="boolean">true</is-in-chlog> - <is-in-roadmap type="boolean">false</is-in-roadmap> - - <name>Anomalie</name> - </tracker> -</trackers> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/user.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/users.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/user.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/user.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<users type="array"> + <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"></auth-source-id> + <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> + </user> +</users> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/user.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/users.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/users.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/users.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<users type="array"> - <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"></auth-source-id> - <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> - </user> -</users> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/version.xml (from rev 249, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/versions.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/version.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/version.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<versions type="array"> + <version> + <created-on type="datetime">2009-09-06T02:47:39+02:00</created-on> + <description>yo</description> + <effective-date type="date" nil="true"></effective-date> + <id type="integer">9</id> + <name>yor</name> + <project-id type="integer">1</project-id> + <updated-on type="datetime">2009-09-06T02:50:49+02:00</updated-on> + <wiki-page-title nil="true"></wiki-page-title> + <sharing>none</sharing> + <status>open</status> + </version> +</versions> Property changes on: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/version.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/versions.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/versions.xml 2012-03-25 14:34:56 UTC (rev 251) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/versions.xml 2012-03-25 14:37:37 UTC (rev 252) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<versions type="array"> - <version> - <created-on type="datetime">2009-09-06T02:47:39+02:00</created-on> - <description>yo</description> - <effective-date type="date" nil="true"></effective-date> - <id type="integer">9</id> - <name>yor</name> - <project-id type="integer">1</project-id> - <updated-on type="datetime">2009-09-06T02:50:49+02:00</updated-on> - <wiki-page-title nil="true"></wiki-page-title> - <sharing>none</sharing> - <status>open</status> - </version> -</versions>

1 0

r251 - trunk
by tchemit＠users.nuiton.org March 25, 2012

March 25, 2012

Author: tchemit Date: 2012-03-25 16:34:56 +0200 (Sun, 25 Mar 2012) New Revision: 251 Url: http://nuiton.org/repositories/revision/jredmine/251 Log: refs 2034 (updates to helper-m-p 1.5) still in snapshot... Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-25 14:30:37 UTC (rev 250) +++ trunk/pom.xml 2012-03-25 14:34:56 UTC (rev 251) @@ -536,6 +536,8 @@ <doxiaVersion>1.2</doxiaVersion> + <helperPluginVersion>1.5-SNAPSHOT</helperPluginVersion> +  <siteSourcesType>apt</siteSourcesType>

1 0

r250 - trunk/jredmine-client/src/main/redmine/jredmine/app/controllers
by tchemit＠users.nuiton.org March 25, 2012

March 25, 2012

Author: tchemit Date: 2012-03-25 16:30:37 +0200 (Sun, 25 Mar 2012) New Revision: 250 Url: http://nuiton.org/repositories/revision/jredmine/250 Log: fixes #2032 (bad get_issue_times redmine plugin api) Modified: trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb Modified: trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb 2012-03-21 12:10:36 UTC (rev 249) +++ trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb 2012-03-25 14:30:37 UTC (rev 250) @@ -182,7 +182,7 @@ # recuperation des temps d'une issue def get_issue_times - render_array_result @issue.time_entries, "timeEntries" + render_array_result @issue.time_entries, "time-entries" end # recuperation de la version d'un projet

1 0

r249 - in trunk: . jredmine-client
by tchemit＠users.nuiton.org March 21, 2012

March 21, 2012

Author: tchemit Date: 2012-03-21 13:10:36 +0100 (Wed, 21 Mar 2012) New Revision: 249 Url: http://nuiton.org/repositories/revision/jredmine/249 Log: IssueID #2024 Use redmine REST Api instead of the jredmine redmine plugin (just add deps) Modified: trunk/jredmine-client/pom.xml trunk/pom.xml Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2012-03-21 12:05:56 UTC (rev 248) +++ trunk/jredmine-client/pom.xml 2012-03-21 12:10:36 UTC (rev 249) @@ -43,6 +43,11 @@ <dependencies> <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin</artifactId> <scope>compile</scope> @@ -66,6 +71,11 @@ </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-21 12:05:56 UTC (rev 248) +++ trunk/pom.xml 2012-03-21 12:10:36 UTC (rev 249) @@ -63,7 +63,14 @@ <dependencyManagement> <dependencies> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + <version>1.12</version> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin</artifactId> <version>${helperPluginVersion}</version>

1 0

r248 - trunk
by tchemit＠users.nuiton.org March 21, 2012

March 21, 2012

Author: tchemit Date: 2012-03-21 13:05:56 +0100 (Wed, 21 Mar 2012) New Revision: 248 Url: http://nuiton.org/repositories/revision/jredmine/248 Log: updates to mavenpom 3.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-20 23:06:55 UTC (rev 247) +++ trunk/pom.xml 2012-03-21 12:05:56 UTC (rev 248) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.1.1</version> + <version>3.2</version> </parent> <artifactId>jredmine</artifactId>

1 0