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

r201 - in trunk: . jredmine-client maven-jredmine-plugin
by tchemit＠users.nuiton.org May 27, 2011

May 27, 2011

Author: tchemit Date: 2011-05-27 07:45:11 +0200 (Fri, 27 May 2011) New Revision: 201 Url: http://nuiton.org/repositories/revision/jredmine/201 Log: [maven-release-plugin] prepare release jredmine-1.2 Modified: trunk/jredmine-client/pom.xml trunk/maven-jredmine-plugin/pom.xml trunk/pom.xml Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2011-05-27 05:42:49 UTC (rev 200) +++ trunk/jredmine-client/pom.xml 2011-05-27 05:45:11 UTC (rev 201) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/maven-jredmine-plugin/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/pom.xml 2011-05-27 05:42:49 UTC (rev 200) +++ trunk/maven-jredmine-plugin/pom.xml 2011-05-27 05:45:11 UTC (rev 201) @@ -24,9 +24,7 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -36,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-27 05:42:49 UTC (rev 200) +++ trunk/pom.xml 2011-05-27 05:45:11 UTC (rev 201) @@ -38,7 +38,7 @@ </parent> <artifactId>jredmine</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> <modules> <module>jredmine-client</module> @@ -47,11 +47,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.2</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jredmine/trunk + scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.2 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jredmine/trunk</url> + <url>http://www.nuiton.org/repositories/browse/jredmine/tags/jredmine-1.2</url> </scm> <dependencyManagement>

1 0

r200 - trunk
by tchemit＠users.nuiton.org May 27, 2011

May 27, 2011

Author: tchemit Date: 2011-05-27 07:42:49 +0200 (Fri, 27 May 2011) New Revision: 200 Url: http://nuiton.org/repositories/revision/jredmine/200 Log: twist pom to perform release of version 1.2 without redmine invocation (in first place...) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-27 05:42:17 UTC (rev 199) +++ trunk/pom.xml 2011-05-27 05:42:49 UTC (rev 200) @@ -48,7 +48,8 @@  <scm> <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/jredmine/trunk </developerConnection> <url>http://www.nuiton.org/repositories/browse/jredmine/trunk</url> </scm> @@ -524,6 +525,10 @@ <test.verbose>false</test.verbose> <test.encoding>UTF-8</test.encoding> +  + <arguments>-Plicense-profile,release-profile,Pcentral-safe,Preporting,Prelease-sign-artifacts,analyze-dependencies</arguments> + </properties> <build>

1 0

r199 - trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin
by tchemit＠users.nuiton.org May 27, 2011

May 27, 2011

Author: tchemit Date: 2011-05-27 07:42:17 +0200 (Fri, 27 May 2011) New Revision: 199 Url: http://nuiton.org/repositories/revision/jredmine/199 Log: Anomalie #1555: Skipping generate-changes does not works Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2011-05-27 05:38:49 UTC (rev 198) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2011-05-27 05:42:17 UTC (rev 199) @@ -260,6 +260,12 @@ return; } } + + if (isGoalSkip()) { + getLog().warn("The goal is skip due to the skipGoal flag on"); + return; + } + super.init(); if (!safe && !initOk) { // we are in none safe mode but init is not ok...

1 0

r198 - trunk/src/site/apt
by tchemit＠users.nuiton.org May 27, 2011

May 27, 2011

Author: tchemit Date: 2011-05-27 07:38:49 +0200 (Fri, 27 May 2011) New Revision: 198 Url: http://nuiton.org/repositories/revision/jredmine/198 Log: update doc Modified: trunk/src/site/apt/index.apt Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2011-05-22 14:33:34 UTC (rev 197) +++ trunk/src/site/apt/index.apt 2011-05-27 05:38:49 UTC (rev 198) @@ -52,4 +52,13 @@ [] +Notes + +* Version 1.2 + + Avant la version <<1.2>>, on ne pouvait pas communiquer avec un <<redmine>> + <<1.1>>, désormais cela est possible. Cependant, la rétro-compatibilité n'a + pas été testée pour le moment, il est donc possible que cela ne fonctionne + pas :( + Pour plus d'informations, voir la documentation des deux modules.

1 0

r197 - trunk
by tchemit＠users.nuiton.org May 22, 2011

May 22, 2011

Author: tchemit Date: 2011-05-22 16:33:34 +0200 (Sun, 22 May 2011) New Revision: 197 Url: http://nuiton.org/repositories/revision/jredmine/197 Log: remove release plugin definition (this is done in mavenpom) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-21 00:03:50 UTC (rev 196) +++ trunk/pom.xml 2011-05-22 14:33:34 UTC (rev 197) @@ -545,12 +545,6 @@ </configuration> </plugin> - <plugin> - <artifactId>maven-release-plugin</artifactId> - <version>2.1</version> - </plugin> - - </plugins> </pluginManagement>

1 0

r196 - in trunk: . maven-jredmine-plugin maven-jredmine-plugin/src/license
by tchemit＠users.nuiton.org May 21, 2011

May 21, 2011

Author: tchemit Date: 2011-05-21 02:03:50 +0200 (Sat, 21 May 2011) New Revision: 196 Url: http://nuiton.org/repositories/revision/jredmine/196 Log: final optimize of dependencies Modified: trunk/maven-jredmine-plugin/pom.xml trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/maven-jredmine-plugin/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/pom.xml 2011-05-20 22:56:38 UTC (rev 195) +++ trunk/maven-jredmine-plugin/pom.xml 2011-05-21 00:03:50 UTC (rev 196) @@ -75,6 +75,11 @@ </dependency> <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-i18n</artifactId> + </dependency> + + <dependency> <groupId>org.sonatype.plexus</groupId> <artifactId>plexus-sec-dispatcher</artifactId> </dependency> @@ -141,13 +146,14 @@ <artifactId>plexus-velocity</artifactId> </dependency> +  + <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-i18n</artifactId> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <scope>provided</scope> </dependency> -  - <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-site-renderer</artifactId> @@ -163,11 +169,6 @@ <artifactId>doxia-sink-api</artifactId> </dependency> -  -  <dependency> Modified: trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties 2011-05-20 22:56:38 UTC (rev 195) +++ trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties 2011-05-21 00:03:50 UTC (rev 196) @@ -13,13 +13,11 @@ # Please fill the missing licenses for dependencies : # # -#Sat May 21 00:54:09 CEST 2011 +#Sat May 21 01:46:54 CEST 2011 classworlds--classworlds--1.1--jar=http\://classworlds.codehaus.org/license… commons-digester--commons-digester--1.6--jar=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-classworlds--1.2-alpha-7--jar=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-component-api--1.0-alpha-20--jar=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-i18n--1.0-beta-10--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-i18n--1.0-beta-7--jar=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4--jar=The Apache Software License, Version 2.0 org.sonatype.plexus--plexus-build-api--0.0.4--jar=The Apache Software License, Version 2.0 oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-20 22:56:38 UTC (rev 195) +++ trunk/pom.xml 2011-05-21 00:03:50 UTC (rev 196) @@ -169,16 +169,16 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-i18n</artifactId> - <version>1.0-beta-10</version> + <version>1.0-beta-7</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - <version>1.7</version> - </dependency> - - <dependency> <groupId>velocity</groupId> <artifactId>velocity</artifactId> <version>1.5</version> @@ -346,23 +346,11 @@ </dependency> <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-module-xhtml</artifactId> - <version>${doxiaVersion}</version> - </dependency> - - <dependency> <groupId>org.sonatype.plexus</groupId> <artifactId>plexus-sec-dispatcher</artifactId> <version>1.4</version> </dependency> -  -  -  -  -  - <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> @@ -385,6 +373,10 @@ <artifactId>plexus-container-default</artifactId> </exclusion> <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-i18n</artifactId> + </exclusion> + <exclusion> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </exclusion>

1 0

r195 - trunk
by tchemit＠users.nuiton.org May 20, 2011

May 20, 2011

Author: tchemit Date: 2011-05-21 00:56:38 +0200 (Sat, 21 May 2011) New Revision: 195 Url: http://nuiton.org/repositories/revision/jredmine/195 Log: update some dependencies (doxia, m-changes-p, plexus components) + optimize them Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-20 22:55:40 UTC (rev 194) +++ trunk/pom.xml 2011-05-20 22:56:38 UTC (rev 195) @@ -137,6 +137,11 @@ <artifactId>plexus-sec-dispatcher</artifactId> </exclusion> + <exclusion> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + </exclusions> </dependency> @@ -153,18 +158,24 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-velocity</artifactId> <version>1.1.8</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-i18n</artifactId> - <version>1.0-beta-7</version> + <version>1.0-beta-10</version> </dependency> <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> - <version>1.5</version> + <version>1.7</version> </dependency> <dependency> @@ -222,6 +233,12 @@ </dependency> <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-impl</artifactId> + <version>2.0.5</version> + </dependency> + + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> <version>${mavenVersion}</version> @@ -290,8 +307,30 @@ <dependency> <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>${doxiaVersion}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-site-renderer</artifactId> <version>${doxiaVersion}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + <exclusion> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -327,20 +366,24 @@ <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> - <version>2.3</version> + <version>2.4</version> <exclusions> <exclusion> - <groupId>plexus</groupId> + <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-mail-sender-simple</artifactId> </exclusion> <exclusion> - <groupId>plexus</groupId> + <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-mail-sender-api</artifactId> </exclusion> <exclusion> - <groupId>plexus</groupId> + <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-mail-sender-javamail</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> <exclusion> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> @@ -477,7 +520,7 @@  <jredminePluginVersion>1.1.4</jredminePluginVersion> - <doxiaVersion>1.0</doxiaVersion> + <doxiaVersion>1.2</doxiaVersion>  <siteSourcesType>apt</siteSourcesType>

1 0

r194 - in trunk/maven-jredmine-plugin: . src/license src/main/java/org/nuiton/jredmine/plugin src/main/java/org/nuiton/jredmine/plugin/report
by tchemit＠users.nuiton.org May 20, 2011

May 20, 2011

Author: tchemit Date: 2011-05-21 00:55:40 +0200 (Sat, 21 May 2011) New Revision: 194 Url: http://nuiton.org/repositories/revision/jredmine/194 Log: - optimize dependencies - improve code Modified: trunk/maven-jredmine-plugin/pom.xml trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java Modified: trunk/maven-jredmine-plugin/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/pom.xml 2011-05-20 22:44:58 UTC (rev 193) +++ trunk/maven-jredmine-plugin/pom.xml 2011-05-20 22:55:40 UTC (rev 194) @@ -116,6 +116,11 @@ </dependency> <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-impl</artifactId> + </dependency> + + <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> </dependency> @@ -158,10 +163,10 @@ <artifactId>doxia-sink-api</artifactId> </dependency> - <dependency> +   @@ -237,7 +242,7 @@ <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.5.1</version> + <version>${pluginPluginVersion}</version> </plugin> </plugins> Modified: trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties 2011-05-20 22:44:58 UTC (rev 193) +++ trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties 2011-05-20 22:55:40 UTC (rev 194) @@ -1,23 +1,25 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License # - Apache Public License 2.0 +# - BSD License # - Common Public License Version 1.0 # - Lesser General Public License (LGPL) v 3.0 +# - Public Domain # - The Apache Software License, Version 2.0 +# - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jun 27 08:57:33 CEST 2010 -classworlds--classworlds--1.1=http\://classworlds.codehaus.org/license.html -commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0 -commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 -commons-digester--commons-digester--1.6=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-i18n--1.0-beta-7=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-velocity--1.1.7=The Apache Software License, Version 2.0 -org.sonatype.plexus--plexus-build-api--0.0.4=The Apache Software License, Version 2.0 -oro--oro--2.0.8=The Apache Software License, Version 2.0 +#Sat May 21 00:54:09 CEST 2011 +classworlds--classworlds--1.1--jar=http\://classworlds.codehaus.org/license.html +commons-digester--commons-digester--1.6--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-classworlds--1.2-alpha-7--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-component-api--1.0-alpha-20--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-i18n--1.0-beta-10--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4--jar=The Apache Software License, Version 2.0 +org.sonatype.plexus--plexus-build-api--0.0.4--jar=The Apache Software License, Version 2.0 +oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2011-05-20 22:44:58 UTC (rev 193) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2011-05-20 22:55:40 UTC (rev 194) @@ -78,7 +78,7 @@ protected boolean sortById; /** - * Flag to know if anonymùous connexion to redmine server is required. + * Flag to know if anonymous connexion to redmine server is required. * <p/> * For this goal, the default value is {@code true} * <p/> Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2011-05-20 22:44:58 UTC (rev 193) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2011-05-20 22:55:40 UTC (rev 194) @@ -32,7 +32,6 @@ import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; import org.apache.maven.artifact.versioning.VersionRange; -import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.site.decoration.Body; import org.apache.maven.doxia.site.decoration.DecorationModel; @@ -44,10 +43,9 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.reporting.MavenReport; import org.apache.maven.reporting.MavenReportException; +import org.apache.maven.reporting.sink.SinkFactory; import org.codehaus.plexus.i18n.I18N; -import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.plugin.AbstractRedmineMojo; -import org.nuiton.plugin.Plugin; import java.io.File; import java.io.FileWriter; @@ -65,7 +63,7 @@ * @requiresReports true * @since 1.0.0 */ -public abstract class AbstractRedmineReport extends AbstractRedmineMojo implements MavenReport, Plugin, RestClientConfiguration { +public abstract class AbstractRedmineReport extends AbstractRedmineMojo implements MavenReport { /** * Flag to know if anonymùous connexion to redmine server is required. @@ -184,17 +182,24 @@ SiteRenderingContext siteContext = siteRenderer.createContextForSkin(getSkinArtifactFile(), attributes, model, getName(currentLocale), currentLocale); - RenderingContext context = new RenderingContext(outputDirectory, getOutputName() + ".html"); + createDirectoryIfNecessary(outputDirectory); - SiteRendererSink newSink = new SiteRendererSink(context); - generate(newSink, currentLocale); + String filename = getOutputName() + ".html"; + File file = new File(outputDirectory, filename); - createDirectoryIfNecessary(outputDirectory); + SiteRendererSink sink = SinkFactory.createSink(outputDirectory, filename); - Writer writer = new FileWriter(new File(outputDirectory, getOutputName() + ".html")); + generate(sink, currentLocale); - siteRenderer.generateDocument(writer, newSink, siteContext); + Writer writer = new FileWriter(file); + try { + siteRenderer.generateDocument(writer, sink, siteContext); + } finally { + + writer.close(); + } + siteRenderer.copyResources(siteContext, new File(project.getBasedir(), "src/site/resources"), outputDirectory);

1 0

r193 - in trunk/jredmine-client: . src/license src/main/java/org/nuiton/jredmine src/main/java/org/nuiton/jredmine/model src/main/java/org/nuiton/jredmine/model/io/xpp3 src/main/java/org/nuiton/jredmine/rest src/test/java/org/nuiton/jredmine src/test/java/org/nuiton/jredmine/model/io/xpp3 src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton src/
by tchemit＠users.nuiton.org May 20, 2011

May 20, 2011

Author: tchemit Date: 2011-05-21 00:44:58 +0200 (Sat, 21 May 2011) New Revision: 193 Url: http://nuiton.org/repositories/revision/jredmine/193 Log: - optimize dependencies - make jredmine works with redmine >= 1.1 - reformation tests - improve code - can now have a none strict xpp models loading Removed: trunk/jredmine-client/src/license/THIRD-PARTY.properties Modified: trunk/jredmine-client/pom.xml trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssuePriority.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssueStatus.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Project.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Version.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/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/UserXpp3Reader.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/VersionXpp3Reader.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRestClient.java trunk/jredmine-client/src/test/java/org/nuiton/jredmine/TestHelper.java trunk/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issuePrioritys.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 trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/attachment.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issue.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issueCategory.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issuePriority.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issueStatus.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/news.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/project.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/timeEntry.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/tracker.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/user.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/version.xml Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/pom.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -47,6 +47,12 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> Deleted: trunk/jredmine-client/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jredmine-client/src/license/THIRD-PARTY.properties 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/license/THIRD-PARTY.properties 2011-05-20 22:44:58 UTC (rev 193) @@ -1,14 +0,0 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache License -# - Apache Public License 2.0 -# - Common Public License Version 1.0 -# - Lesser General Public License (LGPL) v 3.0 -# - The Apache Software License, Version 2.0 -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Sun Jun 27 08:56:59 CEST 2010 -commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java 2011-05-20 22:44:58 UTC (rev 193) @@ -70,11 +70,11 @@ protected boolean init; public DefaultRedmineServiceImplementor() { - this.xpp3Helper = new RedmineXpp3Helper(); + xpp3Helper = new RedmineXpp3Helper(); if (log.isDebugEnabled()) { log.debug("new " + this); } - this.session = new RedmineRestClient(); + session = new RedmineRestClient(); } /////////////////////////////////////////////////////////////////////////// @@ -231,7 +231,7 @@ } try { - T result = xpp3Helper.readObject(type, stream); + T result = xpp3Helper.readObject(type, stream, true); return result; } catch (IOException ex) { throw new RedmineServiceException("could not obtain datas of type " + type + " for reason " + ex.getMessage(), ex); @@ -245,7 +245,7 @@ return null; } try { - T[] result = xpp3Helper.readObjects(type, stream); + T[] result = xpp3Helper.readObjects(type, stream, true); return result; } catch (IOException ex) { throw new RedmineServiceException("could not obtain datas of type " + type + " for reason " + ex.getMessage(), ex); Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java 2011-05-20 22:44:58 UTC (rev 193) @@ -45,6 +45,10 @@ protected int trackerId; protected int fixedVersionId; protected int id; + protected int parentId; + protected int rootId; + protected int lft; + protected int rgt; protected float estimatedHours; protected Date createdOn; protected Date updatedOn; @@ -131,6 +135,22 @@ return updatedOn; } + public int getLft() { + return lft; + } + + public int getRgt() { + return rgt; + } + + public int getParentId() { + return parentId; + } + + public int getRootId() { + return rootId; + } + public void setAssignedToId(int assignedToId) { this.assignedToId = assignedToId; } @@ -202,4 +222,20 @@ public void setUpdatedOn(Date updatedOn) { this.updatedOn = updatedOn; } + + public void setLft(int lft) { + this.lft = lft; + } + + public void setRgt(int rgt) { + this.rgt = rgt; + } + + public void setParentId(int parentId) { + this.parentId = parentId; + } + + public void setRootId(int rootId) { + this.rootId = rootId; + } } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssuePriority.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssuePriority.java 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssuePriority.java 2011-05-20 22:44:58 UTC (rev 193) @@ -32,7 +32,10 @@ public class IssuePriority implements IdAble,I18nAble{ protected int id; + protected int parentId; + protected int projectId; protected boolean isDefault; + protected boolean active; protected String name; protected String opt; protected int position; @@ -59,6 +62,18 @@ return position; } + public boolean isActive() { + return active; + } + + public int getParentId() { + return parentId; + } + + public int getProjectId() { + return projectId; + } + public void setId(int id) { this.id = id; } @@ -78,4 +93,16 @@ public void setPosition(int position) { this.position = position; } + + public void setActive(boolean active) { + this.active = active; + } + + public void setParentId(int parentId) { + this.parentId = parentId; + } + + public void setProjectId(int projectId) { + this.projectId = projectId; + } } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssueStatus.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssueStatus.java 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssueStatus.java 2011-05-20 22:44:58 UTC (rev 193) @@ -33,6 +33,7 @@ protected int id; protected int position; + protected int defaultDoneRatio; protected boolean isClosed; protected boolean isDefault; protected String name; @@ -59,6 +60,10 @@ return position; } + public int getDefaultDoneRatio() { + return defaultDoneRatio; + } + public void setId(int id) { this.id = id; } @@ -78,4 +83,8 @@ public void setPosition(int position) { this.position = position; } + + public void setDefaultDoneRatio(int defaultDoneRatio) { + this.defaultDoneRatio = defaultDoneRatio; + } } 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Project.java 2011-05-20 22:44:58 UTC (rev 193) @@ -41,6 +41,8 @@ protected String identifier; protected String name; protected int id; + protected int lft; + protected int rgt; protected int parentId; protected int projectsCount; protected int status; @@ -92,6 +94,14 @@ return status; } + public int getLft() { + return lft; + } + + public int getRgt() { + return rgt; + } + public void setCreatedOn(Date createdOn) { this.createdOn = createdOn; } @@ -112,8 +122,8 @@ this.identifier = identifier; } - public void setIsPublic(boolean ispublic) { - this.isPublic = ispublic; + public void setIsPublic(boolean isPublic) { + this.isPublic = isPublic; } public void setName(String name) { @@ -135,4 +145,12 @@ public void setStatus(int status) { this.status = status; } + + public void setLft(int lft) { + this.lft = lft; + } + + public void setRgt(int rgt) { + this.rgt = rgt; + } } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java 2011-05-20 22:44:58 UTC (rev 193) @@ -50,6 +50,7 @@ protected String language; protected String mail; protected String hashedPassword; + protected String identityUrl; public boolean isAdmin() { return admin; @@ -116,6 +117,10 @@ return updatedOn; } + public String getIdentityUrl() { + return identityUrl; + } + public void setAdmin(boolean admin) { this.admin = admin; } @@ -128,8 +133,8 @@ this.createdOn = createdOn; } - public void setMail(String email) { - this.mail = email; + public void setMail(String mail) { + this.mail = mail; } public void setFirstname(String firstname) { @@ -184,4 +189,8 @@ public String getName() { return firstname + " " + lastname; } + + public void setIdentityUrl(String identityUrl) { + this.identityUrl = identityUrl; + } } 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Version.java 2011-05-20 22:44:58 UTC (rev 193) @@ -39,6 +39,8 @@ protected String name; protected String description; protected String wikiPageTitle; + protected String sharing; + protected String status; protected int id; protected int projectId; @@ -76,6 +78,14 @@ return wikiPageTitle; } + public String getSharing() { + return sharing; + } + + public String getStatus() { + return status; + } + public void setCreatedOn(Date createdOn) { this.createdOn = createdOn; } @@ -104,7 +114,15 @@ this.updatedOn = updatedOn; } - public void setWikiPageTitle(String wikiPagetitle) { - this.wikiPageTitle = wikiPagetitle; + public void setWikiPageTitle(String wikiPageTitle) { + this.wikiPageTitle = wikiPageTitle; } + + public void setSharing(String sharing) { + this.sharing = sharing; + } + + public void setStatus(String status) { + this.status = status; + } } 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssuePriorityXpp3Reader.java 2011-05-20 22:44:58 UTC (rev 193) @@ -24,10 +24,12 @@ */ package org.nuiton.jredmine.model.io.xpp3; -import java.beans.IntrospectionException; import org.nuiton.io.xpp3.AbstractXpp3Reader; import org.nuiton.jredmine.model.Issue; import org.nuiton.jredmine.model.IssuePriority; + +import java.beans.IntrospectionException; + import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; /** @@ -39,7 +41,7 @@ public class IssuePriorityXpp3Reader extends AbstractXpp3Reader<IssuePriority> { public IssuePriorityXpp3Reader() { - super(IssuePriority.class, "enumerations", "enumeration"); + super(IssuePriority.class, "issue-priorities", "issue-priority"); } @Override @@ -48,10 +50,13 @@ addTagTextContentMappers(IssuePriority.class, RedmineDataConverter.Integer, true, allMappers, "id", + "parent-id", + "project-id", "position"); addTagTextContentMappers(IssuePriority.class, RedmineDataConverter.Boolean, true, allMappers, - "is-default"); + "is-default", + "active"); addTagTextContentMappers(IssuePriority.class, RedmineDataConverter.Text, true, allMappers, "name", 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueStatusXpp3Reader.java 2011-05-20 22:44:58 UTC (rev 193) @@ -24,10 +24,12 @@ */ package org.nuiton.jredmine.model.io.xpp3; -import java.beans.IntrospectionException; import org.nuiton.io.xpp3.AbstractXpp3Reader; import org.nuiton.jredmine.model.Issue; import org.nuiton.jredmine.model.IssueStatus; + +import java.beans.IntrospectionException; + import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; /** @@ -47,7 +49,8 @@ addTagTextContentMappers(IssueStatus.class, RedmineDataConverter.Integer, true, allMappers, "id", - "position"); + "position", + "default-done-ratio"); addTagTextContentMappers(IssueStatus.class, RedmineDataConverter.Boolean, true, allMappers, "is-closed", 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueXpp3Reader.java 2011-05-20 22:44:58 UTC (rev 193) @@ -24,9 +24,11 @@ */ package org.nuiton.jredmine.model.io.xpp3; -import java.beans.IntrospectionException; import org.nuiton.io.xpp3.AbstractXpp3Reader; import org.nuiton.jredmine.model.Issue; + +import java.beans.IntrospectionException; + import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; /** @@ -55,7 +57,11 @@ "status-id", "tracker-id", "fixed-version-id", - "id"); + "id", + "parent-id", + "root-id", + "lft", + "rgt"); addTagTextContentMappers(Issue.class, RedmineDataConverter.Float, true, allMappers, "estimated-hours"); 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/ProjectXpp3Reader.java 2011-05-20 22:44:58 UTC (rev 193) @@ -24,9 +24,11 @@ */ package org.nuiton.jredmine.model.io.xpp3; -import java.beans.IntrospectionException; import org.nuiton.io.xpp3.AbstractXpp3Reader; import org.nuiton.jredmine.model.Project; + +import java.beans.IntrospectionException; + import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; /** @@ -46,6 +48,8 @@ addTagTextContentMappers(Project.class, RedmineDataConverter.Integer, true, allMappers, "id", + "lft", + "rgt", "parent-id", "projects-count", "status"); 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3Helper.java 2011-05-20 22:44:58 UTC (rev 193) @@ -24,12 +24,23 @@ */ 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 org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.nuiton.io.xpp3.Xpp3Helper; +import org.nuiton.io.xpp3.Xpp3Reader; import org.nuiton.jredmine.model.RedmineModelEnum; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.io.StringReader; +import java.io.StringWriter; /** * Pour construire le modèle à partir de fichiers xml contenant les données. @@ -39,40 +50,147 @@ */ public class RedmineXpp3Helper { - public <O> O readObject(Class<O> klass, String txt) throws IOException, XmlPullParserException { - O result = readObject(klass, new ByteArrayInputStream(txt.getBytes())); + /** Logger. */ + private static final Log log = LogFactory.getLog(RedmineXpp3Helper.class); + + public <O> O readObject(Class<O> klass, String txt, boolean strict) throws IOException, XmlPullParserException { + O result = readObject(klass, new ByteArrayInputStream(txt.getBytes()), strict); return result; } - public <O> O[] readObjects(Class<O> klass, String txt) throws IOException, XmlPullParserException { - O[] results = readObjects(klass, new ByteArrayInputStream(txt.getBytes())); + public <O> O[] readObjects(Class<O> klass, String txt, boolean strict) throws IOException, XmlPullParserException { + O[] results = readObjects(klass, new ByteArrayInputStream(txt.getBytes()), strict); return results; } - public <O> O readObject(Class<O> klass, File file) throws IOException, XmlPullParserException { - O result = readObject(klass, new FileInputStream(file)); + public <O> O readObject(Class<O> klass, File file, boolean strict) throws IOException, XmlPullParserException { + O result = readObject(klass, new FileInputStream(file), strict); return result; } - public <O> O[] readObjects(Class<O> klass, File file) throws IOException, XmlPullParserException { - O[] results = readObjects(klass, new FileInputStream(file)); + public <O> O[] readObjects(Class<O> klass, File file, boolean strict) throws IOException, XmlPullParserException { + O[] results = readObjects(klass, new FileInputStream(file), strict); return results; } - public <O> O readObject(Class<O> klass, InputStream stream) throws IOException, XmlPullParserException { + public <O> O readObject(Class<O> klass, InputStream stream, boolean strict) throws IOException, XmlPullParserException { RedmineModelEnum.safeValueOf(klass); - O result = Xpp3Helper.readObject(klass, ReaderFactory.newXmlReader(stream)); + O result = readObject(klass, ReaderFactory.newXmlReader(stream), strict); return result; } - public <O> O[] readObjects(Class<O> klass, InputStream stream) throws IOException, XmlPullParserException { + public <O> O[] readObjects(Class<O> klass, InputStream stream, boolean strict) throws IOException, XmlPullParserException { RedmineModelEnum.safeValueOf(klass); - O[] results = Xpp3Helper.readObjects(klass, ReaderFactory.newXmlReader(stream)); + O[] results = readObjects(klass, ReaderFactory.newXmlReader(stream), strict); return results; } + + /** + * Read an array of objects from a xml stream. + * + * @param <O> the type of objects to return + * @param klass the type of object to read + * @param reader the reader where to parse the xml + * @param strict + * @return the loaded objects + * @throws IOException if any io pb + * @throws XmlPullParserException if any parsing pb + */ + public <O> O[] readObjects(Class<O> klass, Reader reader, boolean strict) + throws IOException, XmlPullParserException { + + if (klass == null) { + throw new NullPointerException("klass parameter can not be null"); + } + + if (reader == null) { + throw new NullPointerException("reader parameter can not be null"); + } + + Xpp3Reader<O> modelReader = Xpp3Helper.getReader(klass); + + if (modelReader == null) { + throw new IllegalArgumentException( + "could not find xpp3Reader for type " + klass); + } + + O[] result = null; + + try { + + StringWriter sWriter = new StringWriter(); + + IOUtil.copy(reader, sWriter); + + String rawInput = sWriter.toString(); + if (log.isDebugEnabled()) { + log.debug("content to read : \n" + rawInput); + } + StringReader sReader = new StringReader(rawInput); + + result = modelReader.readArray(sReader, strict); + + } finally { + IOUtil.close(reader); + } + + return result; + } + + /** + * Read a single object from a xml stream. + * + * @param <O> the type of object to read + * @param klass the type of object to read + * @param reader the reader where to parse the xml + * @param strict + * @return the loaded object + * @throws IOException if any io pb + * @throws XmlPullParserException if any parsing pb + */ + public <O> O readObject(Class<O> klass, Reader reader, boolean strict) + throws IOException, XmlPullParserException { + + if (klass == null) { + throw new NullPointerException("klass parameter can not be null"); + } + + if (reader == null) { + throw new NullPointerException("reader parameter can not be null"); + } + + Xpp3Reader<O> modelReader = Xpp3Helper.getReader(klass); + + if (modelReader == null) { + throw new IllegalArgumentException( + "could not find xpp3Reader for type " + klass); + } + + O result = null; + + try { + + StringWriter sWriter = new StringWriter(); + + IOUtil.copy(reader, sWriter); + + String rawInput = sWriter.toString(); + if (log.isDebugEnabled()) { + log.debug("content to read : \n" + rawInput); + } + StringReader sReader = new StringReader(rawInput); + + result = modelReader.read(sReader, strict); + + } finally { + IOUtil.close(reader); + } + + return result; + } } 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserXpp3Reader.java 2011-05-20 22:44:58 UTC (rev 193) @@ -24,9 +24,11 @@ */ package org.nuiton.jredmine.model.io.xpp3; -import java.beans.IntrospectionException; import org.nuiton.io.xpp3.AbstractXpp3Reader; import org.nuiton.jredmine.model.User; + +import java.beans.IntrospectionException; + import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; /** @@ -66,6 +68,7 @@ "language", "lastname", "login", + "identity-url", "mail"); } } 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/VersionXpp3Reader.java 2011-05-20 22:44:58 UTC (rev 193) @@ -24,9 +24,11 @@ */ package org.nuiton.jredmine.model.io.xpp3; -import java.beans.IntrospectionException; import org.nuiton.io.xpp3.AbstractXpp3Reader; import org.nuiton.jredmine.model.Version; + +import java.beans.IntrospectionException; + import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers; /** @@ -56,6 +58,8 @@ addTagTextContentMappers(Version.class, RedmineDataConverter.Text, true, allMappers, "name", "description", - "wiki-page-title"); + "wiki-page-title", + "sharing", + "status"); } } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRestClient.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRestClient.java 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRestClient.java 2011-05-20 22:44:58 UTC (rev 193) @@ -83,7 +83,6 @@ public static final String PING = "ping"; public RedmineRestClient() { - super(); } public RedmineRestClient(RestClientConfiguration configuration) { Modified: trunk/jredmine-client/src/test/java/org/nuiton/jredmine/TestHelper.java =================================================================== --- trunk/jredmine-client/src/test/java/org/nuiton/jredmine/TestHelper.java 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/java/org/nuiton/jredmine/TestHelper.java 2011-05-20 22:44:58 UTC (rev 193) @@ -309,6 +309,10 @@ tempI.setTrackerId((Integer) RedmineDataConverter.Integer.convert("1")); tempI.setFixedVersionId((Integer) RedmineDataConverter.Integer.convert("1")); tempI.setId((Integer) RedmineDataConverter.Integer.convert("3")); + tempI.setParentId((Integer) RedmineDataConverter.Integer.convert("3")); + tempI.setRootId((Integer) RedmineDataConverter.Integer.convert("3")); + tempI.setLft((Integer) RedmineDataConverter.Integer.convert("1")); + tempI.setRgt((Integer) RedmineDataConverter.Integer.convert("2")); tempI.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-04T20:11:52+02:00")); tempI.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T00:37:40+02:00")); tempI.setStartDate((Date) RedmineDataConverter.Date.convert("2009-09-04")); @@ -344,6 +348,8 @@ tempP.setIdentifier((String) RedmineDataConverter.Text.convert("one")); tempP.setName((String) RedmineDataConverter.Text.convert("one")); tempP.setId((Integer) RedmineDataConverter.Integer.convert("1")); + tempP.setLft((Integer) RedmineDataConverter.Integer.convert("1")); + tempP.setRgt((Integer) RedmineDataConverter.Integer.convert("2")); tempP.setProjectsCount((Integer) RedmineDataConverter.Integer.convert("0")); tempP.setStatus((Integer) RedmineDataConverter.Integer.convert("1")); tempP.setIsPublic((Boolean) RedmineDataConverter.Boolean.convert("true")); @@ -415,6 +421,7 @@ tempU.setLastname((String) RedmineDataConverter.Text.convert("Admin")); tempU.setLogin((String) RedmineDataConverter.Text.convert("admin")); tempU.setMail((String) RedmineDataConverter.Text.convert("dummy(a)codelutin.com")); + tempU.setIdentityUrl((String) RedmineDataConverter.Text.convert("yo")); list.add(tempU); tempU = new User(); tempU.setAdmin((Boolean) RedmineDataConverter.Boolean.convert("true")); @@ -461,6 +468,8 @@ tempV.setDescription((String) RedmineDataConverter.Text.convert("yo")); tempV.setId((Integer) RedmineDataConverter.Integer.convert("9")); tempV.setName((String) RedmineDataConverter.Text.convert("yor")); + tempV.setSharing((String) RedmineDataConverter.Text.convert("none")); + tempV.setStatus((String) RedmineDataConverter.Text.convert("open")); tempV.setProjectId((Integer) RedmineDataConverter.Integer.convert("1")); tempV.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T02:50:49+02:00")); list.add(tempV); @@ -547,6 +556,7 @@ tempIS.setId(1); tempIS.setName("Nouveau"); tempIS.setPosition(1); + tempIS.setDefaultDoneRatio(10); tempIS.setIsClosed(false); tempIS.setIsDefault(true); list.add(tempIS); @@ -593,10 +603,13 @@ list = new ArrayList<Object>(); tempIP = new IssuePriority(); tempIP.setId(3); + tempIP.setParentId(1); + tempIP.setProjectId(2); tempIP.setName("Bas"); tempIP.setPosition(1); tempIP.setOpt("IPRI"); tempIP.setIsDefault(false); + tempIP.setActive(true); list.add(tempIP); tempIP = new IssuePriority(); tempIP.setId(4); 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java 2011-05-20 22:44:58 UTC (rev 193) @@ -129,17 +129,22 @@ // test from file - T actual = builder.readObject(type, file); + T actual = builder.readObject(type, file, true); TestHelper.assertMyEquals(type, expected.get(0), actual); // test from string - String txt = IOUtil.toString(new FileInputStream(file)); + FileInputStream input = new FileInputStream(file); + try { + String txt = IOUtil.toString(input); - actual = builder.readObject(type, txt); + actual = builder.readObject(type, txt, true); - TestHelper.assertMyEquals(type, expected.get(0), actual); + TestHelper.assertMyEquals(type, expected.get(0), actual); + } finally { + input.close(); + } } }; @@ -180,31 +185,36 @@ // test from file - T[] actual = builder.readObjects(type, file); + T[] actual = builder.readObjects(type, file, true); TestHelper.assertMyListEquals(type, (List<T>) expected, actual); - // test from text - String txt = IOUtil.toString(new FileInputStream(file)); + FileInputStream input = new FileInputStream(file); + try { +// test from text + String txt = IOUtil.toString(input); - actual = builder.readObjects(type, txt); + actual = builder.readObjects(type, txt, true); - TestHelper.assertMyListEquals(type, (List<T>) expected, actual); + TestHelper.assertMyListEquals(type, (List<T>) expected, actual); + } finally { + input.close(); + } } }; action.run("array-empty", - Collections.EMPTY_LIST, - Collections.EMPTY_LIST, - Collections.EMPTY_LIST, - Collections.EMPTY_LIST, - Collections.EMPTY_LIST, - Collections.EMPTY_LIST, - Collections.EMPTY_LIST, - Collections.EMPTY_LIST, - Collections.EMPTY_LIST, - Collections.EMPTY_LIST, - Collections.EMPTY_LIST); + Collections.emptyList(), + Collections.emptyList(), + Collections.emptyList(), + Collections.emptyList(), + Collections.emptyList(), + Collections.emptyList(), + Collections.emptyList(), + Collections.emptyList(), + Collections.emptyList(), + Collections.emptyList(), + Collections.emptyList()); action.run("array-singleton", Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issuePrioritys.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -24,4 +24,4 @@ #L% --> -<enumerations type="array"/> +<issue-priorities type="array"/> Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/attachments.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,36 +25,36 @@ --> <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> + <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> + <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> + <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> + <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> + <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 Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueCategorys.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,16 +25,16 @@ --> <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-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 Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issuePrioritys.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -24,40 +24,43 @@ #L% --> -<enumerations type="array"> - <enumeration> - <id type="integer">3</id> - <is-default type="boolean">false</is-default> - <name>Bas</name> - <opt>IPRI</opt> - <position type="integer">1</position> - </enumeration> - <enumeration> - <id type="integer">4</id> - <is-default type="boolean">true</is-default> - <name>Normal</name> - <opt>IPRI</opt> - <position type="integer">2</position> - </enumeration> - <enumeration> - <id type="integer">5</id> - <is-default type="boolean">false</is-default> - <name>Haut</name> - <opt>IPRI</opt> - <position type="integer">3</position> - </enumeration> - <enumeration> - <id type="integer">6</id> - <is-default type="boolean">false</is-default> - <name>Urgent</name> - <opt>IPRI</opt> - <position type="integer">4</position> - </enumeration> - <enumeration> - <id type="integer">7</id> - <is-default type="boolean">false</is-default> - <name>Immédiat</name> - <opt>IPRI</opt> - <position type="integer">5</position> - </enumeration> -</enumerations> +<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> Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueStatuss.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -26,49 +26,50 @@ <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> - </issue-status> + <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">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">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-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 Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issues.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,50 +25,54 @@ --> <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> + <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> + <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> + <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> - </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> + <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> + <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> + <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> + <description>avec une description !2</description> + <subject>yes!2</subject> + </issue> </issues> Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/newss.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,24 +25,24 @@ --> <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> + <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 Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/projects.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,30 +25,32 @@ --> <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"/> - <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> + <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 Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/timeEntrys.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,34 +25,34 @@ --> <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-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 Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/trackers.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,33 +25,33 @@ --> <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> + <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> + <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> + <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> Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/users.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,61 +25,62 @@ --> <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> + <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> + <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> + <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> - </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> + <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> Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/versions.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,104 +25,106 @@ --> <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> - </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> + <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> Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/attachments.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,20 +25,20 @@ --> <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> + <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> + <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> + <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 Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueCategorys.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,10 +25,10 @@ --> <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">1</id> + <name>categorie one</name> + <project-id type="integer">1</project-id> + </issue-category> </issue-categories> \ No newline at end of file Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issuePrioritys.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -24,12 +24,15 @@ #L% --> -<enumerations type="array"> - <enumeration> - <id type="integer">3</id> - <is-default type="boolean">false</is-default> - <name>Bas</name> - <opt>IPRI</opt> - <position type="integer">1</position> - </enumeration> -</enumerations> +<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> Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueStatuss.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -26,12 +26,13 @@ <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> - </issue-status> + <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 Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issues.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,27 +25,31 @@ --> <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> + <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> + <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> + <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> - </issue> + <description>avec une description !</description> + <subject>yes!</subject> + <lft type="integer">1</lft> + <rgt type="integer">2</rgt> + </issue> </issues> Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/newss.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,14 +25,14 @@ --> <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: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 Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/projects.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,20 +25,22 @@ --> <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> + <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> + <description></description> + <homepage></homepage> + <identifier>one</identifier> + <name>one</name> - <id type="integer">1</id> - <parent-id type="integer" nil="true"></parent-id> - <projects-count type="integer">0</projects-count> - <status type="integer">1</status> + <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> + <is-public type="boolean">true</is-public> + </project> </projects> \ No newline at end of file Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/timeEntrys.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,19 +25,19 @@ --> <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">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 Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/trackers.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,15 +25,15 @@ --> <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> + <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> + <is-in-chlog type="boolean">true</is-in-chlog> + <is-in-roadmap type="boolean">false</is-in-roadmap> - <name>Anomalie</name> - </tracker> + <name>Anomalie</name> + </tracker> </trackers> Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/users.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,25 +25,26 @@ --> <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> + <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> + <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> + <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> - </user> + <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> Modified: 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 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/versions.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,14 +25,16 @@ --> <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> - </version> + <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> Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/attachment.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/attachment.xml 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/attachment.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,19 +25,19 @@ --> <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> + <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> + <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> + <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> Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issue.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issue.xml 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issue.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,25 +25,29 @@ --> <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> + <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>3</parent-id> + <root-id>3</root-id> - <estimated-hours type="float" nil="true"></estimated-hours> + <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> + <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> + <description>avec une description !</description> + <subject>yes!</subject> + <lft type="integer">1</lft> + <rgt type="integer">2</rgt> </issue> Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issueCategory.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issueCategory.xml 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issueCategory.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,8 +25,8 @@ --> <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> + <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> Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issuePriority.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issuePriority.xml 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issuePriority.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -24,10 +24,13 @@ #L% --> -<enumeration> - <id type="integer">3</id> - <is-default type="boolean">false</is-default> - <name>Bas</name> - <opt>IPRI</opt> - <position type="integer">1</position> -</enumeration> +<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> Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issueStatus.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issueStatus.xml 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issueStatus.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,9 +25,10 @@ --> <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> + <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> Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/news.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/news.xml 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/news.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,12 +25,12 @@ --> <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> + <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> Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/project.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/project.xml 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/project.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,18 +25,20 @@ --> <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> + <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> + <description></description> + <homepage></homepage> + <identifier>one</identifier> + <name>one</name> - <id type="integer">1</id> - <parent-id type="integer" nil="true"></parent-id> - <projects-count type="integer">0</projects-count> - <status type="integer">1</status> + <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> + <is-public type="boolean">true</is-public> </project> Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/timeEntry.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/timeEntry.xml 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/timeEntry.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,18 +25,18 @@ --> <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> + <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> Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/tracker.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/tracker.xml 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/tracker.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,13 +25,13 @@ --> <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> + <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> + <is-in-chlog type="boolean">true</is-in-chlog> + <is-in-roadmap type="boolean">false</is-in-roadmap> - <name>Anomalie</name> + <name>Anomalie</name> </tracker> Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/user.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/user.xml 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/user.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,23 +25,24 @@ --> <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> + <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> + <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> + <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> + <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> Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/version.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/version.xml 2011-05-20 17:56:05 UTC (rev 192) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/version.xml 2011-05-20 22:44:58 UTC (rev 193) @@ -25,12 +25,14 @@ --> <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> + <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>

1 0

r192 - trunk/jredmine-client/src/main/redmine/jredmine/app/controllers
by tchemit＠users.nuiton.org May 20, 2011

May 20, 2011

Author: tchemit Date: 2011-05-20 19:56:05 +0200 (Fri, 20 May 2011) New Revision: 192 Url: http://nuiton.org/repositories/revision/jredmine/192 Log: fix enum retreave 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 2011-05-20 17:54:47 UTC (rev 191) +++ trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb 2011-05-20 17:56:05 UTC (rev 192) @@ -424,7 +424,8 @@ # recuperation des valeurs d'une enumeration def get_enumeration(type = params[:type]) - @result = Enumeration.get_values(type) + #@result = Enumeration.get_values(type) + @result = Enumeration.find(:all, :conditions =>["type = :sqlParamType", {:sqlParamType => type}]) render_array_result @result, "enumerations" end

1 0