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

r2819 - trunk/pollen-ui
by fdesbois＠users.chorem.org 11 Dec '09

11 Dec '09

Author: fdesbois Date: 2009-12-11 16:26:51 +0100 (Fri, 11 Dec 2009) New Revision: 2819 Modified: trunk/pollen-ui/pom.xml Log: Add properties for redmine releaseFile Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2009-12-11 11:27:16 UTC (rev 2818) +++ trunk/pollen-ui/pom.xml 2009-12-11 15:26:51 UTC (rev 2819) @@ -91,6 +91,10 @@ <packaging>war</packaging> + <properties> + <redmine.releaseFiles>target/${project.build.finalName}.war</redmine.releaseFiles> + </properties> + <reporting>  <!-- <plugins>

1 0

r2818 - in trunk: . pollen-business pollen-ui pollen-votecounting
by fdesbois＠users.chorem.org 11 Dec '09

11 Dec '09

Author: fdesbois Date: 2009-12-11 12:27:16 +0100 (Fri, 11 Dec 2009) New Revision: 2818 Modified: trunk/pollen-business/pom.xml trunk/pollen-ui/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2009-12-11 11:27:11 UTC (rev 2817) +++ trunk/pollen-business/pom.xml 2009-12-11 11:27:16 UTC (rev 2818) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.1</version> + <version>1.2.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2009-12-11 11:27:11 UTC (rev 2817) +++ trunk/pollen-ui/pom.xml 2009-12-11 11:27:16 UTC (rev 2818) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.1</version> + <version>1.2.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2009-12-11 11:27:11 UTC (rev 2817) +++ trunk/pollen-votecounting/pom.xml 2009-12-11 11:27:16 UTC (rev 2818) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.1</version> + <version>1.2.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-11 11:27:11 UTC (rev 2817) +++ trunk/pom.xml 2009-12-11 11:27:16 UTC (rev 2818) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.1</version> + <version>1.2.2-SNAPSHOT</version> <modules> <module>pollen-ui</module> @@ -338,9 +338,9 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.2.1</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.2.1</developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.2.1</url> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <repositories>

1 0

r2817 - in tags: . pollen-1.2.1
by fdesbois＠users.chorem.org 11 Dec '09

11 Dec '09

Author: fdesbois Date: 2009-12-11 12:27:11 +0100 (Fri, 11 Dec 2009) New Revision: 2817 Added: tags/pollen-1.2.1/ Log: [maven-scm] copy for tag pollen-1.2.1 Property changes on: tags/pollen-1.2.1 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml Added: svn:mergeinfo +

1 0

r2816 - in trunk: . pollen-business pollen-ui pollen-votecounting
by fdesbois＠users.chorem.org 11 Dec '09

11 Dec '09

Author: fdesbois Date: 2009-12-11 12:27:07 +0100 (Fri, 11 Dec 2009) New Revision: 2816 Modified: trunk/pollen-business/pom.xml trunk/pollen-ui/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare release pollen-1.2.1 Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2009-12-11 11:25:28 UTC (rev 2815) +++ trunk/pollen-business/pom.xml 2009-12-11 11:27:07 UTC (rev 2816) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.2.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2009-12-11 11:25:28 UTC (rev 2815) +++ trunk/pollen-ui/pom.xml 2009-12-11 11:27:07 UTC (rev 2816) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.2.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2009-12-11 11:25:28 UTC (rev 2815) +++ trunk/pollen-votecounting/pom.xml 2009-12-11 11:27:07 UTC (rev 2816) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.2.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-11 11:25:28 UTC (rev 2815) +++ trunk/pom.xml 2009-12-11 11:27:07 UTC (rev 2816) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.2.1</version> <modules> <module>pollen-ui</module> @@ -338,9 +338,9 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.2.1</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.2.1</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.2.1</url> </scm> <repositories>

1 0

r2815 - trunk
by fdesbois＠users.chorem.org 11 Dec '09

11 Dec '09

Author: fdesbois Date: 2009-12-11 12:25:28 +0100 (Fri, 11 Dec 2009) New Revision: 2815 Modified: trunk/pom.xml Log: Change mavenpom version to release pollen 1.2.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-10 18:37:55 UTC (rev 2814) +++ trunk/pom.xml 2009-12-11 11:25:28 UTC (rev 2815) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.1</version> + <version>1.1.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r2814 - in trunk/pollen-business/src/main/java/org/chorem/pollen/business: services utils
by fdesbois＠users.chorem.org 10 Dec '09

10 Dec '09

Author: fdesbois Date: 2009-12-10 19:37:55 +0100 (Thu, 10 Dec 2009) New Revision: 2814 Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java Log: Ano #87 : problem with vote modification Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java 2009-12-09 19:11:58 UTC (rev 2813) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java 2009-12-10 18:37:55 UTC (rev 2814) @@ -21,9 +21,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.business.converters.DataPollAccountConverter; import org.chorem.pollen.business.converters.DataVoteConverter; import org.chorem.pollen.business.dto.PollAccountDTO; import org.chorem.pollen.business.dto.VoteDTO; +import org.chorem.pollen.business.persistence.PollAccount; +import org.chorem.pollen.business.persistence.PollAccountDAO; import org.chorem.pollen.business.persistence.PollenModelDAOHelper; import org.chorem.pollen.business.persistence.Vote; import org.chorem.pollen.business.persistence.VoteDAO; @@ -57,20 +60,36 @@ // création du compte associé au vote s'il n'existe pas // sinon mise à jour du compte - ServicePollAccount spa = new ServicePollAccountImpl(); + //ServicePollAccount spa = new ServicePollAccountImpl(); if (pollAccountDTO != null) { pollAccountDTO.setHasVoted(true); - PollAccountDTO account = spa.findPollAccountById(pollAccountDTO - .getId()); - if (account != null) { - log.debug("Compte associé au vote : " + account.getId()); - spa.updatePollAccount(pollAccountDTO); - voteDTO.setPollAccountId(account.getId()); + PollAccountDAO pollAccountDAO = PollenModelDAOHelper.getPollAccountDAO(transaction); + + PollAccount pollAccountEntity = + pollAccountDAO.findByTopiaId(pollAccountDTO.getId()); + +// PollAccountDTO account = spa.findPollAccountById(pollAccountDTO +// .getId()); + if (pollAccountEntity == null) { + log.debug("Nouveau compte associé au vote"); + pollAccountEntity = pollAccountDAO.create(); +// voteDTO.setPollAccountId(spa +// .createPollAccount(pollAccountDTO)); } else { - log.debug("Nouveau compte associé au vote"); - voteDTO.setPollAccountId(spa - .createPollAccount(pollAccountDTO)); + log.debug("Compte associé au vote : " + pollAccountEntity.getTopiaId()); + //spa.updatePollAccount(pollAccountDTO); + //voteDTO.setPollAccountId(account.getId()); + } + // Fill pollAccountEntity from DTO in argument + DataPollAccountConverter pollAccountConverter = new DataPollAccountConverter(); + pollAccountConverter.setTransaction(transaction); + pollAccountConverter.populatePollAccountEntity(pollAccountDTO, + pollAccountEntity); + // Update pollAccountEntity + pollAccountDAO.update(pollAccountEntity); + + voteDTO.setPollAccountId(pollAccountEntity.getTopiaId()); voteDTO.setVotingListId(pollAccountDTO.getVotingListId()); voteDTO.setWeight(pollAccountDTO.getWeight()); log.debug("Poids du vote : " + voteDTO.getWeight()); @@ -97,8 +116,8 @@ } return topiaId; - } catch (TopiaException e) { - ContextUtil.doCatch(e, transaction); + } catch (Exception eee) { + ContextUtil.doCatch(eee, transaction, "Problem when creating vote with pollAccount"); return null; } } Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java 2009-12-09 19:11:58 UTC (rev 2813) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java 2009-12-10 18:37:55 UTC (rev 2814) @@ -283,14 +283,23 @@ } } + public static void doCatch(TopiaException e, TopiaContext transaction) { + doCatch(e, transaction, "Échec lors du déroulement de la transaction"); + } + /** * Méthode exécutée lorsqu'une exception est détectée. * - * @param e l'exception + * @param eee + * @param message * @param transaction la transaction courante */ - public static void doCatch(TopiaException e, TopiaContext transaction) { + public static void doCatch(Exception eee, TopiaContext transaction, String message) { + if (log.isErrorEnabled()) { + log.error(message, eee); + } + // rollback de la transaction courante if (transaction != null) { try { @@ -311,9 +320,5 @@ } } } - - if (log.isErrorEnabled()) { - log.error("Échec lors du déroulement de la transaction", e); - } } } \ No newline at end of file

1 0

r2813 - trunk/pollen-ui/src/main/resources
by echatellier＠users.chorem.org 09 Dec '09

09 Dec '09

Author: echatellier Date: 2009-12-09 20:11:58 +0100 (Wed, 09 Dec 2009) New Revision: 2813 Modified: trunk/pollen-ui/src/main/resources/pollenembedded.properties Log: Text version not used anymore Modified: trunk/pollen-ui/src/main/resources/pollenembedded.properties =================================================================== --- trunk/pollen-ui/src/main/resources/pollenembedded.properties 2009-12-09 19:10:30 UTC (rev 2812) +++ trunk/pollen-ui/src/main/resources/pollenembedded.properties 2009-12-09 19:11:58 UTC (rev 2813) @@ -14,7 +14,6 @@ topia.service.migration.callbackhandlers=org.chorem.pollen.business.migration.PollenMigrationCallbackHandler topia.service.migration.mappingsdir=oldmappings topia.service.migration.modelnames=pollen -topia.service.migration.version=1.1 ## Initialisation de la base de données choiceType=DATE,IMAGE,TEXT

1 0

r2812 - trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll
by echatellier＠users.chorem.org 09 Dec '09

09 Dec '09

Author: echatellier Date: 2009-12-09 20:10:30 +0100 (Wed, 09 Dec 2009) New Revision: 2812 Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties Log: Wrong key used for en language Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties 2009-12-09 18:08:51 UTC (rev 2811) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties 2009-12-09 19:10:30 UTC (rev 2812) @@ -4,9 +4,9 @@ beginDate-label=Begin Date: endDate-label=End Date: pollType-label=Poll type: -normalVoteInfo=Normal vote: vote for your favorite choice. -percentageVoteInfo=Percentage vote: allocate choices to get a 100% total. -condorcetVoteInfo=Condorcet vote: rank choices by preference order from 1 to N (1=favorite). Only the rank is taken into account, not the values. Two choices can have the same value. +normalVote-help=Normal vote: vote for your favorite choice. +percentageVote-help=Percentage vote: allocate choices to get a 100% total. +condorcetVote-help=Condorcet vote: rank choices by preference order from 1 to N (1=favorite). Only the rank is taken into account, not the values. Two choices can have the same value. results=Results results-help=Display results

1 0

r2811 - in trunk: . pollen-business pollen-ui pollen-votecounting
by fdesbois＠users.chorem.org 09 Dec '09

09 Dec '09

Author: fdesbois Date: 2009-12-09 19:08:51 +0100 (Wed, 09 Dec 2009) New Revision: 2811 Modified: trunk/pollen-business/pom.xml trunk/pollen-ui/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2009-12-09 18:08:47 UTC (rev 2810) +++ trunk/pollen-business/pom.xml 2009-12-09 18:08:51 UTC (rev 2811) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2009-12-09 18:08:47 UTC (rev 2810) +++ trunk/pollen-ui/pom.xml 2009-12-09 18:08:51 UTC (rev 2811) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2009-12-09 18:08:47 UTC (rev 2810) +++ trunk/pollen-votecounting/pom.xml 2009-12-09 18:08:51 UTC (rev 2811) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-09 18:08:47 UTC (rev 2810) +++ trunk/pom.xml 2009-12-09 18:08:51 UTC (rev 2811) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> <modules> <module>pollen-ui</module> @@ -338,9 +338,9 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.2.0</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.2.0</developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.2.0</url> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <repositories>

1 0

r2810 - in tags: . pollen-1.2.0
by fdesbois＠users.chorem.org 09 Dec '09

09 Dec '09

Author: fdesbois Date: 2009-12-09 19:08:47 +0100 (Wed, 09 Dec 2009) New Revision: 2810 Added: tags/pollen-1.2.0/ Log: [maven-scm] copy for tag pollen-1.2.0 Property changes on: tags/pollen-1.2.0 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml Added: svn:mergeinfo +

1 0