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

r2755 - in trunk/pollen-ui/src/main: java/org/chorem/pollen/ui/components java/org/chorem/pollen/ui/pages/poll resources/org/chorem/pollen/ui/components webapp/poll
by nrannou＠users.chorem.org 26 Aug '09

26 Aug '09

Author: nrannou Date: 2009-08-26 12:01:22 +0200 (Wed, 26 Aug 2009) New Revision: 2755 Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml Log: correction flux inexistant (ui) Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java 2009-08-26 09:39:41 UTC (rev 2754) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java 2009-08-26 10:01:22 UTC (rev 2755) @@ -16,6 +16,7 @@ package org.chorem.pollen.ui.components; +import java.io.File; import java.text.DateFormat; import java.util.Date; import java.util.Locale; @@ -221,6 +222,19 @@ } /** + * Vérifie que le fichier de flux de syndication existe. + * + * @return vrai si le fichier existe + */ + public boolean isFeedFileExisting() { + if (feedUrl == null) { + return false; + } + File feedFile = new File(feedUrl); + return feedFile.exists() ? true : false; + } + + /** * Initialisation de l'affichage */ void setupRender() { Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2009-08-26 09:39:41 UTC (rev 2754) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2009-08-26 10:01:22 UTC (rev 2755) @@ -588,6 +588,16 @@ } /** + * Vérifie que le fichier de flux de syndication existe. + * + * @return vrai si le fichier existe + */ + public boolean isFeedFileExisting() { + File feedFile = new File(getFeedFileName()); + return feedFile.exists() ? true : false; + } + + /** * Retourne le nom complet du fichier de flux de syndication. * * @return le nom du fichier Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml 2009-08-26 09:39:41 UTC (rev 2754) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml 2009-08-26 10:01:22 UTC (rev 2755) @@ -4,7 +4,7 @@ <head> <title>${message:pollen}</title> <link rel="shortcut icon" type="image/x-icon" href="${asset:context:favicon.ico}" /> - <t:if test="${feedUrl}"> + <t:if test="${feedFileExisting}"> <t:headlink rel="alternate" type="application/atom+xml" href="${feedUrl}" /> </t:if> <script type="text/javascript" src="${asset:context:js/pollen.js}" /> Modified: trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2009-08-26 09:39:41 UTC (rev 2754) +++ trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2009-08-26 10:01:22 UTC (rev 2755) @@ -19,9 +19,11 @@ <img src="${asset:context:img/count.png}" title="${message:results-help}" alt="${message:results}"/> </t:PageLink> </t:if> - <t:FileLink src="${feedFileName}" type="literal:application/atom+xml"> - <img src="${asset:context:img/feed.png}" title="Atom" alt="Atom"/> - </t:FileLink> + <t:if test="feedFileExisting"> + <t:FileLink src="${feedFileName}" type="literal:application/atom+xml"> + <img src="${asset:context:img/feed.png}" title="Atom" alt="Atom"/> + </t:FileLink> + </t:if> </div> <label>${message:creator-label}</label> ${creatorName} <br/>

1 0

r2754 - trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll
by nrannou＠users.chorem.org 26 Aug '09

26 Aug '09

Author: nrannou Date: 2009-08-26 11:39:41 +0200 (Wed, 26 Aug 2009) New Revision: 2754 Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java Log: correction flux inexistant Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2009-08-25 16:33:21 UTC (rev 2753) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2009-08-26 09:39:41 UTC (rev 2754) @@ -475,7 +475,7 @@ private void addFeedEntry(PollAction pollAction, String titleStr, String contentStr) { String voteURL = siteURL + "poll/VoteFor/" + poll.getPollId(); - String feedFile = getFeedFileName(); + File feedFile = new File(getFeedFileName()); String title = null; String content = null; @@ -497,6 +497,11 @@ break; } + if (!feedFile.exists()) { + FeedUtil.createFeed(feedFile, "atom_1.0", messages.format( + "pollFeed_title", poll.getTitle()), siteURL, messages + .format("pollFeed_desc", poll.getDescription())); + } FeedUtil.feedFeed(feedFile, title, voteURL, content); }

1 0

r2753 - trunk/pollen-business/src/main/java/org/chorem/pollen/business/services
by nrannou＠users.chorem.org 25 Aug '09

25 Aug '09

Author: nrannou Date: 2009-08-25 18:33:21 +0200 (Tue, 25 Aug 2009) New Revision: 2753 Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java Log: correction liste sondages invit?\195?\169s Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2009-08-25 15:58:41 UTC (rev 2752) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2009-08-25 16:33:21 UTC (rev 2753) @@ -371,7 +371,8 @@ if (!personToList.getHasVoted()) { PollAccount pollAccount = personToList .getPollAccount(); - if (pollAccount.getEmail() != null + if (pollAccount != null + && pollAccount.getEmail() != null && pollAccount.getEmail().equals( user.getEmail())) { pollEntities.add(poll);

1 0

r2752 - in trunk: . pollen-business/src/main/java/org/chorem/pollen/business/services
by nrannou＠users.chorem.org 25 Aug '09

25 Aug '09

Author: nrannou Date: 2009-08-25 17:58:41 +0200 (Tue, 25 Aug 2009) New Revision: 2752 Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java trunk/todo.txt Log: correction liste sondages invit?\195?\169s Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2009-08-25 07:59:52 UTC (rev 2751) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2009-08-25 15:58:41 UTC (rev 2752) @@ -371,7 +371,9 @@ if (!personToList.getHasVoted()) { PollAccount pollAccount = personToList .getPollAccount(); - if (pollAccount.getEmail().equals(user.getEmail())) { + if (pollAccount.getEmail() != null + && pollAccount.getEmail().equals( + user.getEmail())) { pollEntities.add(poll); } } Modified: trunk/todo.txt =================================================================== --- trunk/todo.txt 2009-08-25 07:59:52 UTC (rev 2751) +++ trunk/todo.txt 2009-08-25 15:58:41 UTC (rev 2752) @@ -1,10 +1,7 @@ TODO -différenciation des votes par groupes +différenciation des votes par groupes sur la page de vote optimisation de la page de vote amélioration des tests - - -BUGS - +import xml de sondage compatibilité avec Internet Explorer \ No newline at end of file

1 0

r2751 - in trunk: . pollen-business pollen-ui pollen-votecounting
by nrannou＠users.chorem.org 25 Aug '09

25 Aug '09

Author: nrannou Date: 2009-08-25 09:59:52 +0200 (Tue, 25 Aug 2009) New Revision: 2751 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-08-25 07:59:49 UTC (rev 2750) +++ trunk/pollen-business/pom.xml 2009-08-25 07:59:52 UTC (rev 2751) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-2</version> + <version>1.1.0-beta-3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2009-08-25 07:59:49 UTC (rev 2750) +++ trunk/pollen-ui/pom.xml 2009-08-25 07:59:52 UTC (rev 2751) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-2</version> + <version>1.1.0-beta-3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2009-08-25 07:59:49 UTC (rev 2750) +++ trunk/pollen-votecounting/pom.xml 2009-08-25 07:59:52 UTC (rev 2751) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-2</version> + <version>1.1.0-beta-3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-25 07:59:49 UTC (rev 2750) +++ trunk/pom.xml 2009-08-25 07:59:52 UTC (rev 2751) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-2</version> + <version>1.1.0-beta-3-SNAPSHOT</version> <modules> <module>pollen-ui</module> @@ -293,9 +293,9 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.1.0-beta-2</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.1.0-beta-2</developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.1.0-beta-2</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

r2750 - tags
by nrannou＠users.chorem.org 25 Aug '09

25 Aug '09

Author: nrannou Date: 2009-08-25 09:59:49 +0200 (Tue, 25 Aug 2009) New Revision: 2750 Added: tags/pollen-1.1.0-beta-2/ Log: [maven-scm] copy for tag pollen-1.1.0-beta-2

1 0

r2749 - in trunk: . pollen-business pollen-ui pollen-votecounting
by nrannou＠users.chorem.org 25 Aug '09

25 Aug '09

Author: nrannou Date: 2009-08-25 09:59:40 +0200 (Tue, 25 Aug 2009) New Revision: 2749 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.1.0-beta-2 Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2009-08-25 07:55:58 UTC (rev 2748) +++ trunk/pollen-business/pom.xml 2009-08-25 07:59:40 UTC (rev 2749) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-2-SNAPSHOT</version> + <version>1.1.0-beta-2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2009-08-25 07:55:58 UTC (rev 2748) +++ trunk/pollen-ui/pom.xml 2009-08-25 07:59:40 UTC (rev 2749) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-2-SNAPSHOT</version> + <version>1.1.0-beta-2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2009-08-25 07:55:58 UTC (rev 2748) +++ trunk/pollen-votecounting/pom.xml 2009-08-25 07:59:40 UTC (rev 2749) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-2-SNAPSHOT</version> + <version>1.1.0-beta-2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-25 07:55:58 UTC (rev 2748) +++ trunk/pom.xml 2009-08-25 07:59:40 UTC (rev 2749) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-2-SNAPSHOT</version> + <version>1.1.0-beta-2</version> <modules> <module>pollen-ui</module> @@ -293,9 +293,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.1.0-beta-2</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.1.0-beta-2</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.1.0-beta-2</url> </scm> <repositories>

1 0

r2748 - in trunk: . pollen-business pollen-ui pollen-votecounting
by nrannou＠users.chorem.org 25 Aug '09

25 Aug '09

Author: nrannou Date: 2009-08-25 09:55:58 +0200 (Tue, 25 Aug 2009) New Revision: 2748 Modified: trunk/pollen-business/pom.xml trunk/pollen-ui/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Log: [maven-release-plugin] rollback the release of pollen-1.1.0-beta-2 Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2009-08-25 07:55:29 UTC (rev 2747) +++ trunk/pollen-business/pom.xml 2009-08-25 07:55:58 UTC (rev 2748) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-2</version> + <version>1.1.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2009-08-25 07:55:29 UTC (rev 2747) +++ trunk/pollen-ui/pom.xml 2009-08-25 07:55:58 UTC (rev 2748) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-2</version> + <version>1.1.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2009-08-25 07:55:29 UTC (rev 2747) +++ trunk/pollen-votecounting/pom.xml 2009-08-25 07:55:58 UTC (rev 2748) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-2</version> + <version>1.1.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-25 07:55:29 UTC (rev 2747) +++ trunk/pom.xml 2009-08-25 07:55:58 UTC (rev 2748) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-2</version> + <version>1.1.0-beta-2-SNAPSHOT</version> <modules> <module>pollen-ui</module> @@ -293,9 +293,9 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.1.0-beta-2</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.1.0-beta-2</developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.1.0-beta-2</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

r2747 - in trunk: . pollen-business pollen-ui pollen-votecounting
by nrannou＠users.chorem.org 25 Aug '09

25 Aug '09

Author: nrannou Date: 2009-08-25 09:55:29 +0200 (Tue, 25 Aug 2009) New Revision: 2747 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.1.0-beta-2 Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2009-08-25 07:50:28 UTC (rev 2746) +++ trunk/pollen-business/pom.xml 2009-08-25 07:55:29 UTC (rev 2747) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-2-SNAPSHOT</version> + <version>1.1.0-beta-2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2009-08-25 07:50:28 UTC (rev 2746) +++ trunk/pollen-ui/pom.xml 2009-08-25 07:55:29 UTC (rev 2747) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-2-SNAPSHOT</version> + <version>1.1.0-beta-2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2009-08-25 07:50:28 UTC (rev 2746) +++ trunk/pollen-votecounting/pom.xml 2009-08-25 07:55:29 UTC (rev 2747) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-2-SNAPSHOT</version> + <version>1.1.0-beta-2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-25 07:50:28 UTC (rev 2746) +++ trunk/pom.xml 2009-08-25 07:55:29 UTC (rev 2747) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-2-SNAPSHOT</version> + <version>1.1.0-beta-2</version> <modules> <module>pollen-ui</module> @@ -293,9 +293,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.1.0-beta-2</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.1.0-beta-2</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.1.0-beta-2</url> </scm> <repositories>

1 0

r2746 - trunk
by nrannou＠users.chorem.org 25 Aug '09

25 Aug '09

Author: nrannou Date: 2009-08-25 09:50:28 +0200 (Tue, 25 Aug 2009) New Revision: 2746 Modified: trunk/pom.xml trunk/todo.txt Log: modification du pom Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-24 22:03:54 UTC (rev 2745) +++ trunk/pom.xml 2009-08-25 07:50:28 UTC (rev 2746) @@ -276,8 +276,17 @@  <license.licenseName>gpl_v3</license.licenseName> - + </properties> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + </build>   @@ -337,26 +346,7 @@ <enabled>false</enabled> </releases> </repository> - -  -  - + </repositories> <pluginRepositories> @@ -392,21 +382,6 @@ </releases> </pluginRepository> -  -  </pluginRepositories> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> - </build> - </project> Modified: trunk/todo.txt =================================================================== --- trunk/todo.txt 2009-08-24 22:03:54 UTC (rev 2745) +++ trunk/todo.txt 2009-08-25 07:50:28 UTC (rev 2746) @@ -1,5 +1,7 @@ TODO +différenciation des votes par groupes +optimisation de la page de vote amélioration des tests

1 0