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

r3683 - in tags: . pollen-1.4.5.1
by tchemit＠users.chorem.org Sept. 5, 2012

Sept. 5, 2012

Author: tchemit Date: 2012-09-05 12:58:48 +0200 (Wed, 05 Sep 2012) New Revision: 3683 Url: http://chorem.org/repositories/revision/pollen/3683 Log: [maven-release-plugin] copy for tag pollen-1.4.5.1 Added: tags/pollen-1.4.5.1/ Property changes on: tags/pollen-1.4.5.1 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

r3682 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting pollen-votecounting-api pollen-votecounting-strategy pollen-votecounting-strategy-borda pollen-votecounting-strategy-condorcet pollen-votecounting-strategy-coombs pollen-votecounting-strategy-instant-runoff pollen-votecounting-strategy-normal pollen-votecounting-strategy-number pollen-votecounting-strategy-percentage
by tchemit＠users.chorem.org Sept. 5, 2012

Sept. 5, 2012

Author: tchemit Date: 2012-09-05 12:58:45 +0200 (Wed, 05 Sep 2012) New Revision: 3682 Url: http://chorem.org/repositories/revision/pollen/3682 Log: [maven-release-plugin] prepare release pollen-1.4.5.1 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-strategy-borda/pom.xml trunk/pollen-votecounting-strategy-condorcet/pom.xml trunk/pollen-votecounting-strategy-coombs/pom.xml trunk/pollen-votecounting-strategy-instant-runoff/pom.xml trunk/pollen-votecounting-strategy-normal/pom.xml trunk/pollen-votecounting-strategy-number/pom.xml trunk/pollen-votecounting-strategy-percentage/pom.xml trunk/pollen-votecounting-strategy/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-persistence/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-services/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-ui-struts2/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-api/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-strategy/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-number/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> <modules> <module>pollen-votecounting-api</module> @@ -539,11 +539,11 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4.5.1</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4.5.1 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.4.5.1</url> </scm> <distributionManagement>

1 0

r3681 - trunk/pollen-ui-struts2/src/main/assembly/dist
by tchemit＠users.chorem.org Sept. 5, 2012

Sept. 5, 2012

Author: tchemit Date: 2012-09-05 12:51:03 +0200 (Wed, 05 Sep 2012) New Revision: 3681 Url: http://chorem.org/repositories/revision/pollen/3681 Log: fixes #803: Portable Pollen version does not start using given scripts Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-09-04 16:54:54 UTC (rev 3680) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-09-05 10:51:03 UTC (rev 3681) @@ -9,7 +9,7 @@ set POLLEN_OPTS="-Xms512m -Xmx1024m -Dpollen.log.dir=./logs" echo java options used : %POLLEN_OPTS% -%JAVA_COMMAND% "%POLLEN_OPTS%" -jar pollen-embedded-${project.version}.war %1 %2 %3 %4 %5 %6 %7 %8 %9 +%JAVA_COMMAND% "%POLLEN_OPTS%" -jar pollen-${project.version}-embedded.war %1 %2 %3 %4 %5 %6 %7 %8 %9 pause cmd /C exit /B %ERROR_CODE% Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2012-09-04 16:54:54 UTC (rev 3680) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2012-09-05 10:51:03 UTC (rev 3681) @@ -11,6 +11,6 @@ OLDPWD=`pwd` cd `dirname $0` CURRENTPWD=`pwd` -POLLEN_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dpollen.log.dir=$CURRENTPWD/logs" -java $POLLEN_OPTS -jar pollen-embedded-${project.version}.war $* +POLLEN_OPTS="$JAVA_OPTS -Xms512m -Xmx1024m -Dpollen.log.dir=$CURRENTPWD/logs" +java $POLLEN_OPTS -jar pollen-${project.version}-embedded.war $* cd "$OLDPWD" \ No newline at end of file

1 0

r3680 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting pollen-votecounting-api pollen-votecounting-strategy pollen-votecounting-strategy-borda pollen-votecounting-strategy-condorcet pollen-votecounting-strategy-coombs pollen-votecounting-strategy-instant-runoff pollen-votecounting-strategy-normal pollen-votecounting-strategy-number pollen-votecounting-strategy-percentage
by maven-release＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: maven-release Date: 2012-09-04 18:54:54 +0200 (Tue, 04 Sep 2012) New Revision: 3680 Url: http://chorem.org/repositories/revision/pollen/3680 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-strategy-borda/pom.xml trunk/pollen-votecounting-strategy-condorcet/pom.xml trunk/pollen-votecounting-strategy-coombs/pom.xml trunk/pollen-votecounting-strategy-instant-runoff/pom.xml trunk/pollen-votecounting-strategy-normal/pom.xml trunk/pollen-votecounting-strategy-number/pom.xml trunk/pollen-votecounting-strategy-percentage/pom.xml trunk/pollen-votecounting-strategy/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-persistence/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-services/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-ui-struts2/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-api/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-strategy/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-number/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> <modules> <module>pollen-votecounting-api</module> @@ -539,11 +539,11 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4.5</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4.5 + scm:svn:http://svn.chorem.org/svn/pollen/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.4.5</url> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0

r3679 - in tags: . pollen-1.4.5
by maven-release＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: maven-release Date: 2012-09-04 18:54:52 +0200 (Tue, 04 Sep 2012) New Revision: 3679 Url: http://chorem.org/repositories/revision/pollen/3679 Log: [maven-release-plugin] copy for tag pollen-1.4.5 Added: tags/pollen-1.4.5/ Property changes on: tags/pollen-1.4.5 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

r3678 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting pollen-votecounting-api pollen-votecounting-strategy pollen-votecounting-strategy-borda pollen-votecounting-strategy-condorcet pollen-votecounting-strategy-coombs pollen-votecounting-strategy-instant-runoff pollen-votecounting-strategy-normal pollen-votecounting-strategy-number pollen-votecounting-strategy-percentage
by maven-release＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: maven-release Date: 2012-09-04 18:54:50 +0200 (Tue, 04 Sep 2012) New Revision: 3678 Url: http://chorem.org/repositories/revision/pollen/3678 Log: [maven-release-plugin] prepare release pollen-1.4.5 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-strategy-borda/pom.xml trunk/pollen-votecounting-strategy-condorcet/pom.xml trunk/pollen-votecounting-strategy-coombs/pom.xml trunk/pollen-votecounting-strategy-instant-runoff/pom.xml trunk/pollen-votecounting-strategy-normal/pom.xml trunk/pollen-votecounting-strategy-number/pom.xml trunk/pollen-votecounting-strategy-percentage/pom.xml trunk/pollen-votecounting-strategy/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-persistence/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-services/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-ui-struts2/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> @@ -428,8 +426,7 @@ <phase>generate-resources</phase> <configuration> <target> - <mkdir - dir="${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes"/> + <mkdir dir="${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes" /> </target> </configuration> <goals> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-api/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-strategy/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-number/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> <modules> <module>pollen-votecounting-api</module> @@ -539,11 +539,11 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4.5</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4.5 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.4.5</url> </scm> <distributionManagement>

1 0

r3677 - in trunk: pollen-votecounting-strategy-coombs/src/test/resources pollen-votecounting-strategy-instant-runoff/src/test/resources pollen-votecounting-strategy-normal/src/test/resources pollen-votecounting-strategy-number/src/test/resources pollen-votecounting-strategy-percentage/src/test/resources
by tchemit＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: tchemit Date: 2012-09-04 18:44:19 +0200 (Tue, 04 Sep 2012) New Revision: 3677 Url: http://chorem.org/repositories/revision/pollen/3677 Log: add missing svn properties + license headers Modified: trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties Modified: trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties 2012-09-04 16:32:29 UTC (rev 3676) +++ trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties 2012-09-04 16:44:19 UTC (rev 3677) @@ -1,3 +1,25 @@ +### +# #%L +# Pollen :: VoteCounting strategy :: Coombs +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# 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% +### # Global logging configuration log4j.rootLogger=WARN, stdout # Console output... Modified: trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties 2012-09-04 16:32:29 UTC (rev 3676) +++ trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties 2012-09-04 16:44:19 UTC (rev 3677) @@ -1,3 +1,25 @@ +### +# #%L +# Pollen :: VoteCounting strategy :: Instant Runoff +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# 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% +### # Global logging configuration log4j.rootLogger=WARN, stdout # Console output... Modified: trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties 2012-09-04 16:32:29 UTC (rev 3676) +++ trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties 2012-09-04 16:44:19 UTC (rev 3677) @@ -1,3 +1,25 @@ +### +# #%L +# Pollen :: VoteCounting strategy :: Normal +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# 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% +### # Global logging configuration log4j.rootLogger=WARN, stdout # Console output... Modified: trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties 2012-09-04 16:32:29 UTC (rev 3676) +++ trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties 2012-09-04 16:44:19 UTC (rev 3677) @@ -1,3 +1,25 @@ +### +# #%L +# Pollen :: VoteCounting strategy :: Number +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# 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% +### # Global logging configuration log4j.rootLogger=WARN, stdout # Console output... Modified: trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties 2012-09-04 16:32:29 UTC (rev 3676) +++ trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties 2012-09-04 16:44:19 UTC (rev 3677) @@ -1,3 +1,25 @@ +### +# #%L +# Pollen :: VoteCounting strategy :: Percentage +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# 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% +### # Global logging configuration log4j.rootLogger=WARN, stdout # Console output...

1 0

r3676 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote
by tchemit＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: tchemit Date: 2012-09-04 18:32:29 +0200 (Tue, 04 Sep 2012) New Revision: 3676 Url: http://chorem.org/repositories/revision/pollen/3676 Log: fix delete vote (accountId not remove from url if creator on free poll...) Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteVote.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteVote.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteVote.java 2012-09-04 16:17:33 UTC (rev 3675) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteVote.java 2012-09-04 16:32:29 UTC (rev 3676) @@ -71,12 +71,18 @@ addFlashMessage(_("pollen.information.vote.deleted")); - if (poll.isPollFree() && - getUserSecurityContext().isWithAccountId() && - !getUserSecurityContext().isCreator()) { + if (poll.isPollFree() && getUserSecurityContext().isWithAccountId()){ - // remove accountId from url, voter does no longer exists. - getPollUri().setAccountId(null); + // must remove accountId from url if not creator accountId + + String userAccountId = getUserSecurityContext().getAccountId(); + String creatorId = getUserSecurityContext().getPoll().getCreator().getAccountId(); + + if (!creatorId.equals(userAccountId)) { + + // remove accountId from url, the accountId does no longer exists. + getPollUri().setAccountId(null); + } } return SUCCESS; }

1 0

r3675 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: tchemit Date: 2012-09-04 18:17:33 +0200 (Tue, 04 Sep 2012) New Revision: 3675 Url: http://chorem.org/repositories/revision/pollen/3675 Log: fixes #802: Cannot delete my vote (does not work if poll can not have comments) Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-09-04 16:00:18 UTC (rev 3674) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-09-04 16:17:33 UTC (rev 3675) @@ -462,9 +462,9 @@ </div> - <sj:dialog id="confirmDialog" resizable="false" autoOpen="false" - modal="true" - width="800"/> </div> </s:if> </s:if> + +<sj:dialog id="confirmDialog" resizable="false" autoOpen="false" + modal="true" width="800"/> \ No newline at end of file

1 0

r3674 - in trunk: pollen-persistence/src/main/java/org/chorem/pollen/business/persistence pollen-persistence/src/test/java/org/chorem/pollen/business/persistence pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote
by tchemit＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: tchemit Date: 2012-09-04 18:00:18 +0200 (Tue, 04 Sep 2012) New Revision: 3674 Url: http://chorem.org/repositories/revision/pollen/3674 Log: fixes #801: Unicity of vote id is not correct Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-09-04 15:40:30 UTC (rev 3673) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-09-04 16:00:18 UTC (rev 3674) @@ -65,14 +65,14 @@ return result; } - public boolean hasAlreadyVoted(Poll poll, String votingId) throws TopiaException { + public Vote findVoteByPollAndVotingId(Poll poll, String votingId) throws TopiaException { - String hql = "SELECT COUNT(*) FROM VoteImpl e, PollImpl p WHERE " + + String hql = "SELECT e FROM VoteImpl e, PollImpl p WHERE " + "p = :p AND " + "e in elements(p.vote) AND " + "e.pollAccount.votingId = :v"; - boolean result = existsByQuery(hql, "p", poll, "v", votingId); + Vote result = findByQuery(Vote.class, hql, "p", poll, "v", votingId); return result; } Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java 2012-09-04 15:40:30 UTC (rev 3673) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java 2012-09-04 16:00:18 UTC (rev 3674) @@ -128,7 +128,7 @@ } @Test - public void hasAlreadyVoted() throws Exception { + public void findVoteByPollAndVotingId() throws Exception { TopiaContext tx = beginTransaction(); @@ -158,16 +158,16 @@ tx.commitTransaction(); - boolean actual; - actual = voteDAO.hasAlreadyVoted(poll1, votingId1); - Assert.assertTrue(actual); - actual = voteDAO.hasAlreadyVoted(poll2, votingId1); - Assert.assertFalse(actual); + Vote actual; + actual = voteDAO.findVoteByPollAndVotingId(poll1, votingId1); + Assert.assertNotNull(actual); + actual = voteDAO.findVoteByPollAndVotingId(poll2, votingId1); + Assert.assertNull(actual); - actual = voteDAO.hasAlreadyVoted(poll1, votingId2); - Assert.assertFalse(actual); - actual = voteDAO.hasAlreadyVoted(poll2, votingId2); - Assert.assertTrue(actual); + actual = voteDAO.findVoteByPollAndVotingId(poll1, votingId2); + Assert.assertNull(actual); + actual = voteDAO.findVoteByPollAndVotingId(poll2, votingId2); + Assert.assertNotNull(actual); } @Test Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-09-04 15:40:30 UTC (rev 3673) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-09-04 16:00:18 UTC (rev 3674) @@ -364,10 +364,23 @@ } } - public boolean hasAlreadyVoted(Poll poll, String votingId) { + public boolean isVotingIdFree(Poll poll, + String pollAccountId, + String votingId) { try { VoteDAO dao = getDAO(Vote.class); - boolean result = dao.hasAlreadyVoted(poll, votingId); + Vote existingVote = dao.findVoteByPollAndVotingId(poll, votingId); + boolean result; + if (existingVote == null) { + // no such vote + // votingId is free + result = true; + } else { + + // there is a vote using this votingId + // votingId is free only if the pollAccount is the incoming one + result = existingVote.getPollAccount().getTopiaId().equals(pollAccountId); + } return result; } catch (Exception e) { throw new PollenTechnicalException( Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java 2012-09-04 15:40:30 UTC (rev 3673) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java 2012-09-04 16:00:18 UTC (rev 3674) @@ -98,9 +98,8 @@ _("pollen.error.pollAccount.votingId.required")); } - // check if the new pollAccount (topiaId = null) has already voted - if (pollAccount.getTopiaId() == null && - getVoteService().hasAlreadyVoted(poll, name)) { + // check if the votingId is available + if (!getVoteService().isVotingIdFree(poll, pollAccount.getTopiaId(),name)) { addFieldError("pollAccount.votingId", _("pollen.error.user.alreadyVoted", name)); }

1 0