Author: tchemit Date: 2012-03-20 22:10:19 +0100 (Tue, 20 Mar 2012) New Revision: 238 Url: http://nuiton.org/repositories/revision/jredmine/238 Log: closes #1925: Redmine 1.3, XML mal form?\195?\169 Added: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/issue.xml trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/user.xml Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueXpp3Reader.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserXpp3Reader.java trunk/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/user.xml trunk/jredmine-maven-plugin/src/main/resources/META-INF/plexus/components.xml Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java 2012-02-29 12:36:41 UTC (rev 237) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java 2012-03-20 21:10:19 UTC (rev 238) @@ -78,6 +78,8 @@ protected String subject; + protected boolean isPrivate; + @Override public int getId() { return id; @@ -172,6 +174,10 @@ return rootId; } + public boolean isIsPrivate() { + return isPrivate; + } + public void setAssignedToId(int assignedToId) { this.assignedToId = assignedToId; } @@ -259,4 +265,8 @@ public void setRootId(int rootId) { this.rootId = rootId; } + + public void setIsPrivate(boolean aPrivate) { + isPrivate = aPrivate; + } } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java 2012-02-29 12:36:41 UTC (rev 237) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java 2012-03-20 21:10:19 UTC (rev 238) @@ -66,6 +66,8 @@ protected String identityUrl; + protected String salt; + public boolean isAdmin() { return admin; } @@ -135,6 +137,10 @@ return identityUrl; } + public String getSalt() { + return salt; + } + public void setAdmin(boolean admin) { this.admin = admin; } @@ -199,6 +205,10 @@ this.updatedOn = updatedOn; } + public void setSalt(String salt) { + this.salt = salt; + } + @Override public String getName() { return firstname + " " + lastname; Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueXpp3Reader.java 2012-02-29 12:36:41 UTC (rev 237) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueXpp3Reader.java 2012-03-20 21:10:19 UTC (rev 238) @@ -26,6 +26,7 @@ import org.nuiton.io.xpp3.AbstractXpp3Reader; import org.nuiton.jredmine.model.Issue; +import org.nuiton.jredmine.model.Project; import java.beans.IntrospectionException; @@ -77,5 +78,8 @@ addTagTextContentMappers(Issue.class, RedmineDataConverter.Text, true, allMappers, "description", "subject"); + + addTagTextContentMappers(Issue.class, RedmineDataConverter.Boolean, true, allMappers, + "is-private"); } } Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserXpp3Reader.java 2012-02-29 12:36:41 UTC (rev 237) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserXpp3Reader.java 2012-03-20 21:10:19 UTC (rev 238) @@ -69,6 +69,7 @@ "lastname", "login", "identity-url", - "mail"); + "mail", + "salt"); } } Modified: trunk/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java =================================================================== --- trunk/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java 2012-02-29 12:36:41 UTC (rev 237) +++ trunk/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java 2012-03-20 21:10:19 UTC (rev 238) @@ -184,6 +184,29 @@ Arrays.asList(TestHelper.getModel(News.class).get(0)), Arrays.asList(TestHelper.getModel(TimeEntry.class).get(0)) ); + + Issue issue = TestHelper.getModel(Issue.class).get(0); + User user = TestHelper.getModel(User.class).get(0); + issue.setIsPrivate(true); + user.setSalt("38006729a049cd820aafd6c2bb3b193f"); + try { + action.run("single2", + null, + Arrays.asList(issue), + null, + null, + Arrays.asList(user), + null, + null, + null, + null, + null, + null + ); + } finally { + issue.setIsPrivate(false); + user.setSalt(null); + } } /** @@ -214,7 +237,7 @@ FileInputStream input = new FileInputStream(file); try { -// test from text + // test from text String txt = IOUtil.toString(input); actual = builder.readObjects(type, txt, true); @@ -293,7 +316,9 @@ RedmineModelEnum next = TYPE_ORDER[i]; - runForType(rootDir, next.getModelType(), expected[i]); + if (expected[i] != null) { + runForType(rootDir, next.getModelType(), expected[i]); + } } } } Modified: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/user.xml =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/user.xml 2012-02-29 12:36:41 UTC (rev 237) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/user.xml 2012-03-20 21:10:19 UTC (rev 238) @@ -30,7 +30,7 @@ <last-login-on type="datetime">2009-09-06T01:23:59+02:00</last-login-on> <id type="integer">1</id> - <auth-source-id type="integer" nil="true"></auth-source-id> + <auth-source-id type="integer" nil="true"/> <member-id type="NilClass">5</member-id> <role-id type="NilClass">3</role-id> <status type="integer">1</status> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/issue.xml (from rev 237, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issue.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/issue.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/issue.xml 2012-03-20 21:10:19 UTC (rev 238) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + JRedmine :: Client + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 Tony Chemit, CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + +<issue> + <assigned-to-id type="integer" nil="true"/> + <author-id type="integer">5</author-id> + <category-id type="integer">2</category-id> + <done-ratio type="integer">0</done-ratio> + <lock-version type="integer">7</lock-version> + <priority-id type="integer">4</priority-id> + <project-id type="integer">1</project-id> + <status-id type="integer">3</status-id> + <tracker-id type="integer">1</tracker-id> + <fixed-version-id type="integer">1</fixed-version-id> + <id type="integer">3</id> + <parent-id>3</parent-id> + <root-id>3</root-id> + + <estimated-hours type="float" nil="true"/> + + <created-on type="datetime">2009-09-04T20:11:52+02:00</created-on> + <updated-on type="datetime">2009-09-06T00:37:40+02:00</updated-on> + <due-date type="date" nil="true"/> + <start-date type="date">2009-09-04</start-date> + + <description>avec une description !</description> + <subject>yes!</subject> + <lft type="integer">1</lft> + <rgt type="integer">2</rgt> + <is-private type="boolean">true</is-private> +</issue> Copied: trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/user.xml (from rev 237, trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/user.xml) =================================================================== --- trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/user.xml (rev 0) +++ trunk/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/user.xml 2012-03-20 21:10:19 UTC (rev 238) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + JRedmine :: Client + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 Tony Chemit, CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + +<user> + <created-on type="datetime">2009-09-04T17:24:46+02:00</created-on> + <updated-on type="datetime">2009-09-06T01:23:59+02:00</updated-on> + <last-login-on type="datetime">2009-09-06T01:23:59+02:00</last-login-on> + + <id type="integer">1</id> + <auth-source-id type="integer" nil="true"/> + <member-id type="NilClass">5</member-id> + <role-id type="NilClass">3</role-id> + <status type="integer">1</status> + + <admin type="boolean">true</admin> + <mail-notification type="boolean">true</mail-notification> + + <firstname>Redmine</firstname> + <hashed-password>70c881d4a26984ddce795f6f71817c9cf4480e79</hashed-password> + <language>fr</language> + <lastname>Admin</lastname> + <login>admin</login> + <mail>dummy@codelutin.com</mail> + <identity-url>yo</identity-url> + <salt>38006729a049cd820aafd6c2bb3b193f</salt> +</user> Modified: trunk/jredmine-maven-plugin/src/main/resources/META-INF/plexus/components.xml =================================================================== --- trunk/jredmine-maven-plugin/src/main/resources/META-INF/plexus/components.xml 2012-02-29 12:36:41 UTC (rev 237) +++ trunk/jredmine-maven-plugin/src/main/resources/META-INF/plexus/components.xml 2012-03-20 21:10:19 UTC (rev 238) @@ -4,7 +4,7 @@ Maven helper plugin $Id$ - $HeadURL: http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plugin-1.3/s... $ + $HeadURL$ %% Copyright (C) 2009 - 2010 CodeLutin %% Property changes on: trunk/jredmine-maven-plugin/src/main/resources/META-INF/plexus/components.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL