Author: agiraudet Date: 2013-06-10 15:26:34 +0200 (Mon, 10 Jun 2013) New Revision: 662 Url: http://nuiton.org/projects/sandbox/repository/revisions/662 Log: ajout des demos pollen avec la syntaxe pure yaml et la syntaxe user friendly Removed: testEugeneUML-YAML/pollen-yaml.sh testEugeneUML-YAML/pollen/pollen.yamlobjectmodel Deleted: testEugeneUML-YAML/pollen/pollen.yamlobjectmodel =================================================================== --- testEugeneUML-YAML/pollen/pollen.yamlobjectmodel 2013-06-07 16:58:19 UTC (rev 661) +++ testEugeneUML-YAML/pollen/pollen.yamlobjectmodel 2013-06-10 13:26:34 UTC (rev 662) @@ -1,822 +0,0 @@ -%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 - - associationType: composite - - visibility: public - - type: java.lang.String - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - name: description - - 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: - - 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: - - visibility: public - - type: org.chorem.pollen.business.persistence.Poll -# - reverseAttributeName: - - reverseMaxMultiplicity: -1 - - minMultiplicity: 1 - - maxMultiplicity: 1 - - navigable: false - - ordering: unordered - -- class: - - name: ChoicesGroup - -- class: - - name: PollAccount - - stereotypes: - - entity - - attribute: - - name: accountId - - associationType: composite - - visibility: public - - type: java.lang.String - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - name: votingId - - associationType: composite - - visibility: public - - type: java.lang.String - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - name: email - - associationType: composite - - visibility: public - - type: java.lang.String - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - 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: - - visibility: public - - type: org.chorem.pollen.business.persistence.Poll - - reverseAttributeName: creator - - reverseMaxMultiplicity: 1 - - minMultiplicity: 0 - - maxMultiplicity: -1 - - navigable: false - - ordering: ordered - - attribute: - - visibility: public - - type: org.chorem.pollen.business.persistence.Comment -# - reverseAttributeName: - - reverseMaxMultiplicity: 1 - - minMultiplicity: 0 - - maxMultiplicity: -1 - - navigable: false - - ordering: ordered - - attribute: - - visibility: public - - type: org.chorem.pollen.business.persistence.Vote -# - reverseAttributeName: - - reverseMaxMultiplicity: 1 - - minMultiplicity: 0 - - maxMultiplicity: -1 - - navigable: true - - ordering: ordered - - attribute: - - visibility: public - - type: org.chorem.pollen.business.persistence.PersonList -# - reverseAttributeName: - - reverseMaxMultiplicity: -1 - - minMultiplicity: 1 - - maxMultiplicity: 1 - - navigable: true - - ordering: unordered - - attribute: - - 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 - - attribute: - - name: name - - 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: - - 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: - - visibility: public - - type: org.chorem.pollen.business.persistence.Poll -# - reverseAttributeName: - - reverseMaxMultiplicity: -1 - - minMultiplicity: 1 - - maxMultiplicity: 1 - - navigable: false - - ordering: unordered - - attribute: - - 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 - - attribute: - - name: weight - - associationType: composite - - visibility: public - - type: double - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - name: comment - - 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: - - 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: - - visibility: public - - type: org.chorem.pollen.business.persistence.Poll -# - reverseAttributeName: - - reverseMaxMultiplicity: -1 - - minMultiplicity: 1 - - maxMultiplicity: 1 - - navigable: false - - ordering: unordered - - attribute: - - visibility: public - - type: org.chorem.pollen.business.persistence.PollAccount -# - reverseAttributeName: - - reverseMaxMultiplicity: -1 - - minMultiplicity: 0 - - maxMultiplicity: 1 - - navigable: true - - ordering: unordered - - 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 - - attribute: - - name: login - - associationType: composite - - visibility: public - - type: java.lang.String - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - name: password - - associationType: composite - - visibility: public - - type: java.lang.String - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - name: firstName - - associationType: composite - - visibility: public - - type: java.lang.String - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - name: lastName - - 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 - - associationType: composite - - visibility: public - - type: java.lang.String - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - name: email - - associationType: composite - - visibility: public - - type: java.lang.String - - minMultiplicity: 1 - - maxMultiplicity: 1 - - operation: - - name: getDisplayName - - visibility: public - - returnParameter: - - type: java.lang.String - - attribute: - - name: favoriteList - - visibility: public - - type: org.chorem.pollen.business.persistence.PersonList - - reverseAttributeName: owner - - reverseMaxMultiplicity: 1 - - minMultiplicity: 0 - - maxMultiplicity: -1 - - navigable: true - - ordering: ordered - - attribute: - - visibility: public - - type: org.chorem.pollen.business.persistence.PollAccount -# - reverseAttributeName: - - reverseMaxMultiplicity: 1 - - minMultiplicity: 0 - - maxMultiplicity: -1 - - navigable: true - - ordering: ordered - -- class: - - name: PreventRule - - stereotypes: - - entity - - attribute: - - name: scope - - 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 - - associationType: composite - - visibility: public - - type: java.lang.String - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - 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 - - attribute: - - name: pollId - - associationType: composite - - visibility: public - - type: java.lang.String - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - name: title - - associationType: composite - - visibility: public - - type: java.lang.String - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - name: description - - associationType: composite - - visibility: public - - type: java.lang.String - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - name: beginChoiceDate - - associationType: composite - - visibility: public - - type: java.util.Date - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - name: beginDate - - associationType: composite - - visibility: public - - type: java.util.Date - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - name: endDate - - 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 - - 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: org.chorem.pollen.business.persistence.Vote - - parameter: - - name: account - - type: org.chorem.pollen.business.persistence.PollAccount - - operation: - - name: getAdminId - - visibility: public - - returnParameter: - - type: java.lang.String - - operation: - - name: getVoteId - - visibility: public - - returnParameter: - - type: java.lang.String - - parameter: - - name: account - - type: org.chorem.pollen.business.persistence.PollAccount - - operation: - - name: isStarted - - visibility: public - - returnParameter: - - type: boolean - - parameter: - - name: currentDate - - type: java.util.Date - - operation: - - name: isRunning - - visibility: public - - returnParameter: - - type: boolean - - parameter: - - name: currentDate - - type: java.util.Date - - operation: - - name: isFinished - - visibility: public - - returnParameter: - - type: boolean - - parameter: - - name: currentDate - - type: java.util.Date - - operation: - - name: isAddChoiceStarted - - visibility: public - - returnParameter: - - type: boolean - - parameter: - - name: currentDate - - type: java.util.Date - - operation: - - name: isAddChoiceRunning - - visibility: public - - returnParameter: - - type: boolean - - parameter: - - name: currentDate - - type: java.util.Date - - operation: - - name: isAddChoiceFinished - - visibility: public - - returnParameter: - - type: boolean - - parameter: - - name: currentDate - - type: java.util.Date - - operation: - - name: getPollAccounts - - visibility: public - - returnParameter: - - type: java.util.List<org.chorem.pollen.business.persistence.PollAccount> - - parameter: - - name: withNoVote - - type: boolean - - operation: - - name: getPersonToListByVote - - visibility: public - - returnParameter: - - type: org.chorem.pollen.business.persistence.PersonToList - - parameter: - - name: vote - - type: org.chorem.pollen.business.persistence.Vote - - operation: - - name: getPreventRuleByScope - - visibility: public - - returnParameter: - - type: org.chorem.pollen.business.persistence.PreventRule - - parameter: - - name: scope - - 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: - - visibility: public - - type: org.chorem.pollen.business.persistence.Vote -# - reverseAttributeName: - - associationType: composite - - reverseMaxMultiplicity: 1 - - minMultiplicity: 0 - - maxMultiplicity: -1 - - navigable: true - - ordering: ordered - - attribute: - - visibility: public - - type: org.chorem.pollen.business.persistence.Choice -# - reverseAttributeName: - - associationType: composite - - reverseMaxMultiplicity: 1 - - minMultiplicity: 0 - - maxMultiplicity: -1 - - navigable: true - - ordering: ordered - - attribute: - - name: creator - - visibility: public - - type: org.chorem.pollen.business.persistence.PollAccount -# - reverseAttributeName: - - reverseMaxMultiplicity: -1 - - minMultiplicity: 0 - - maxMultiplicity: 1 - - navigable: true - - ordering: unordered - - attribute: - - visibility: public - - type: org.chorem.pollen.business.persistence.Comment -# - reverseAttributeName: - - associationType: composite - - reverseMaxMultiplicity: 1 - - minMultiplicity: 0 - - maxMultiplicity: -1 - - navigable: true - - ordering: ordered - - attribute: - - visibility: public - - type: org.chorem.pollen.business.persistence.PreventRule -# - reverseAttributeName: - - associationType: composite - - reverseMaxMultiplicity: 1 - - minMultiplicity: 0 - - maxMultiplicity: -1 - - navigable: true - - ordering: ordered - - attribute: - - visibility: public - - type: org.chorem.pollen.business.persistence.VotingList -# - reverseAttributeName: - - associationType: composite - - reverseMaxMultiplicity: 1 - - minMultiplicity: 0 - - maxMultiplicity: -1 - - navigable: true - - ordering: ordered - - attribute: - - visibility: public - - type: org.chorem.pollen.business.persistence.PollType -# - reverseAttributeName: - - minMultiplicity: 1 - - maxMultiplicity: 1 - - navigable: true - - ordering: unordered - - attribute: - - visibility: public - - type: org.chorem.pollen.business.persistence.ChoiceType -# - reverseAttributeName: - - minMultiplicity: 1 - - maxMultiplicity: 1 - - navigable: true - - ordering: unordered - - attribute: - - visibility: public - - type: org.chorem.pollen.business.persistence.PollVoteVisibility -# - reverseAttributeName: - - minMultiplicity: 1 - - maxMultiplicity: 1 - - navigable: true - - ordering: unordered - - attribute: - - visibility: public - - type: org.chorem.pollen.business.persistence.PollCommentVisibility -# - reverseAttributeName: - - minMultiplicity: 1 - - maxMultiplicity: 1 - - navigable: true - - ordering: unordered - -- class: - - name: PersonList - - stereotypes: - - entity - - attribute: - - name: name - - associationType: composite - - visibility: public - - type: java.lang.String - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - name: owner - - visibility: public - - type: org.chorem.pollen.business.persistence.UserAccount - - reverseAttributeName: favoriteList - - reverseMaxMultiplicity: -1 - - minMultiplicity: 1 - - maxMultiplicity: 1 - - navigable: true - - ordering: unordered - - attribute: - - 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 - - attribute: - - name: text - - associationType: composite - - visibility: public - - type: java.lang.String - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - name: postDate - - associationType: composite - - visibility: public - - type: java.util.Date - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - name: author - - associationType: composite - - visibility: public - - type: java.lang.String - - minMultiplicity: 1 - - maxMultiplicity: 1 - - attribute: - - visibility: public - - type: org.chorem.pollen.business.persistence.Poll -# - reverseAttributeName: - - reverseMaxMultiplicity: -1 - - minMultiplicity: 1 - - maxMultiplicity: 1 - - navigable: false - - ordering: unordered - - attribute: - - 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 - - participant: - - name: org.chorem.pollen.business.persistence.PollAccount -# - attribute: - - participant: - - 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 - - participant: - - name: org.chorem.pollen.business.persistence.Choice -# - attribute: - - participant: - - name: org.chorem.pollen.business.persistence.Vote -# - attribute: - - attribute: - - name: voteValue - - associationType: composite - - visibility: public - - type: java.lang.Integer - - minMultiplicity: 1 - - maxMultiplicity: 1 - -- enumeration: - - name: PollVoteVisibility - -- enumeration: - - name: PollCommentVisibility - -- enumeration: - - name: ChoiceType - -- enumeration: - - name: PollType - Deleted: testEugeneUML-YAML/pollen-yaml.sh =================================================================== --- testEugeneUML-YAML/pollen-yaml.sh 2013-06-07 16:58:19 UTC (rev 661) +++ testEugeneUML-YAML/pollen-yaml.sh 2013-06-10 13:26:34 UTC (rev 662) @@ -1,12 +0,0 @@ -#!/bin/bash - -#cd /tmp/ -svn checkout http://svn.chorem.org/svn/pollen/trunk/ pollen -mkdir pollen/pollen-persistence/src/main/models -wget http://svn.nuiton.org/svn/sandbox/testEugeneUML-YAML/pollen/pollen.yamlobjec... -O pollen/pollen-persistence/src/main/models/pollen.yamlobjectmodel -cp pollen/pollen-persistence/src/main/xmi/pollen.properties pollen/pollen-persistence/src/main/models/pollen.properties -sed -i '497s/.*/\ \ \ \ \ \ \ \ \ \ \ \ \<inputs\>yamlmodel\<\/inputs\>/' pollen/pom.xml -sed -i '152s/.*/\ \ \ \ \<eugenePluginVersion\>2.6.3-SNAPSHOT\<\/eugenePluginVersion\>/' pollen/pom.xml -cd pollen -mvn install -