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/polle... $ +# %% +# 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>