May 2013 - Pollen-commits - mailman.cloud.codelutin.com

r3810 - trunk/pollen-persistence/src/main/models
by agiraudet＠users.chorem.org 31 May '13

31 May '13

Author: agiraudet Date: 2013-05-31 17:52:55 +0200 (Fri, 31 May 2013) New Revision: 3810 Url: http://chorem.org/projects/pollen/repository/revisions/3810 Log: mise ?\195?\160 jour de la syntaxe pure YAML (EUGene 2.6.4-SNAPSHOT) Modified: trunk/pollen-persistence/src/main/models/pollen.yamlobjectmodel Modified: trunk/pollen-persistence/src/main/models/pollen.yamlobjectmodel =================================================================== --- trunk/pollen-persistence/src/main/models/pollen.yamlobjectmodel 2013-05-29 19:36:03 UTC (rev 3809) +++ trunk/pollen-persistence/src/main/models/pollen.yamlobjectmodel 2013-05-31 15:52:55 UTC (rev 3810) @@ -11,26 +11,45 @@ - class: - name: Choice - - stereotypes: - - entity + - stereotypes: entity - attribute: - name: name - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: description - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: validate + - associationType: composite + - visibility: public - type: boolean + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - - associationClassName: VoteToChoice - - type: Vote + - visibility: public + - associationClassName: org.chorem.pollen.business.persistence.VoteToChoice + - type: org.chorem.pollen.business.persistence.Vote +# - reverseAttributeName: + - reverseMaxMultiplicity: -1 - minMultiplicity: 0 - maxMultiplicity: -1 - navigable: true - ordering: ordered - attribute: - - type: Poll + - visibility: public + - type: org.chorem.pollen.business.persistence.Poll +# - reverseAttributeName: + - reverseMaxMultiplicity: -1 + - minMultiplicity: 1 + - maxMultiplicity: 1 - navigable: false - ordering: unordered @@ -39,26 +58,41 @@ - class: - name: PollAccount - - stereotypes: - - entity + - stereotypes: entity - attribute: - name: accountId - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: votingId - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: email - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - - associationClassName: PersonToList - - type: VotingList + - visibility: public + - associationClassName: org.chorem.pollen.business.persistence.PersonToList + - type: org.chorem.pollen.business.persistence.VotingList +# - reverseAttributeName: + - reverseMaxMultiplicity: -1 - minMultiplicity: 0 - maxMultiplicity: -1 - navigable: true - ordering: ordered - attribute: - - type: Poll + - visibility: public + - type: org.chorem.pollen.business.persistence.Poll - reverseAttributeName: creator - reverseMaxMultiplicity: 1 - minMultiplicity: 0 @@ -66,121 +100,211 @@ - navigable: false - ordering: ordered - attribute: - - type: Comment + - visibility: public + - type: org.chorem.pollen.business.persistence.Comment +# - reverseAttributeName: - reverseMaxMultiplicity: 1 - minMultiplicity: 0 - maxMultiplicity: -1 - navigable: false - ordering: ordered - attribute: - - type: Vote + - visibility: public + - type: org.chorem.pollen.business.persistence.Vote +# - reverseAttributeName: - reverseMaxMultiplicity: 1 - minMultiplicity: 0 - maxMultiplicity: -1 - navigable: true - ordering: ordered - attribute: - - type: PersonList + - visibility: public + - type: org.chorem.pollen.business.persistence.PersonList +# - reverseAttributeName: + - reverseMaxMultiplicity: -1 + - minMultiplicity: 1 + - maxMultiplicity: 1 - navigable: true - ordering: unordered - attribute: - - type: UserAccount + - visibility: public + - type: org.chorem.pollen.business.persistence.UserAccount +# - reverseAttributeName: + - reverseMaxMultiplicity: -1 + - minMultiplicity: 1 + - maxMultiplicity: 1 - navigable: true - ordering: unordered - class: - name: VotingList - - stereotypes: - - entity + - stereotypes: entity - attribute: - name: name - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: weight + - associationType: composite + - visibility: public - type: double + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - - associationClassName: PersonToList - - type: PollAccount + - visibility: public + - associationClassName: org.chorem.pollen.business.persistence.PersonToList + - type: org.chorem.pollen.business.persistence.PollAccount +# - reverseAttributeName: + - reverseMaxMultiplicity: -1 + - minMultiplicity: 1 - maxMultiplicity: -1 - navigable: true - ordering: ordered - attribute: - - type: Poll + - visibility: public + - type: org.chorem.pollen.business.persistence.Poll +# - reverseAttributeName: + - reverseMaxMultiplicity: -1 + - minMultiplicity: 1 + - maxMultiplicity: 1 - navigable: false - ordering: unordered - attribute: - - type: Vote + - visibility: public + - type: org.chorem.pollen.business.persistence.Vote +# - reverseAttributeName: - reverseMaxMultiplicity: 1 - minMultiplicity: 0 + - maxMultiplicity: 1 - navigable: true - ordering: unordered - class: - name: Vote - - stereotypes: - - entity + - stereotypes: entity - attribute: - name: weight + - associationType: composite + - visibility: public - type: double + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: comment - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: anonymous + - associationType: composite + - visibility: public - type: boolean + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - - associationClassName: VoteToChoice - - type: Choice + - visibility: public + - associationClassName: org.chorem.pollen.business.persistence.VoteToChoice + - type: org.chorem.pollen.business.persistence.Choice +# - reverseAttributeName: + - reverseMaxMultiplicity: -1 + - minMultiplicity: 1 - maxMultiplicity: -1 - navigable: true - ordering: ordered - attribute: - - type: Poll + - visibility: public + - type: org.chorem.pollen.business.persistence.Poll +# - reverseAttributeName: + - reverseMaxMultiplicity: -1 + - minMultiplicity: 1 + - maxMultiplicity: 1 - navigable: false - ordering: unordered - attribute: - - type: PollAccount + - visibility: public + - type: org.chorem.pollen.business.persistence.PollAccount +# - reverseAttributeName: + - reverseMaxMultiplicity: -1 - minMultiplicity: 0 + - maxMultiplicity: 1 - navigable: true - ordering: unordered - - type: VotingList + - attribute: + - visibility: public + - type: org.chorem.pollen.business.persistence.VotingList +# - reverseAttributeName: - reverseMaxMultiplicity: 1 - minMultiplicity: 0 + - maxMultiplicity: 1 - navigable: false - ordering: unordered - class: - name: UserAccount - - stereotypes: - - entity + - stereotypes: entity - attribute: - name: login - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: password - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: firstName - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: lastName - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: administrator + - associationType: composite + - visibility: public - type: boolean + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: language - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: email - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - operation: - name: getDisplayName + - visibility: public - returnParameter: - - type: String + - type: java.lang.String - attribute: - name: favoriteList - - type: PersonList + - visibility: public + - type: org.chorem.pollen.business.persistence.PersonList - reverseAttributeName: owner - reverseMaxMultiplicity: 1 - minMultiplicity: 0 @@ -188,7 +312,9 @@ - navigable: true - ordering: ordered - attribute: - - type: PollAccount + - visibility: public + - type: org.chorem.pollen.business.persistence.PollAccount +# - reverseAttributeName: - reverseMaxMultiplicity: 1 - minMultiplicity: 0 - maxMultiplicity: -1 @@ -197,184 +323,288 @@ - class: - name: PreventRule - - stereotypes: - - entity + - stereotypes: entity - attribute: - name: scope - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: sensibility + - associationType: composite + - visibility: public - type: int + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: repeated + - associationType: composite + - visibility: public - type: boolean - + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: active + - associationType: composite + - visibility: public - type: boolean + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: oneTime + - associationType: composite + - visibility: public - type: boolean + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: method - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - - type: Poll + - visibility: public + - type: org.chorem.pollen.business.persistence.Poll +# - reverseAttributeName: + - reverseMaxMultiplicity: -1 + - minMultiplicity: 1 + - maxMultiplicity: 1 - navigable: false - ordering: unordered - class: - name: Poll - - stereotypes: - - entity + - stereotypes: entity - attribute: - name: pollId - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: title - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: description - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: beginChoiceDate - - type: Date + - associationType: composite + - visibility: public + - type: java.util.Date + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: beginDate - - type: Date + - associationType: composite + - visibility: public + - type: java.util.Date + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: endDate - - type: Date + - associationType: composite + - visibility: public + - type: java.util.Date + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: maxChoiceNb + - associationType: composite + - visibility: public - type: int + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: closed + - associationType: composite + - visibility: public - type: boolean + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: choiceAddAllowed + - associationType: composite + - visibility: public - type: boolean + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: anonymousVoteAllowed + - associationType: composite + - visibility: public - type: boolean + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: publicResults + - associationType: composite + - visibility: public - type: boolean + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: continuousResults + - associationType: composite + - visibility: public - type: boolean + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: endChoiceDate - - type: Date + - associationType: composite + - visibility: public + - type: java.util.Date + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: voteCountingType + - associationType: composite + - visibility: public - type: int + - minMultiplicity: 1 + - maxMultiplicity: 1 - operation: - name: getVoteByPollAccount + - visibility: public> - returnParameter: - - type: Vote + - type: org.chorem.pollen.business.persistence.Vote - parameter: - name: account - - type: PollAccount + - type: org.chorem.pollen.business.persistence.PollAccount - operation: - name: getAdminId + - visibility: public - returnParameter: - - type: String + - type: java.lang.String - operation: - name: getVoteId + - visibility: public - returnParameter: - - type: String + - type: java.lang.String - parameter: - name: account - - type: PollAccount + - type: org.chorem.pollen.business.persistence.PollAccount - operation: - name: isStarted + - visibility: public - returnParameter: - type: boolean - parameter: - name: currentDate - - type: Date + - type: java.util.Date - operation: - name: isRunning + - visibility: public - returnParameter: - type: boolean - parameter: - name: currentDate - - type: Date + - type: java.util.Date - operation: - name: isFinished + - visibility: public - returnParameter: - type: boolean - parameter: - name: currentDate - - type: Date + - type: java.util.Date - operation: - name: isAddChoiceStarted + - visibility: public - returnParameter: - type: boolean - parameter: - name: currentDate - - type: Date + - type: java.util.Date - operation: - name: isAddChoiceRunning + - visibility: public - returnParameter: - type: boolean - parameter: - name: currentDate - - type: Date + - type: java.util.Date - operation: - name: isAddChoiceFinished + - visibility: public - returnParameter: - type: boolean - parameter: - name: currentDate - - type: Date + - type: java.util.Date - operation: - name: getPollAccounts + - visibility: public - returnParameter: - - type: java.util.List<PollAccount> + - type: java.util.List<org.chorem.pollen.business.persistence.PollAccount> - parameter: - name: withNoVote - type: boolean - operation: - name: getPersonToListByVote + - visibility: public - returnParameter: - - type: PersonToList + - type: org.chorem.pollen.business.persistence.PersonToList - parameter: - name: vote - - type: Vote + - type: org.chorem.pollen.business.persistence.Vote - operation: - name: getPreventRuleByScope + - visibility: public - returnParameter: - - type: PreventRule + - type: org.chorem.pollen.business.persistence.PreventRule - parameter: - name: scope - - type: String + - type: java.lang.String - operation: - name: isAnonymous + - visibility: public - returnParameter: - type: boolean - operation: - name: isPollFree + - visibility: public - returnParameter: - type: boolean - operation: - name: isPollGroup + - visibility: public - returnParameter: - type: boolean - operation: - name: isPollRestricted + - visibility: public - returnParameter: - type: boolean - attribute: - - type: Vote + - visibility: public + - type: org.chorem.pollen.business.persistence.Vote +# - reverseAttributeName: + - associationType: composite - reverseMaxMultiplicity: 1 - minMultiplicity: 0 - maxMultiplicity: -1 - navigable: true - ordering: ordered - attribute: - - type: Choice + - visibility: public + - type: org.chorem.pollen.business.persistence.Choice +# - reverseAttributeName: + - associationType: composite - reverseMaxMultiplicity: 1 - minMultiplicity: 0 - maxMultiplicity: -1 @@ -382,116 +612,190 @@ - ordering: ordered - attribute: - name: creator - - type: PollAccount + - visibility: public + - type: org.chorem.pollen.business.persistence.PollAccount +# - reverseAttributeName: + - reverseMaxMultiplicity: -1 - minMultiplicity: 0 + - maxMultiplicity: 1 - navigable: true - ordering: unordered - attribute: - - type: Comment + - visibility: public + - type: org.chorem.pollen.business.persistence.Comment +# - reverseAttributeName: + - associationType: composite - reverseMaxMultiplicity: 1 - minMultiplicity: 0 - maxMultiplicity: -1 - navigable: true - ordering: ordered - attribute: - - type: PreventRule + - visibility: public + - type: org.chorem.pollen.business.persistence.PreventRule +# - reverseAttributeName: + - associationType: composite - reverseMaxMultiplicity: 1 - minMultiplicity: 0 - maxMultiplicity: -1 - navigable: true - ordering: ordered - attribute: - - type: VotingList + - visibility: public + - type: org.chorem.pollen.business.persistence.VotingList +# - reverseAttributeName: + - associationType: composite - reverseMaxMultiplicity: 1 - minMultiplicity: 0 - maxMultiplicity: -1 - navigable: true - ordering: ordered - attribute: - - type: PollType + - visibility: public + - type: org.chorem.pollen.business.persistence.PollType +# - reverseAttributeName: + - minMultiplicity: 1 + - maxMultiplicity: 1 - navigable: true - ordering: unordered - attribute: - - type: ChoiceType + - visibility: public + - type: org.chorem.pollen.business.persistence.ChoiceType +# - reverseAttributeName: + - minMultiplicity: 1 + - maxMultiplicity: 1 - navigable: true - ordering: unordered - attribute: - - type: PollVoteVisibility + - visibility: public + - type: org.chorem.pollen.business.persistence.PollVoteVisibility +# - reverseAttributeName: + - minMultiplicity: 1 + - maxMultiplicity: 1 - navigable: true - ordering: unordered - attribute: - - type: PollCommentVisibility + - visibility: public + - type: org.chorem.pollen.business.persistence.PollCommentVisibility +# - reverseAttributeName: + - minMultiplicity: 1 + - maxMultiplicity: 1 - navigable: true - ordering: unordered - class: - name: PersonList - - stereotypes: - - entity + - stereotypes: entity - attribute: - name: name - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: owner - - type: UserAccount + - visibility: public + - type: org.chorem.pollen.business.persistence.UserAccount - reverseAttributeName: favoriteList + - reverseMaxMultiplicity: -1 + - minMultiplicity: 1 + - maxMultiplicity: 1 - navigable: true - ordering: unordered - attribute: - - type: PollAccount + - visibility: public + - type: org.chorem.pollen.business.persistence.PollAccount +# - reverseAttributeName: - reverseMaxMultiplicity: 1 + - minMultiplicity: 1 - maxMultiplicity: -1 - navigable: true - ordering: ordered - class: - name: Comment - - stereotypes: - - entity + - stereotypes: entity - attribute: - name: text - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: postDate - - type: Date + - associationType: composite + - visibility: public + - type: java.util.Date + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: author - - type: String + - associationType: composite + - visibility: public + - type: java.lang.String + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - - type: Poll + - visibility: public + - type: org.chorem.pollen.business.persistence.Poll +# - reverseAttributeName: + - reverseMaxMultiplicity: -1 + - minMultiplicity: 1 + - maxMultiplicity: 1 - navigable: false - ordering: unordered - attribute: - - type: PollAccount + - visibility: public + - type: org.chorem.pollen.business.persistence.PollAccount +# - reverseAttributeName: + - reverseMaxMultiplicity: -1 + - minMultiplicity: 1 + - maxMultiplicity: 1 - navigable: true - ordering: unordered - associationClass: - name: PersonToList - - stereotypes: - - entity + - stereotypes: entity - participant: - - name: PollAccount + - name: org.chorem.pollen.business.persistence.PollAccount +# - attribute: - participant: - - name: VotingList + - name: org.chorem.pollen.business.persistence.VotingList +# - attribute: - attribute: - name: weight + - associationType: composite + - visibility: public - type: double + - minMultiplicity: 1 + - maxMultiplicity: 1 - attribute: - name: hasVoted + - associationType: composite + - visibility: public - type: boolean + - minMultiplicity: 1 + - maxMultiplicity: 1 - associationClass: - name: VoteToChoice - - stereotypes: - - entity + - stereotypes: entity - participant: - - name: Choice + - name: org.chorem.pollen.business.persistence.Choice +# - attribute: - participant: - - name: Vote + - name: org.chorem.pollen.business.persistence.Vote +# - attribute: - attribute: - name: voteValue - - type: Integer + - associationType: composite + - visibility: public + - type: java.lang.Integer + - minMultiplicity: 1 + - maxMultiplicity: 1 - enumeration: - name: PollVoteVisibility

1 0

r3809 - trunk
by tchemit＠users.chorem.org 29 May '13

29 May '13

Author: tchemit Date: 2013-05-29 21:36:03 +0200 (Wed, 29 May 2013) New Revision: 3809 Url: http://chorem.org/projects/pollen/repository/revisions/3809 Log: back to yaml model Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-29 18:29:20 UTC (rev 3808) +++ trunk/pom.xml 2013-05-29 19:36:03 UTC (rev 3809) @@ -495,8 +495,8 @@ <artifactId>eugene-maven-plugin</artifactId> <version>${eugenePluginVersion}</version> <configuration> - <inputs>zargo</inputs> -  +  + <inputs>yamlmodel</inputs> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> </configuration> <dependencies>

1 0

r3808 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting-aggregator pollen-votecounting-api pollen-votecounting-borda pollen-votecounting-condorcet pollen-votecounting-coombs pollen-votecounting-instant-runoff pollen-votecounting-normal pollen-votecounting-number pollen-votecounting-percentage
by maven-release＠users.chorem.org 29 May '13

29 May '13

Author: maven-release Date: 2013-05-29 20:29:20 +0200 (Wed, 29 May 2013) New Revision: 3808 Url: http://chorem.org/projects/pollen/repository/revisions/3808 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-aggregator/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-borda/pom.xml trunk/pollen-votecounting-condorcet/pom.xml trunk/pollen-votecounting-coombs/pom.xml trunk/pollen-votecounting-instant-runoff/pom.xml trunk/pollen-votecounting-normal/pom.xml trunk/pollen-votecounting-number/pom.xml trunk/pollen-votecounting-percentage/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2013-05-29 18:29:18 UTC (rev 3807) +++ trunk/pollen-persistence/pom.xml 2013-05-29 18:29:20 UTC (rev 3808) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4</version> + <version>1.5.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2013-05-29 18:29:18 UTC (rev 3807) +++ trunk/pollen-services/pom.xml 2013-05-29 18:29:20 UTC (rev 3808) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4</version> + <version>1.5.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2013-05-29 18:29:18 UTC (rev 3807) +++ trunk/pollen-ui-struts2/pom.xml 2013-05-29 18:29:20 UTC (rev 3808) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4</version> + <version>1.5.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-aggregator/pom.xml =================================================================== --- trunk/pollen-votecounting-aggregator/pom.xml 2013-05-29 18:29:18 UTC (rev 3807) +++ trunk/pollen-votecounting-aggregator/pom.xml 2013-05-29 18:29:20 UTC (rev 3808) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4</version> + <version>1.5.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2013-05-29 18:29:18 UTC (rev 3807) +++ trunk/pollen-votecounting-api/pom.xml 2013-05-29 18:29:20 UTC (rev 3808) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4</version> + <version>1.5.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-borda/pom.xml 2013-05-29 18:29:18 UTC (rev 3807) +++ trunk/pollen-votecounting-borda/pom.xml 2013-05-29 18:29:20 UTC (rev 3808) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4</version> + <version>1.5.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-condorcet/pom.xml 2013-05-29 18:29:18 UTC (rev 3807) +++ trunk/pollen-votecounting-condorcet/pom.xml 2013-05-29 18:29:20 UTC (rev 3808) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4</version> + <version>1.5.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-coombs/pom.xml 2013-05-29 18:29:18 UTC (rev 3807) +++ trunk/pollen-votecounting-coombs/pom.xml 2013-05-29 18:29:20 UTC (rev 3808) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4</version> + <version>1.5.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-instant-runoff/pom.xml 2013-05-29 18:29:18 UTC (rev 3807) +++ trunk/pollen-votecounting-instant-runoff/pom.xml 2013-05-29 18:29:20 UTC (rev 3808) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4</version> + <version>1.5.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-normal/pom.xml 2013-05-29 18:29:18 UTC (rev 3807) +++ trunk/pollen-votecounting-normal/pom.xml 2013-05-29 18:29:20 UTC (rev 3808) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4</version> + <version>1.5.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-number/pom.xml =================================================================== --- trunk/pollen-votecounting-number/pom.xml 2013-05-29 18:29:18 UTC (rev 3807) +++ trunk/pollen-votecounting-number/pom.xml 2013-05-29 18:29:20 UTC (rev 3808) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4</version> + <version>1.5.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-percentage/pom.xml 2013-05-29 18:29:18 UTC (rev 3807) +++ trunk/pollen-votecounting-percentage/pom.xml 2013-05-29 18:29:20 UTC (rev 3808) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4</version> + <version>1.5.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-29 18:29:18 UTC (rev 3807) +++ trunk/pom.xml 2013-05-29 18:29:20 UTC (rev 3808) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4</version> + <version>1.5.5-SNAPSHOT</version> <modules> <module>pollen-votecounting-api</module> @@ -537,11 +537,11 @@ </build> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.4</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.4 + scm:svn:http://svn.chorem.org/svn/pollen/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.5.4</url> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0

r3807 - in tags: . pollen-1.5.4
by maven-release＠users.chorem.org 29 May '13

29 May '13

Author: maven-release Date: 2013-05-29 20:29:18 +0200 (Wed, 29 May 2013) New Revision: 3807 Url: http://chorem.org/projects/pollen/repository/revisions/3807 Log: [maven-release-plugin] copy for tag pollen-1.5.4 Added: tags/pollen-1.5.4/ Property changes on: tags/pollen-1.5.4 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea atlassian-ide-plugin.xml Added: svn:mergeinfo +

1 0

r3806 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting-aggregator pollen-votecounting-api pollen-votecounting-borda pollen-votecounting-condorcet pollen-votecounting-coombs pollen-votecounting-instant-runoff pollen-votecounting-normal pollen-votecounting-number pollen-votecounting-percentage
by maven-release＠users.chorem.org 29 May '13

29 May '13

Author: maven-release Date: 2013-05-29 20:29:16 +0200 (Wed, 29 May 2013) New Revision: 3806 Url: http://chorem.org/projects/pollen/repository/revisions/3806 Log: [maven-release-plugin] prepare release pollen-1.5.4 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-aggregator/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-borda/pom.xml trunk/pollen-votecounting-condorcet/pom.xml trunk/pollen-votecounting-coombs/pom.xml trunk/pollen-votecounting-instant-runoff/pom.xml trunk/pollen-votecounting-normal/pom.xml trunk/pollen-votecounting-number/pom.xml trunk/pollen-votecounting-percentage/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2013-05-29 12:53:27 UTC (rev 3805) +++ trunk/pollen-persistence/pom.xml 2013-05-29 18:29:16 UTC (rev 3806) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2013-05-29 12:53:27 UTC (rev 3805) +++ trunk/pollen-services/pom.xml 2013-05-29 18:29:16 UTC (rev 3806) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2013-05-29 12:53:27 UTC (rev 3805) +++ trunk/pollen-ui-struts2/pom.xml 2013-05-29 18:29:16 UTC (rev 3806) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-aggregator/pom.xml =================================================================== --- trunk/pollen-votecounting-aggregator/pom.xml 2013-05-29 12:53:27 UTC (rev 3805) +++ trunk/pollen-votecounting-aggregator/pom.xml 2013-05-29 18:29:16 UTC (rev 3806) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2013-05-29 12:53:27 UTC (rev 3805) +++ trunk/pollen-votecounting-api/pom.xml 2013-05-29 18:29:16 UTC (rev 3806) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-borda/pom.xml 2013-05-29 12:53:27 UTC (rev 3805) +++ trunk/pollen-votecounting-borda/pom.xml 2013-05-29 18:29:16 UTC (rev 3806) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-condorcet/pom.xml 2013-05-29 12:53:27 UTC (rev 3805) +++ trunk/pollen-votecounting-condorcet/pom.xml 2013-05-29 18:29:16 UTC (rev 3806) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-coombs/pom.xml 2013-05-29 12:53:27 UTC (rev 3805) +++ trunk/pollen-votecounting-coombs/pom.xml 2013-05-29 18:29:16 UTC (rev 3806) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-instant-runoff/pom.xml 2013-05-29 12:53:27 UTC (rev 3805) +++ trunk/pollen-votecounting-instant-runoff/pom.xml 2013-05-29 18:29:16 UTC (rev 3806) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-normal/pom.xml 2013-05-29 12:53:27 UTC (rev 3805) +++ trunk/pollen-votecounting-normal/pom.xml 2013-05-29 18:29:16 UTC (rev 3806) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-number/pom.xml =================================================================== --- trunk/pollen-votecounting-number/pom.xml 2013-05-29 12:53:27 UTC (rev 3805) +++ trunk/pollen-votecounting-number/pom.xml 2013-05-29 18:29:16 UTC (rev 3806) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-percentage/pom.xml 2013-05-29 12:53:27 UTC (rev 3805) +++ trunk/pollen-votecounting-percentage/pom.xml 2013-05-29 18:29:16 UTC (rev 3806) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-29 12:53:27 UTC (rev 3805) +++ trunk/pom.xml 2013-05-29 18:29:16 UTC (rev 3806) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> <modules> <module>pollen-votecounting-api</module> @@ -537,11 +537,11 @@ </build> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.4</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.4 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.5.4</url> </scm> <distributionManagement>

1 0

r3805 - trunk
by tchemit＠users.chorem.org 29 May '13

29 May '13

Author: tchemit Date: 2013-05-29 14:53:27 +0200 (Wed, 29 May 2013) New Revision: 3805 Url: http://chorem.org/projects/pollen/repository/revisions/3805 Log: go back to zargo model Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-29 12:29:00 UTC (rev 3804) +++ trunk/pom.xml 2013-05-29 12:53:27 UTC (rev 3805) @@ -495,7 +495,8 @@ <artifactId>eugene-maven-plugin</artifactId> <version>${eugenePluginVersion}</version> <configuration> - <inputs>yamlmodel</inputs> + <inputs>zargo</inputs> +  <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> </configuration> <dependencies>

1 0

r3804 - trunk
by tchemit＠users.chorem.org 29 May '13

29 May '13

Author: tchemit Date: 2013-05-29 14:29:00 +0200 (Wed, 29 May 2013) New Revision: 3804 Url: http://chorem.org/projects/pollen/repository/revisions/3804 Log: fixes #926: Updates Eugene to 2.6.3 fixes #927: Updates ToPIA to 2.8 fixes jetty version configuration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-27 12:34:17 UTC (rev 3803) +++ trunk/pom.xml 2013-05-29 12:29:00 UTC (rev 3804) @@ -148,8 +148,8 @@ <projectId>pollen</projectId>  - <topiaVersion>2.8-SNAPSHOT</topiaVersion> - <eugenePluginVersion>2.6.3-SNAPSHOT</eugenePluginVersion> + <topiaVersion>2.8</topiaVersion> + <eugenePluginVersion>2.6.3</eugenePluginVersion> <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <nuitonWebVersion>1.13</nuitonWebVersion> @@ -161,7 +161,7 @@ <shiroVersion>1.2.2</shiroVersion> <slf4jVersion>1.7.5</slf4jVersion> <jettyVersion>8.1.11.v20130520</jettyVersion> - <jettyVersion>${jettyPluginVersion}</jettyVersion> +  <hibernateVersion>4.2.1.Final</hibernateVersion> <seleniumVersion>2.33.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion>

1 0

r3803 - in trunk: . pollen-persistence/src/main pollen-persistence/src/main/models
by agiraudet＠users.chorem.org 27 May '13

27 May '13

Author: agiraudet Date: 2013-05-27 14:34:17 +0200 (Mon, 27 May 2013) New Revision: 3803 Url: http://chorem.org/projects/pollen/repository/revisions/3803 Log: fixes #928: int?\195?\169gration d'un mod?\195?\168le YAML (syntaxe pure YAML optimis?\195?\169e) ?\195?\160 la cha?\195?\174ne de compilation maven de Pollen, pour revenir au mod?\195?\168le ZARGO: remplacer "yamlmodel" ?\195?\160 la ligne 498 du pom.xml de Pollen par "zargo". Added: trunk/pollen-persistence/src/main/models/ trunk/pollen-persistence/src/main/models/pollen.properties trunk/pollen-persistence/src/main/models/pollen.yamlobjectmodel Modified: trunk/pom.xml Added: trunk/pollen-persistence/src/main/models/pollen.properties =================================================================== --- trunk/pollen-persistence/src/main/models/pollen.properties (rev 0) +++ trunk/pollen-persistence/src/main/models/pollen.properties 2013-05-27 12:34:17 UTC (rev 3803) @@ -0,0 +1,45 @@ +### +# #%L +# Pollen :: Persistence +# $Id: pollen.properties 3700 2012-09-23 13:09:29Z tchemit $ +# $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-persistence/src/main/xmi/poll… $ +# %% +# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +model.tagvalue.notGenerateToString=true +#model.tagvalue.dbSchema=Pollen +model.tagvalue.constantPrefix=PROPERTY_ +model.tagvalue.java.lang.String=text +model.tagvalue.version=1.5 +model.tagvalue.doNotGenerateBooleanGetMethods=true +model.tagvalue.indexForeignKeys=true + +org.chorem.pollen.business.persistence.Poll.attribute.choice.stereotype=indexed + +org.chorem.pollen.business.persistence.Poll.attribute.vote.stereotype=ordered +org.chorem.pollen.business.persistence.Poll.attribute.vote.tagvalue.orderBy=topiaCreateDate + +# clef naturelle non modifiable sur Poll#pollId +org.chorem.pollen.business.persistence.Poll.class.tagValue.naturalIdMutable=true +org.chorem.pollen.business.persistence.Poll.attribute.pollId.stereotype=unique +org.chorem.pollen.business.persistence.Poll.attribute.pollId.tagValue.naturalId=true + +# clef naturelle non modifiable sur PollAccount#accountId +#org.chorem.pollen.business.persistence.PollAccount.class.tagValue.naturalIdMutable=true +#org.chorem.pollen.business.persistence.PollAccount.attribute.accountId.stereotype=unique +#org.chorem.pollen.business.persistence.PollAccount.attribute.accountId.tagValue.naturalId=true + Added: trunk/pollen-persistence/src/main/models/pollen.yamlobjectmodel =================================================================== --- trunk/pollen-persistence/src/main/models/pollen.yamlobjectmodel (rev 0) +++ trunk/pollen-persistence/src/main/models/pollen.yamlobjectmodel 2013-05-27 12:34:17 UTC (rev 3803) @@ -0,0 +1,507 @@ +%YAML 1.1 +--- + +- name: Pollen +- version: 1.0 +- package: org.chorem.pollen.business.persistence +- imports: + - java.lang.String + - java.util.Date + - java.lang.Integer + +- class: + - name: Choice + - stereotypes: + - entity + - attribute: + - name: name + - type: String + - attribute: + - name: description + - type: String + - attribute: + - name: validate + - type: boolean + - attribute: + - associationClassName: VoteToChoice + - type: Vote + - minMultiplicity: 0 + - maxMultiplicity: -1 + - navigable: true + - ordering: ordered + - attribute: + - type: Poll + - navigable: false + - ordering: unordered + +- class: + - name: ChoicesGroup + +- class: + - name: PollAccount + - stereotypes: + - entity + - attribute: + - name: accountId + - type: String + - attribute: + - name: votingId + - type: String + - attribute: + - name: email + - type: String + - attribute: + - associationClassName: PersonToList + - type: VotingList + - minMultiplicity: 0 + - maxMultiplicity: -1 + - navigable: true + - ordering: ordered + - attribute: + - type: Poll + - reverseAttributeName: creator + - reverseMaxMultiplicity: 1 + - minMultiplicity: 0 + - maxMultiplicity: -1 + - navigable: false + - ordering: ordered + - attribute: + - type: Comment + - reverseMaxMultiplicity: 1 + - minMultiplicity: 0 + - maxMultiplicity: -1 + - navigable: false + - ordering: ordered + - attribute: + - type: Vote + - reverseMaxMultiplicity: 1 + - minMultiplicity: 0 + - maxMultiplicity: -1 + - navigable: true + - ordering: ordered + - attribute: + - type: PersonList + - navigable: true + - ordering: unordered + - attribute: + - type: UserAccount + - navigable: true + - ordering: unordered + +- class: + - name: VotingList + - stereotypes: + - entity + - attribute: + - name: name + - type: String + - attribute: + - name: weight + - type: double + - attribute: + - associationClassName: PersonToList + - type: PollAccount + - maxMultiplicity: -1 + - navigable: true + - ordering: ordered + - attribute: + - type: Poll + - navigable: false + - ordering: unordered + - attribute: + - type: Vote + - reverseMaxMultiplicity: 1 + - minMultiplicity: 0 + - navigable: true + - ordering: unordered + +- class: + - name: Vote + - stereotypes: + - entity + - attribute: + - name: weight + - type: double + - attribute: + - name: comment + - type: String + - attribute: + - name: anonymous + - type: boolean + - attribute: + - associationClassName: VoteToChoice + - type: Choice + - maxMultiplicity: -1 + - navigable: true + - ordering: ordered + - attribute: + - type: Poll + - navigable: false + - ordering: unordered + - attribute: + - type: PollAccount + - minMultiplicity: 0 + - navigable: true + - ordering: unordered + - type: VotingList + - reverseMaxMultiplicity: 1 + - minMultiplicity: 0 + - navigable: false + - ordering: unordered + +- class: + - name: UserAccount + - stereotypes: + - entity + - attribute: + - name: login + - type: String + - attribute: + - name: password + - type: String + - attribute: + - name: firstName + - type: String + - attribute: + - name: lastName + - type: String + - attribute: + - name: administrator + - type: boolean + - attribute: + - name: language + - type: String + - attribute: + - name: email + - type: String + - operation: + - name: getDisplayName + - returnParameter: + - type: String + - attribute: + - name: favoriteList + - type: PersonList + - reverseAttributeName: owner + - reverseMaxMultiplicity: 1 + - minMultiplicity: 0 + - maxMultiplicity: -1 + - navigable: true + - ordering: ordered + - attribute: + - type: PollAccount + - reverseMaxMultiplicity: 1 + - minMultiplicity: 0 + - maxMultiplicity: -1 + - navigable: true + - ordering: ordered + +- class: + - name: PreventRule + - stereotypes: + - entity + - attribute: + - name: scope + - type: String + - attribute: + - name: sensibility + - type: int + - attribute: + - name: repeated + - type: boolean + + - attribute: + - name: active + - type: boolean + - attribute: + - name: oneTime + - type: boolean + - attribute: + - name: method + - type: String + - attribute: + - type: Poll + - navigable: false + - ordering: unordered + +- class: + - name: Poll + - stereotypes: + - entity + - attribute: + - name: pollId + - type: String + - attribute: + - name: title + - type: String + - attribute: + - name: description + - type: String + - attribute: + - name: beginChoiceDate + - type: Date + - attribute: + - name: beginDate + - type: Date + - attribute: + - name: endDate + - type: Date + - attribute: + - name: maxChoiceNb + - type: int + - attribute: + - name: closed + - type: boolean + - attribute: + - name: choiceAddAllowed + - type: boolean + - attribute: + - name: anonymousVoteAllowed + - type: boolean + - attribute: + - name: publicResults + - type: boolean + - attribute: + - name: continuousResults + - type: boolean + - attribute: + - name: endChoiceDate + - type: Date + - attribute: + - name: voteCountingType + - type: int + - operation: + - name: getVoteByPollAccount + - returnParameter: + - type: Vote + - parameter: + - name: account + - type: PollAccount + - operation: + - name: getAdminId + - returnParameter: + - type: String + - operation: + - name: getVoteId + - returnParameter: + - type: String + - parameter: + - name: account + - type: PollAccount + - operation: + - name: isStarted + - returnParameter: + - type: boolean + - parameter: + - name: currentDate + - type: Date + - operation: + - name: isRunning + - returnParameter: + - type: boolean + - parameter: + - name: currentDate + - type: Date + - operation: + - name: isFinished + - returnParameter: + - type: boolean + - parameter: + - name: currentDate + - type: Date + - operation: + - name: isAddChoiceStarted + - returnParameter: + - type: boolean + - parameter: + - name: currentDate + - type: Date + - operation: + - name: isAddChoiceRunning + - returnParameter: + - type: boolean + - parameter: + - name: currentDate + - type: Date + - operation: + - name: isAddChoiceFinished + - returnParameter: + - type: boolean + - parameter: + - name: currentDate + - type: Date + - operation: + - name: getPollAccounts + - returnParameter: + - type: java.util.List<PollAccount> + - parameter: + - name: withNoVote + - type: boolean + - operation: + - name: getPersonToListByVote + - returnParameter: + - type: PersonToList + - parameter: + - name: vote + - type: Vote + - operation: + - name: getPreventRuleByScope + - returnParameter: + - type: PreventRule + - parameter: + - name: scope + - type: String + - operation: + - name: isAnonymous + - returnParameter: + - type: boolean + - operation: + - name: isPollFree + - returnParameter: + - type: boolean + - operation: + - name: isPollGroup + - returnParameter: + - type: boolean + - operation: + - name: isPollRestricted + - returnParameter: + - type: boolean + - attribute: + - type: Vote + - reverseMaxMultiplicity: 1 + - minMultiplicity: 0 + - maxMultiplicity: -1 + - navigable: true + - ordering: ordered + - attribute: + - type: Choice + - reverseMaxMultiplicity: 1 + - minMultiplicity: 0 + - maxMultiplicity: -1 + - navigable: true + - ordering: ordered + - attribute: + - name: creator + - type: PollAccount + - minMultiplicity: 0 + - navigable: true + - ordering: unordered + - attribute: + - type: Comment + - reverseMaxMultiplicity: 1 + - minMultiplicity: 0 + - maxMultiplicity: -1 + - navigable: true + - ordering: ordered + - attribute: + - type: PreventRule + - reverseMaxMultiplicity: 1 + - minMultiplicity: 0 + - maxMultiplicity: -1 + - navigable: true + - ordering: ordered + - attribute: + - type: VotingList + - reverseMaxMultiplicity: 1 + - minMultiplicity: 0 + - maxMultiplicity: -1 + - navigable: true + - ordering: ordered + - attribute: + - type: PollType + - navigable: true + - ordering: unordered + - attribute: + - type: ChoiceType + - navigable: true + - ordering: unordered + - attribute: + - type: PollVoteVisibility + - navigable: true + - ordering: unordered + - attribute: + - type: PollCommentVisibility + - navigable: true + - ordering: unordered + +- class: + - name: PersonList + - stereotypes: + - entity + - attribute: + - name: name + - type: String + - attribute: + - name: owner + - type: UserAccount + - reverseAttributeName: favoriteList + - navigable: true + - ordering: unordered + - attribute: + - type: PollAccount + - reverseMaxMultiplicity: 1 + - maxMultiplicity: -1 + - navigable: true + - ordering: ordered + +- class: + - name: Comment + - stereotypes: + - entity + - attribute: + - name: text + - type: String + - attribute: + - name: postDate + - type: Date + - attribute: + - name: author + - type: String + - attribute: + - type: Poll + - navigable: false + - ordering: unordered + - attribute: + - type: PollAccount + - navigable: true + - ordering: unordered + +- associationClass: + - name: PersonToList + - stereotypes: + - entity + - participant: + - name: PollAccount + - participant: + - name: VotingList + - attribute: + - name: weight + - type: double + - attribute: + - name: hasVoted + - type: boolean + +- associationClass: + - name: VoteToChoice + - stereotypes: + - entity + - participant: + - name: Choice + - participant: + - name: Vote + - attribute: + - name: voteValue + - type: Integer + +- enumeration: + - name: PollVoteVisibility + +- enumeration: + - name: PollCommentVisibility + +- enumeration: + - name: ChoiceType + +- enumeration: + - name: PollType + Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-27 08:50:55 UTC (rev 3802) +++ trunk/pom.xml 2013-05-27 12:34:17 UTC (rev 3803) @@ -495,7 +495,7 @@ <artifactId>eugene-maven-plugin</artifactId> <version>${eugenePluginVersion}</version> <configuration> - <inputs>zargo</inputs> + <inputs>yamlmodel</inputs> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> </configuration> <dependencies>

1 0

r3802 - trunk
by tchemit＠users.chorem.org 27 May '13

27 May '13

Author: tchemit Date: 2013-05-27 10:50:55 +0200 (Mon, 27 May 2013) New Revision: 3802 Url: http://chorem.org/projects/pollen/repository/revisions/3802 Log: refs #927: Updates ToPIA to 2.8 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-27 07:38:56 UTC (rev 3801) +++ trunk/pom.xml 2013-05-27 08:50:55 UTC (rev 3802) @@ -148,7 +148,7 @@ <projectId>pollen</projectId>  - <topiaVersion>2.8-rc-1</topiaVersion> + <topiaVersion>2.8-SNAPSHOT</topiaVersion> <eugenePluginVersion>2.6.3-SNAPSHOT</eugenePluginVersion> <nuitonI18nVersion>2.5.1</nuitonI18nVersion>

1 0

r3801 - trunk
by tchemit＠users.chorem.org 27 May '13

27 May '13

Author: tchemit Date: 2013-05-27 09:38:56 +0200 (Mon, 27 May 2013) New Revision: 3801 Url: http://chorem.org/projects/pollen/repository/revisions/3801 Log: fixes #923: Updates javax.mail to 1.4.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-27 07:11:33 UTC (rev 3800) +++ trunk/pom.xml 2013-05-27 07:38:56 UTC (rev 3801) @@ -373,7 +373,7 @@ <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>1.4.6</version> + <version>1.4.7</version> </dependency> <dependency>

1 0

r3800 - trunk
by tchemit＠users.chorem.org 27 May '13

27 May '13

Author: tchemit Date: 2013-05-27 09:11:33 +0200 (Mon, 27 May 2013) New Revision: 3800 Url: http://chorem.org/projects/pollen/repository/revisions/3800 Log: fixes #919: Updates jetty to 8.1.11.v20130520 fixes #920: Updates selenium to 2.33.0 fixes #921: updates i18n to 2.5.1 fixes #922: Updates shiro to 1.2.2 fixes #923: Updates javax.mail to 1.4.6 fixes #924: Updates h2 to 1.3.172 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-27 06:40:55 UTC (rev 3799) +++ trunk/pom.xml 2013-05-27 07:11:33 UTC (rev 3800) @@ -150,19 +150,20 @@  <topiaVersion>2.8-rc-1</topiaVersion> <eugenePluginVersion>2.6.3-SNAPSHOT</eugenePluginVersion> - <nuitonI18nVersion>2.5</nuitonI18nVersion> + <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <nuitonWebVersion>1.13</nuitonWebVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> - <h2Version>1.3.171</h2Version> + <h2Version>1.3.172</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.14.2</struts2Version> <jqueryPluginVersion>3.5.0</jqueryPluginVersion> - <shiroVersion>1.2.1</shiroVersion> + <shiroVersion>1.2.2</shiroVersion> <slf4jVersion>1.7.5</slf4jVersion> + <jettyVersion>8.1.11.v20130520</jettyVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> <hibernateVersion>4.2.1.Final</hibernateVersion> - <seleniumVersion>2.32.0</seleniumVersion> + <seleniumVersion>2.33.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle> @@ -372,7 +373,7 @@ <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>1.4.5</version> + <version>1.4.6</version> </dependency> <dependency>

1 0

r3799 - trunk
by tchemit＠users.chorem.org 27 May '13

27 May '13

Author: tchemit Date: 2013-05-27 08:40:55 +0200 (Mon, 27 May 2013) New Revision: 3799 Url: http://chorem.org/projects/pollen/repository/revisions/3799 Log: fixes #918: Updates struts2 to 2.3.14.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-26 21:31:16 UTC (rev 3798) +++ trunk/pom.xml 2013-05-27 06:40:55 UTC (rev 3799) @@ -156,7 +156,7 @@ <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.171</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <struts2Version>2.3.14</struts2Version> + <struts2Version>2.3.14.2</struts2Version> <jqueryPluginVersion>3.5.0</jqueryPluginVersion> <shiroVersion>1.2.1</shiroVersion> <slf4jVersion>1.7.5</slf4jVersion>

1 0

r3798 - trunk
by tchemit＠users.chorem.org 26 May '13

26 May '13

Author: tchemit Date: 2013-05-26 23:31:16 +0200 (Sun, 26 May 2013) New Revision: 3798 Url: http://chorem.org/projects/pollen/repository/revisions/3798 Log: fixes #914: can't fill a description using firefox Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-26 12:53:04 UTC (rev 3797) +++ trunk/pom.xml 2013-05-26 21:31:16 UTC (rev 3798) @@ -157,7 +157,7 @@ <h2Version>1.3.171</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.14</struts2Version> - <jqueryPluginVersion>3.5.1</jqueryPluginVersion> + <jqueryPluginVersion>3.5.0</jqueryPluginVersion> <shiroVersion>1.2.1</shiroVersion> <slf4jVersion>1.7.5</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion>

1 0

r3797 - in trunk/pollen-ui-struts2/src/it/createPoll: . src/test/java/org/chorem/pollen/ui/it
by tchemit＠users.chorem.org 26 May '13

26 May '13

Author: tchemit Date: 2013-05-26 14:53:04 +0200 (Sun, 26 May 2013) New Revision: 3797 Url: http://chorem.org/projects/pollen/repository/revisions/3797 Log: fix its Modified: trunk/pollen-ui-struts2/src/it/createPoll/pom.xml trunk/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeTextPollIT.java Modified: trunk/pollen-ui-struts2/src/it/createPoll/pom.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/createPoll/pom.xml 2013-05-26 12:25:30 UTC (rev 3796) +++ trunk/pollen-ui-struts2/src/it/createPoll/pom.xml 2013-05-26 12:53:04 UTC (rev 3797) @@ -39,5 +39,13 @@ <name>Pollen :: IT createPoll</name> <description>createPoll</description> + <dependencies> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.4.01</version> + </dependency> + </dependencies> + </project> Modified: trunk/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeTextPollIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeTextPollIT.java 2013-05-26 12:25:30 UTC (rev 3796) +++ trunk/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeTextPollIT.java 2013-05-26 12:53:04 UTC (rev 3797) @@ -31,6 +31,7 @@ import org.openqa.selenium.WebElement; import java.util.Date; +import java.util.List; /** * Test the well work of a Free text poll creation page. @@ -87,6 +88,8 @@ Assert.assertTrue(choiceTwoElement.isDisplayed()); choiceTwoElement.sendKeys("Choix numero deux"); + doClickSomeWhere(); + // Submit form WebElement submit = findElement(By.name("action:create")); submit.click(); @@ -119,6 +122,8 @@ String choiceTwoValue = "Choix numero deux"; choiceTwoElement.sendKeys(choiceTwoValue); + doClickSomeWhere(); + // Submit form WebElement submit = findElement(By.name("action:create")); submit.click(); @@ -159,6 +164,8 @@ String pollTitle = "My Poll"; titleElement.sendKeys(pollTitle); + doClickSomeWhere(); + // Submit form WebElement submit = findElement(By.name("action:create")); submit.click(); @@ -459,4 +466,13 @@ Assert.assertNotNull(maxChoicesError); } + // Since we put some security (to avoid robots), something must be click on screen + protected void doClickSomeWhere() { + List<WebElement> choiceTypesElement = findElements(By.name("poll.choiceType")); + Assert.assertEquals(3, choiceTypesElement.size()); +// WebElement dateChoiceTypeElement = choiceTypesElement.get(1); +// dateChoiceTypeElement.click(); + WebElement textChoiceTypeElement = choiceTypesElement.get(0); + textChoiceTypeElement.click(); + } }

1 0

r3796 - in trunk/pollen-ui-struts2/src/it: createPoll pollCommentVisibility pollVoteVisibility pollen-ui-it security
by tchemit＠users.chorem.org 26 May '13

26 May '13

Author: tchemit Date: 2013-05-26 14:25:30 +0200 (Sun, 26 May 2013) New Revision: 3796 Url: http://chorem.org/projects/pollen/repository/revisions/3796 Log: fix its pom version Modified: trunk/pollen-ui-struts2/src/it/createPoll/pom.xml trunk/pollen-ui-struts2/src/it/pollCommentVisibility/pom.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/pom.xml trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml trunk/pollen-ui-struts2/src/it/security/pom.xml Modified: trunk/pollen-ui-struts2/src/it/createPoll/pom.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/createPoll/pom.xml 2013-05-26 06:55:05 UTC (rev 3795) +++ trunk/pollen-ui-struts2/src/it/createPoll/pom.xml 2013-05-26 12:25:30 UTC (rev 3796) @@ -31,7 +31,7 @@ <parent> <groupId>org.chorem.pollen.it</groupId> <artifactId>pollen-ui-it</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>@pom.version@</version> <relativePath>../pollen-ui-it/pom.xml</relativePath> </parent> Modified: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/pom.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/pom.xml 2013-05-26 06:55:05 UTC (rev 3795) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/pom.xml 2013-05-26 12:25:30 UTC (rev 3796) @@ -31,7 +31,7 @@ <parent> <groupId>org.chorem.pollen.it</groupId> <artifactId>pollen-ui-it</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>@pom.version@</version> <relativePath>../pollen-ui-it/pom.xml</relativePath> </parent> Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/pom.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/pom.xml 2013-05-26 06:55:05 UTC (rev 3795) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/pom.xml 2013-05-26 12:25:30 UTC (rev 3796) @@ -31,7 +31,7 @@ <parent> <groupId>org.chorem.pollen.it</groupId> <artifactId>pollen-ui-it</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>@pom.version@</version> <relativePath>../pollen-ui-it/pom.xml</relativePath> </parent> Modified: trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml 2013-05-26 06:55:05 UTC (rev 3795) +++ trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml 2013-05-26 12:25:30 UTC (rev 3796) @@ -31,7 +31,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>@pom.version@</version> </parent> <groupId>org.chorem.pollen.it</groupId> Modified: trunk/pollen-ui-struts2/src/it/security/pom.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/security/pom.xml 2013-05-26 06:55:05 UTC (rev 3795) +++ trunk/pollen-ui-struts2/src/it/security/pom.xml 2013-05-26 12:25:30 UTC (rev 3796) @@ -31,7 +31,7 @@ <parent> <groupId>org.chorem.pollen.it</groupId> <artifactId>pollen-ui-it</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>@pom.version@</version> <relativePath>../pollen-ui-it/pom.xml</relativePath> </parent>

1 0

r3795 - trunk
by tchemit＠users.chorem.org 26 May '13

26 May '13

Author: tchemit Date: 2013-05-26 08:55:05 +0200 (Sun, 26 May 2013) New Revision: 3795 Url: http://chorem.org/projects/pollen/repository/revisions/3795 Log: updates mavenpom to 3.4.11 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-01 06:36:25 UTC (rev 3794) +++ trunk/pom.xml 2013-05-26 06:55:05 UTC (rev 3795) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.10</version> + <version>3.4.11</version> </parent> <groupId>org.chorem</groupId> @@ -149,7 +149,7 @@  <topiaVersion>2.8-rc-1</topiaVersion> - <eugenePluginVersion>2.6.2</eugenePluginVersion> + <eugenePluginVersion>2.6.3-SNAPSHOT</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWebVersion>1.13</nuitonWebVersion>

1 0

r3794 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting-aggregator pollen-votecounting-api pollen-votecounting-borda pollen-votecounting-condorcet pollen-votecounting-coombs pollen-votecounting-instant-runoff pollen-votecounting-normal pollen-votecounting-number pollen-votecounting-percentage
by maven-release＠users.chorem.org 01 May '13

01 May '13

Author: maven-release Date: 2013-05-01 08:36:25 +0200 (Wed, 01 May 2013) New Revision: 3794 Url: http://chorem.org/projects/pollen/repository/revisions/3794 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-aggregator/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-borda/pom.xml trunk/pollen-votecounting-condorcet/pom.xml trunk/pollen-votecounting-coombs/pom.xml trunk/pollen-votecounting-instant-runoff/pom.xml trunk/pollen-votecounting-normal/pom.xml trunk/pollen-votecounting-number/pom.xml trunk/pollen-votecounting-percentage/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2013-05-01 06:36:23 UTC (rev 3793) +++ trunk/pollen-persistence/pom.xml 2013-05-01 06:36:25 UTC (rev 3794) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2013-05-01 06:36:23 UTC (rev 3793) +++ trunk/pollen-services/pom.xml 2013-05-01 06:36:25 UTC (rev 3794) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2013-05-01 06:36:23 UTC (rev 3793) +++ trunk/pollen-ui-struts2/pom.xml 2013-05-01 06:36:25 UTC (rev 3794) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-aggregator/pom.xml =================================================================== --- trunk/pollen-votecounting-aggregator/pom.xml 2013-05-01 06:36:23 UTC (rev 3793) +++ trunk/pollen-votecounting-aggregator/pom.xml 2013-05-01 06:36:25 UTC (rev 3794) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2013-05-01 06:36:23 UTC (rev 3793) +++ trunk/pollen-votecounting-api/pom.xml 2013-05-01 06:36:25 UTC (rev 3794) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-borda/pom.xml 2013-05-01 06:36:23 UTC (rev 3793) +++ trunk/pollen-votecounting-borda/pom.xml 2013-05-01 06:36:25 UTC (rev 3794) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-condorcet/pom.xml 2013-05-01 06:36:23 UTC (rev 3793) +++ trunk/pollen-votecounting-condorcet/pom.xml 2013-05-01 06:36:25 UTC (rev 3794) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-coombs/pom.xml 2013-05-01 06:36:23 UTC (rev 3793) +++ trunk/pollen-votecounting-coombs/pom.xml 2013-05-01 06:36:25 UTC (rev 3794) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-instant-runoff/pom.xml 2013-05-01 06:36:23 UTC (rev 3793) +++ trunk/pollen-votecounting-instant-runoff/pom.xml 2013-05-01 06:36:25 UTC (rev 3794) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-normal/pom.xml 2013-05-01 06:36:23 UTC (rev 3793) +++ trunk/pollen-votecounting-normal/pom.xml 2013-05-01 06:36:25 UTC (rev 3794) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-number/pom.xml =================================================================== --- trunk/pollen-votecounting-number/pom.xml 2013-05-01 06:36:23 UTC (rev 3793) +++ trunk/pollen-votecounting-number/pom.xml 2013-05-01 06:36:25 UTC (rev 3794) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-percentage/pom.xml 2013-05-01 06:36:23 UTC (rev 3793) +++ trunk/pollen-votecounting-percentage/pom.xml 2013-05-01 06:36:25 UTC (rev 3794) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-01 06:36:23 UTC (rev 3793) +++ trunk/pom.xml 2013-05-01 06:36:25 UTC (rev 3794) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> <modules> <module>pollen-votecounting-api</module> @@ -535,11 +535,11 @@ </build> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.3</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.3 + scm:svn:http://svn.chorem.org/svn/pollen/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.5.3</url> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0

r3793 - in tags: . pollen-1.5.3
by maven-release＠users.chorem.org 01 May '13

01 May '13

Author: maven-release Date: 2013-05-01 08:36:23 +0200 (Wed, 01 May 2013) New Revision: 3793 Url: http://chorem.org/projects/pollen/repository/revisions/3793 Log: [maven-release-plugin] copy for tag pollen-1.5.3 Added: tags/pollen-1.5.3/ Property changes on: tags/pollen-1.5.3 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea atlassian-ide-plugin.xml Added: svn:mergeinfo +

1 0

r3792 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting-aggregator pollen-votecounting-api pollen-votecounting-borda pollen-votecounting-condorcet pollen-votecounting-coombs pollen-votecounting-instant-runoff pollen-votecounting-normal pollen-votecounting-number pollen-votecounting-percentage
by maven-release＠users.chorem.org 01 May '13

01 May '13

Author: maven-release Date: 2013-05-01 08:36:21 +0200 (Wed, 01 May 2013) New Revision: 3792 Url: http://chorem.org/projects/pollen/repository/revisions/3792 Log: [maven-release-plugin] prepare release pollen-1.5.3 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-aggregator/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-borda/pom.xml trunk/pollen-votecounting-condorcet/pom.xml trunk/pollen-votecounting-coombs/pom.xml trunk/pollen-votecounting-instant-runoff/pom.xml trunk/pollen-votecounting-normal/pom.xml trunk/pollen-votecounting-number/pom.xml trunk/pollen-votecounting-percentage/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2013-04-30 14:21:17 UTC (rev 3791) +++ trunk/pollen-persistence/pom.xml 2013-05-01 06:36:21 UTC (rev 3792) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.5.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2013-04-30 14:21:17 UTC (rev 3791) +++ trunk/pollen-services/pom.xml 2013-05-01 06:36:21 UTC (rev 3792) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.5.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2013-04-30 14:21:17 UTC (rev 3791) +++ trunk/pollen-ui-struts2/pom.xml 2013-05-01 06:36:21 UTC (rev 3792) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.5.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-aggregator/pom.xml =================================================================== --- trunk/pollen-votecounting-aggregator/pom.xml 2013-04-30 14:21:17 UTC (rev 3791) +++ trunk/pollen-votecounting-aggregator/pom.xml 2013-05-01 06:36:21 UTC (rev 3792) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.5.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2013-04-30 14:21:17 UTC (rev 3791) +++ trunk/pollen-votecounting-api/pom.xml 2013-05-01 06:36:21 UTC (rev 3792) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.5.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-borda/pom.xml 2013-04-30 14:21:17 UTC (rev 3791) +++ trunk/pollen-votecounting-borda/pom.xml 2013-05-01 06:36:21 UTC (rev 3792) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.5.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-condorcet/pom.xml 2013-04-30 14:21:17 UTC (rev 3791) +++ trunk/pollen-votecounting-condorcet/pom.xml 2013-05-01 06:36:21 UTC (rev 3792) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.5.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-coombs/pom.xml 2013-04-30 14:21:17 UTC (rev 3791) +++ trunk/pollen-votecounting-coombs/pom.xml 2013-05-01 06:36:21 UTC (rev 3792) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.5.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-instant-runoff/pom.xml 2013-04-30 14:21:17 UTC (rev 3791) +++ trunk/pollen-votecounting-instant-runoff/pom.xml 2013-05-01 06:36:21 UTC (rev 3792) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.5.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-normal/pom.xml 2013-04-30 14:21:17 UTC (rev 3791) +++ trunk/pollen-votecounting-normal/pom.xml 2013-05-01 06:36:21 UTC (rev 3792) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.5.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-number/pom.xml =================================================================== --- trunk/pollen-votecounting-number/pom.xml 2013-04-30 14:21:17 UTC (rev 3791) +++ trunk/pollen-votecounting-number/pom.xml 2013-05-01 06:36:21 UTC (rev 3792) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.5.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-percentage/pom.xml 2013-04-30 14:21:17 UTC (rev 3791) +++ trunk/pollen-votecounting-percentage/pom.xml 2013-05-01 06:36:21 UTC (rev 3792) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.5.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-30 14:21:17 UTC (rev 3791) +++ trunk/pom.xml 2013-05-01 06:36:21 UTC (rev 3792) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.5.3</version> <modules> <module>pollen-votecounting-api</module> @@ -535,11 +535,11 @@ </build> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.3</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.3 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.5.3</url> </scm> <distributionManagement>

1 0