30 Apr 2014

Author: tchemit
Date: 2014-04-30 18:17:52 +0200 (Wed, 30 Apr 2014)
New Revision: 3893

Url: http://forge.chorem.org/projects/pollen/repository/revisions/3893

Log:
debug poll create + fix voteCounting id

Modified:
   trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollServiceTest.java
   trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenFixtures.java
   trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java
   trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java
   trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java
   trunk/pollen-services/src/main/java/org/chorem/pollen/services/test/PollenApplication.java
   trunk/pollen-services/src/main/resources/fixtures.yaml
   trunk/pollen-services/src/test/java/org/chorem/pollen/service/PollServiceTest.java
   trunk/pollen-services/src/test/java/org/chorem/pollen/service/PollenUserServiceTest.java
   trunk/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java
   trunk/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java
   trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java
   trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java
   trunk/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java
   trunk/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java
   trunk/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java
   trunk/pom.xml

Modified: trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollServiceTest.java
===================================================================

--- trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollServiceTest.java	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollServiceTest.java	2014-04-30 16:17:52 UTC (rev 3893)
@@ -1,6 +1,7 @@
 package org.chorem.pollen.rest.api;
 
 import org.apache.http.client.fluent.Request;
+import org.chorem.pollen.persistence.entity.Poll;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -67,7 +68,8 @@
 
     @Test
     public void getPoll() throws URISyntaxException, IOException {
-        String pollId = "iioi";
+        Poll poll = fixture("poll_simplePoll");
+        String pollId = poll.getTopiaId();
         Request request = createRequest("/v1/polls/" + pollId).Get();
         String content = request.execute().returnContent().asString();
         saveTestResult(content);
@@ -86,7 +88,8 @@
     @Ignore
     @Test
     public void putPoll() throws URISyntaxException, IOException {
-        String pollId = "";
+        Poll poll = fixture("poll_simplePoll");
+        String pollId = poll.getTopiaId();
         Request request = createRequest("/v1/polls/" + pollId).Put();
         String content = request.execute().returnContent().asString();
         saveTestResult(content);
@@ -96,7 +99,8 @@
     @Ignore
     @Test
     public void deletePoll() throws URISyntaxException, IOException {
-        String pollId = "";
+        Poll poll = fixture("poll_simplePoll");
+        String pollId = poll.getTopiaId();
         Request request = createRequest("/v1/polls/" + pollId).Delete();
         String content = request.execute().returnContent().asString();
         saveTestResult(content);
@@ -106,7 +110,8 @@
     @Ignore
     @Test
     public void clonePoll() throws URISyntaxException, IOException {
-        String pollId = "";
+        Poll poll = fixture("poll_simplePoll");
+        String pollId = poll.getTopiaId();
         Request request = createRequest("/v1/polls/" + pollId).Post();
         String content = request.execute().returnContent().asString();
         saveTestResult(content);
@@ -116,7 +121,8 @@
     @Ignore
     @Test
     public void exportPoll() throws URISyntaxException, IOException {
-        String pollId = "";
+        Poll poll = fixture("poll_simplePoll");
+        String pollId = poll.getTopiaId();
         Request request = createRequest("/v1/polls/" + pollId + "/export").Get();
         String content = request.execute().returnContent().asString();
         saveTestResult(content);
@@ -126,7 +132,8 @@
     @Ignore
     @Test
     public void closePoll() throws URISyntaxException, IOException {
-        String pollId = "";
+        Poll poll = fixture("poll_simplePoll");
+        String pollId = poll.getTopiaId();
         Request request = createRequest("/v1/polls/" + pollId + "/close").Post();
         String content = request.execute().returnContent().asString();
         saveTestResult(content);

Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenFixtures.java
===================================================================
--- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenFixtures.java	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenFixtures.java	2014-04-30 16:17:52 UTC (rev 3893)
@@ -32,8 +32,10 @@
 import org.chorem.pollen.persistence.entity.FavoriteListImpl;
 import org.chorem.pollen.persistence.entity.FavoriteListMemberImpl;
 import org.chorem.pollen.persistence.entity.PollImpl;
+import org.chorem.pollen.persistence.entity.PollenPrincipalImpl;
 import org.chorem.pollen.persistence.entity.PollenUserImpl;
 import org.chorem.pollen.persistence.entity.VoteImpl;
+import org.chorem.pollen.persistence.entity.VoteToChoiceImpl;
 import org.chorem.pollen.persistence.entity.VoterListImpl;
 import org.chorem.pollen.persistence.entity.VoterListMemberImpl;
 
@@ -61,9 +63,11 @@
         reader.getConfig().setClassTag("favorite-list-member", FavoriteListMemberImpl.class);
         reader.getConfig().setClassTag("comment", CommentImpl.class);
         reader.getConfig().setClassTag("choice", ChoiceImpl.class);
+        reader.getConfig().setClassTag("vote-to-choice", VoteToChoiceImpl.class);
         reader.getConfig().setClassTag("voter-list", VoterListImpl.class);
         reader.getConfig().setClassTag("voter-list-member", VoterListMemberImpl.class);
         reader.getConfig().setClassTag("vote", VoteImpl.class);
+        reader.getConfig().setClassTag("pollen-principal", PollenPrincipalImpl.class);
 
         try {
             fixtures = (Map<String, Object>) reader.read();

Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java
===================================================================
--- trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java	2014-04-30 16:17:52 UTC (rev 3893)
@@ -70,7 +70,7 @@
     DEFAULT_VOTE_COUNTING_TYPE(
             "pollen.default.voteCountingType",
             n("pollen.configuration.defaultVoteCountingType"),
-            "0",
+            "1",
             Integer.class),
 
     /**

Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java
===================================================================
--- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java	2014-04-30 16:17:52 UTC (rev 3893)
@@ -146,11 +146,12 @@
                 principal.setEmail(creator.getEmail());
             }
 
+            choiceToPersist.setChoiceType(choice.getChoiceType());
             choiceToPersist.setCreator(principal);
             poll.addChoice(choiceToPersist);
         }
 
-        switch (choice.getChoiceType()) {
+        switch (choiceToPersist.getChoiceType()) {
 
             case TEXT:
                 choiceToPersist.setName(choice.getName());

Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java
===================================================================
--- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java	2014-04-30 16:17:52 UTC (rev 3893)
@@ -221,15 +221,18 @@
             toSave.getCreator().setPollenUser(user);
         }
 
-        toSave.getCreator().setName(poll.getCreator().getName());
-        toSave.getCreator().setEmail(poll.getCreator().getEmail());
+        PollenPrincipal creator = poll.getCreator();
+        if (creator != null) {
+            toSave.getCreator().setName(creator.getName());
+            toSave.getCreator().setEmail(creator.getEmail());
+        }
 
         // -- simple properties -- //
 
         toSave.setVoteCountingType(poll.getVoteCountingType());
         toSave.setVoteVisibility(poll.getVoteVisibility());
         toSave.setCommentVisibility(poll.getCommentVisibility());
-//        toSave.setChoiceType(poll.getChoiceType());
+        toSave.setResultVisibility(poll.getResultVisibility());
 
         toSave.setAnonymousVoteAllowed(poll.isAnonymousVoteAllowed());
         toSave.setChoiceAddAllowed(poll.isChoiceAddAllowed());

Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/test/PollenApplication.java
===================================================================
--- trunk/pollen-services/src/main/java/org/chorem/pollen/services/test/PollenApplication.java	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/test/PollenApplication.java	2014-04-30 16:17:52 UTC (rev 3893)
@@ -100,17 +100,17 @@
     @Override
     public void finished(Description description) {
 
-        for (PollenTopiaPersistenceContext openedTransaction : openedTransactions) {
+        if (applicationContext != null && !applicationContext.isClosed()) {
 
-            if (log.isTraceEnabled()) {
-                log.trace("closing transaction " + openedTransaction);
-            }
+            for (PollenTopiaPersistenceContext openedTransaction : openedTransactions) {
 
-            openedTransaction.closeContext();
+                if (log.isTraceEnabled()) {
+                    log.trace("closing transaction " + openedTransaction);
+                }
 
-        }
+                openedTransaction.closeContext();
 
-        if (applicationContext != null && !applicationContext.isClosed()) {
+            }
 
             if (log.isTraceEnabled()) {
                 log.trace("closing transaction " + applicationContext);

Modified: trunk/pollen-services/src/main/resources/fixtures.yaml
===================================================================
--- trunk/pollen-services/src/main/resources/fixtures.yaml	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pollen-services/src/main/resources/fixtures.yaml	2014-04-30 16:17:52 UTC (rev 3893)
@@ -22,7 +22,64 @@
   email: julien@pollen.fake
   administrator: true
 
+poll_normal:
+  &normal !poll
+  title: Sondage normal
+  description: Sondage de type 'normal'
+  beginDate: 1/1/2014
+  endDate: 1/2/2014
+  maxChoiceNumber: 2
+  closed: true
+  choiceAddAllowed: false
+  anonymousVoteAllowed: false
+  continuousResults: false
+  voteCountingType: 1
+  pollType: FREE
+  voteVisibility: EVERYBODY
+  commentVisibility: EVERYBODY
+  resultVisibility: EVERYBODY
+#  creator: !pollen-principal
+#    name: poll creator
+#    email: poll_creator@pollen.chorem.org
+  choice:
+    - &normal_choixA !choice
+      name: choixA
+      description: choixA description
+      choiceType: TEXT
+    - &normal_choixB !choice
+      name: choixB
+      description: choixB description
+      choiceType: TEXT
+    - &normal_choixC !choice
+      name: choixC
+      description: choixC description
+      choiceType: TEXT
+  vote:
+    - &normal_vote1 !vote
+      weight: 1.0
+      anonymous: false
+      voteToChoice: !java.util.LinkedList
+        - &normal_voteToChoice11 !vote-to-choice
+          choice: *normal_choixA
+          voteValue: 1
+        - &normal_voteToChoice12 !vote-to-choice
+          choice: *normal_choixC
+          voteValue: 1
+    - &normal_vote2 !vote
+      weight: 1.0
+      anonymous: false
+      voteToChoice: !java.util.LinkedList
+        - &normal_voteToChoice21 !vote-to-choice
+          choice: *normal_choixA
+          voteValue: 2
+        - &normal_voteToChoice22 !vote-to-choice
+          choice: *normal_choixB
+          voteValue: 2
+
 users:
   - *tony
   - *jean
-  - *julien
\ No newline at end of file
+  - *julien
+
+polls:
+ - *normal

Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/service/PollServiceTest.java
===================================================================
--- trunk/pollen-services/src/test/java/org/chorem/pollen/service/PollServiceTest.java	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pollen-services/src/test/java/org/chorem/pollen/service/PollServiceTest.java	2014-04-30 16:17:52 UTC (rev 3893)
@@ -24,14 +24,11 @@
  */
 
 import org.chorem.pollen.persistence.entity.Choice;
-import org.chorem.pollen.persistence.entity.ChoiceImpl;
 import org.chorem.pollen.persistence.entity.ChoiceType;
 import org.chorem.pollen.persistence.entity.Poll;
 import org.chorem.pollen.persistence.entity.PollType;
 import org.chorem.pollen.persistence.entity.VoterList;
-import org.chorem.pollen.persistence.entity.VoterListImpl;
 import org.chorem.pollen.persistence.entity.VoterListMember;
-import org.chorem.pollen.persistence.entity.VoterListMemberImpl;
 import org.chorem.pollen.services.PollenSecurityContext;
 import org.chorem.pollen.services.exception.EntityNotFoundException;
 import org.chorem.pollen.services.exception.InvalidPollFormException;
@@ -69,6 +66,14 @@
     }
 
     @Test
+    public void createPoll() throws InvalidPollFormException, EntityNotFoundException {
+        Poll poll = fixture("poll_normal");
+
+        Poll createdPoll = service.createPoll(null, poll);
+        Assert.assertNotNull(createdPoll);
+    }
+    
+    @Test
     public void testCreateFreePoll() throws EntityNotFoundException, InvalidPollFormException {
 
         Poll poll = service.getNewPoll(null);
@@ -85,7 +90,7 @@
 
         poll.setTitle("poll1");
 
-        Choice choice1 = new ChoiceImpl();
+        Choice choice1 = getServiceContext().getPersistenceContext().getChoiceDao().newInstance();
         poll.addChoice(choice1);
 
         try {
@@ -107,7 +112,7 @@
         choice1.setDescription("Choice A");
 
 
-        Choice choice2 = new ChoiceImpl();
+        Choice choice2 = getServiceContext().getPersistenceContext().getChoiceDao().newInstance();
         choice2.setChoiceType(ChoiceType.TEXT);
         choice2.setName("A");
         choice2.setDescription("Choice B");
@@ -179,14 +184,14 @@
 
         poll.setTitle("poll1");
 
-        Choice choice1 = new ChoiceImpl();
+        Choice choice1 = getServiceContext().getPersistenceContext().getChoiceDao().newInstance();
         choice1.setChoiceType(ChoiceType.TEXT);
         choice1.setName("A");
         choice1.setDescription("Choice A");
 
         poll.addChoice(choice1);
 
-        Choice choice2 = new ChoiceImpl();
+        Choice choice2 = getServiceContext().getPersistenceContext().getChoiceDao().newInstance();
         choice2.setChoiceType(ChoiceType.TEXT);
         choice2.setName("B");
         choice2.setDescription("Choice B");
@@ -201,7 +206,7 @@
         }
 
         // add voter list
-        VoterList voterList = new VoterListImpl();
+        VoterList voterList = getServiceContext().getPersistenceContext().getVoterListDao().newInstance();
 
         poll.addVoterList(voterList);
 
@@ -217,7 +222,7 @@
         voterList.setName("voterList1");
         voterList.setWeight(1);
 
-        VoterListMember voterListMember1 = new VoterListMemberImpl();
+        VoterListMember voterListMember1 = getServiceContext().getPersistenceContext().getVoterListMemberDao().newInstance();
         voterList.addVoterListMember(voterListMember1);
 
         try {
@@ -241,7 +246,7 @@
 
         voterListMember1.setEmail("voter1@pollen.org");
 
-        VoterListMember voterListMember2 = new VoterListMemberImpl();
+        VoterListMember voterListMember2 = getServiceContext().getPersistenceContext().getVoterListMemberDao().newInstance();
         voterListMember2.setName("voter1");
         voterListMember2.setWeight(0.7);
         voterListMember2.setEmail("voter1@pollen.org");

Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/service/PollenUserServiceTest.java
===================================================================
--- trunk/pollen-services/src/test/java/org/chorem/pollen/service/PollenUserServiceTest.java	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pollen-services/src/test/java/org/chorem/pollen/service/PollenUserServiceTest.java	2014-04-30 16:17:52 UTC (rev 3893)
@@ -25,7 +25,6 @@
 
 import org.apache.commons.collections.CollectionUtils;
 import org.chorem.pollen.persistence.entity.PollenUser;
-import org.chorem.pollen.persistence.entity.PollenUserImpl;
 import org.chorem.pollen.persistence.entity.PollenUsers;
 import org.chorem.pollen.services.exception.EntityNotFoundException;
 import org.chorem.pollen.services.exception.InvalidPollenUserFormException;
@@ -99,7 +98,7 @@
             Assert.assertTrue(true);
         }
 
-        PollenUser newUser = new PollenUserImpl();
+        PollenUser newUser = getServiceContext().getPersistenceContext().getPollenUserDao().newInstance();
         newUser.setLogin("pollen");
         newUser.setEmail("pollen@pollen.org");
 
@@ -107,7 +106,7 @@
         Assert.assertNotNull(savedUser);
         Assert.assertNotNull(savedUser.getTopiaId());
 
-        PollenUser newUser2 = new PollenUserImpl();
+        PollenUser newUser2 = getServiceContext().getPersistenceContext().getPollenUserDao().newInstance();
         newUser2.setLogin("pollen");
         newUser2.setEmail("pollen@pollen.org");
 

Modified: trunk/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java
===================================================================
--- trunk/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java	2014-04-30 16:17:52 UTC (rev 3893)
@@ -38,7 +38,7 @@
  */
 public class BordaVoteCounting extends AbstractVoteCounting<BordaVoteCountingStrategy> {
 
-    public static final int ID = 4;
+    public static final int ID = 5;
 
     public BordaVoteCounting() {
         super(ID,

Modified: trunk/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java
===================================================================
--- trunk/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java	2014-04-30 16:17:52 UTC (rev 3893)
@@ -31,14 +31,14 @@
 import static org.nuiton.i18n.I18n.n;
 
 /**
- * Coombs vote counting entry point.
+ * Condorcet vote counting entry point.
  *
  * @author tchemit <chemit@codelutin.com>
  * @since 1.6
  */
 public class CondorcetVoteCounting extends AbstractVoteCounting<CondorcetVoteCountingStrategy> {
 
-    public static final int ID = 2;
+    public static final int ID = 3;
 
     public CondorcetVoteCounting() {
         super(ID,

Modified: trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java
===================================================================
--- trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java	2014-04-30 16:17:52 UTC (rev 3893)
@@ -38,7 +38,7 @@
  */
 public class CoombsVoteCounting extends AbstractVoteCounting<CoombsVoteCountingStrategy> {
 
-    public static final int ID = 6;
+    public static final int ID = 7;
 
     public CoombsVoteCounting() {
         super(ID,

Modified: trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java
===================================================================
--- trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java	2014-04-30 16:17:52 UTC (rev 3893)
@@ -31,14 +31,14 @@
 import static org.nuiton.i18n.I18n.n;
 
 /**
- * Coombs vote counting entry point.
+ * Instant Runoff vote counting entry point.
  *
  * @author tchemit <chemit@codelutin.com>
  * @since 1.6
  */
 public class InstantRunoffVoteCounting extends AbstractVoteCounting<InstantRunoffVoteCountingStrategy> {
 
-    public static final int ID = 5;
+    public static final int ID = 6;
 
     public InstantRunoffVoteCounting() {
         super(ID,

Modified: trunk/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java
===================================================================
--- trunk/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java	2014-04-30 16:17:52 UTC (rev 3893)
@@ -30,14 +30,14 @@
 import static org.nuiton.i18n.I18n.n;
 
 /**
- * Coombs vote counting entry point.
+ * Normal vote counting entry point.
  *
  * @author tchemit <chemit@codelutin.com>
  * @since 1.6
  */
 public class NormalVoteCounting extends AbstractVoteCounting<NormalVoteCountingStrategy> {
 
-    public static final int ID = 0;
+    public static final int ID = 1;
 
     public NormalVoteCounting() {
         super(ID,

Modified: trunk/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java
===================================================================
--- trunk/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java	2014-04-30 16:17:52 UTC (rev 3893)
@@ -30,14 +30,14 @@
 import static org.nuiton.i18n.I18n.n;
 
 /**
- * Coombs vote counting entry point.
+ * Number vote counting entry point.
  *
  * @author tchemit <chemit@codelutin.com>
  * @since 1.6
  */
 public class NumberVoteCounting extends AbstractVoteCounting<NumberVoteCountingStrategy> {
 
-    public static final int ID = 3;
+    public static final int ID = 4;
 
     public NumberVoteCounting() {
         super(ID,

Modified: trunk/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java
===================================================================
--- trunk/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java	2014-04-30 16:17:52 UTC (rev 3893)
@@ -31,14 +31,14 @@
 import static org.nuiton.i18n.I18n.n;
 
 /**
- * Coombs vote counting entry point.
+ * Percentage vote counting entry point.
  *
  * @author tchemit <chemit@codelutin.com>
  * @since 1.6
  */
 public class PercentageVoteCounting extends AbstractVoteCounting<PercentageVoteCountingStrategy> {
 
-    public static final int ID = 1;
+    public static final int ID = 2;
 
     public PercentageVoteCounting() {
         super(ID,

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2014-04-30 14:52:28 UTC (rev 3892)
+++ trunk/pom.xml	2014-04-30 16:17:52 UTC (rev 3893)
@@ -160,8 +160,7 @@
     <projectId>pollen</projectId>
 
     <!-- customized versions -->
-    <nuitonJpaVersion>1.0-rc-1</nuitonJpaVersion>
-    <webmotionVersion>2.4</webmotionVersion>
+    <webmotionVersion>2.5-SNAPSHOT</webmotionVersion>
 
     <nuitonI18nVersion>3.0</nuitonI18nVersion>
     <eugenePluginVersion>2.9-SNAPSHOT</eugenePluginVersion>
@@ -587,18 +586,6 @@
           <groupId>org.nuiton.eugene</groupId>
           <artifactId>eugene-maven-plugin</artifactId>
           <version>${eugenePluginVersion}</version>
-          <configuration>
-            <!--<inputs>zargo</inputs>-->
-            <inputs>yamlmodel</inputs>
-            <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver>
-          </configuration>
-          <dependencies>
-            <dependency>
-              <groupId>org.nuiton.jpa</groupId>
-              <artifactId>nuiton-jpa-templates</artifactId>
-              <version>${nuitonJpaVersion}</version>
-            </dependency>
-          </dependencies>
         </plugin>
 
         <plugin>

    

tchemit＠users.chorem.org