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

r3864 - branches/pollen-1.5.x
by tchemit＠users.chorem.org 23 Dec '13

23 Dec '13

Author: tchemit Date: 2013-12-23 15:05:10 +0100 (Mon, 23 Dec 2013) New Revision: 3864 Url: http://chorem.org/projects/pollen/repository/revisions/3864 Log: fix scm section Modified: branches/pollen-1.5.x/pom.xml Modified: branches/pollen-1.5.x/pom.xml =================================================================== --- branches/pollen-1.5.x/pom.xml 2013-12-23 14:01:20 UTC (rev 3863) +++ branches/pollen-1.5.x/pom.xml 2013-12-23 14:05:10 UTC (rev 3864) @@ -539,11 +539,15 @@ </build> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <connection> + scm:svn:http://svn.chorem.org/svn/pollen/branches/pollen-1.5.x + </connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/branches/pollen-1.5.x </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url> + http://chorem.org/projects/pollen/repository/show/branches/pollen-1.5.x + </url> </scm> <distributionManagement>

1 0

r3863 - tags
by maven-release＠users.chorem.org 23 Dec '13

23 Dec '13

Author: maven-release Date: 2013-12-23 15:01:20 +0100 (Mon, 23 Dec 2013) New Revision: 3863 Url: http://chorem.org/projects/pollen/repository/revisions/3863 Log: bad release tag Removed: tags/pollen-1.5.5/

1 0

r3862 - in branches/pollen-1.5.x: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting-aggregator pollen-votecounting-api pollen-votecounting-borda pollen-votecounting-condorcet pollen-votecounting-coombs pollen-votecounting-instant-runoff pollen-votecounting-normal pollen-votecounting-number pollen-votecounting-percentage
by tchemit＠users.chorem.org 23 Dec '13

23 Dec '13

Author: tchemit Date: 2013-12-23 14:56:18 +0100 (Mon, 23 Dec 2013) New Revision: 3862 Url: http://chorem.org/projects/pollen/repository/revisions/3862 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/pollen-1.5.x/pollen-persistence/pom.xml branches/pollen-1.5.x/pollen-services/pom.xml branches/pollen-1.5.x/pollen-ui-struts2/pom.xml branches/pollen-1.5.x/pollen-votecounting-aggregator/pom.xml branches/pollen-1.5.x/pollen-votecounting-api/pom.xml branches/pollen-1.5.x/pollen-votecounting-borda/pom.xml branches/pollen-1.5.x/pollen-votecounting-condorcet/pom.xml branches/pollen-1.5.x/pollen-votecounting-coombs/pom.xml branches/pollen-1.5.x/pollen-votecounting-instant-runoff/pom.xml branches/pollen-1.5.x/pollen-votecounting-normal/pom.xml branches/pollen-1.5.x/pollen-votecounting-number/pom.xml branches/pollen-1.5.x/pollen-votecounting-percentage/pom.xml branches/pollen-1.5.x/pom.xml Modified: branches/pollen-1.5.x/pollen-persistence/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-persistence/pom.xml 2013-12-23 13:56:15 UTC (rev 3861) +++ branches/pollen-1.5.x/pollen-persistence/pom.xml 2013-12-23 13:56:18 UTC (rev 3862) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5</version> + <version>1.5.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-services/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-services/pom.xml 2013-12-23 13:56:15 UTC (rev 3861) +++ branches/pollen-1.5.x/pollen-services/pom.xml 2013-12-23 13:56:18 UTC (rev 3862) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5</version> + <version>1.5.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-ui-struts2/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/pom.xml 2013-12-23 13:56:15 UTC (rev 3861) +++ branches/pollen-1.5.x/pollen-ui-struts2/pom.xml 2013-12-23 13:56:18 UTC (rev 3862) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5</version> + <version>1.5.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-aggregator/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-aggregator/pom.xml 2013-12-23 13:56:15 UTC (rev 3861) +++ branches/pollen-1.5.x/pollen-votecounting-aggregator/pom.xml 2013-12-23 13:56:18 UTC (rev 3862) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5</version> + <version>1.5.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-api/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-api/pom.xml 2013-12-23 13:56:15 UTC (rev 3861) +++ branches/pollen-1.5.x/pollen-votecounting-api/pom.xml 2013-12-23 13:56:18 UTC (rev 3862) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5</version> + <version>1.5.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-borda/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-borda/pom.xml 2013-12-23 13:56:15 UTC (rev 3861) +++ branches/pollen-1.5.x/pollen-votecounting-borda/pom.xml 2013-12-23 13:56:18 UTC (rev 3862) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5</version> + <version>1.5.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-condorcet/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-condorcet/pom.xml 2013-12-23 13:56:15 UTC (rev 3861) +++ branches/pollen-1.5.x/pollen-votecounting-condorcet/pom.xml 2013-12-23 13:56:18 UTC (rev 3862) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5</version> + <version>1.5.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-coombs/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-coombs/pom.xml 2013-12-23 13:56:15 UTC (rev 3861) +++ branches/pollen-1.5.x/pollen-votecounting-coombs/pom.xml 2013-12-23 13:56:18 UTC (rev 3862) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5</version> + <version>1.5.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-instant-runoff/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-instant-runoff/pom.xml 2013-12-23 13:56:15 UTC (rev 3861) +++ branches/pollen-1.5.x/pollen-votecounting-instant-runoff/pom.xml 2013-12-23 13:56:18 UTC (rev 3862) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5</version> + <version>1.5.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-normal/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-normal/pom.xml 2013-12-23 13:56:15 UTC (rev 3861) +++ branches/pollen-1.5.x/pollen-votecounting-normal/pom.xml 2013-12-23 13:56:18 UTC (rev 3862) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5</version> + <version>1.5.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-number/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-number/pom.xml 2013-12-23 13:56:15 UTC (rev 3861) +++ branches/pollen-1.5.x/pollen-votecounting-number/pom.xml 2013-12-23 13:56:18 UTC (rev 3862) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5</version> + <version>1.5.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-percentage/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-percentage/pom.xml 2013-12-23 13:56:15 UTC (rev 3861) +++ branches/pollen-1.5.x/pollen-votecounting-percentage/pom.xml 2013-12-23 13:56:18 UTC (rev 3862) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5</version> + <version>1.5.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pom.xml =================================================================== --- branches/pollen-1.5.x/pom.xml 2013-12-23 13:56:15 UTC (rev 3861) +++ branches/pollen-1.5.x/pom.xml 2013-12-23 13:56:18 UTC (rev 3862) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5</version> + <version>1.5.6-SNAPSHOT</version> <modules> <module>pollen-votecounting-api</module> @@ -539,11 +539,11 @@ </build> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.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.5.5 + scm:svn:http://svn.chorem.org/svn/pollen/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.5.5</url> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0

r3861 - in tags: . pollen-1.5.5
by tchemit＠users.chorem.org 23 Dec '13

23 Dec '13

Author: tchemit Date: 2013-12-23 14:56:15 +0100 (Mon, 23 Dec 2013) New Revision: 3861 Url: http://chorem.org/projects/pollen/repository/revisions/3861 Log: [maven-release-plugin] copy for tag pollen-1.5.5 Added: tags/pollen-1.5.5/ Property changes on: tags/pollen-1.5.5 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea atlassian-ide-plugin.xml Added: svn:mergeinfo +

1 0

r3860 - in branches/pollen-1.5.x: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting-aggregator pollen-votecounting-api pollen-votecounting-borda pollen-votecounting-condorcet pollen-votecounting-coombs pollen-votecounting-instant-runoff pollen-votecounting-normal pollen-votecounting-number pollen-votecounting-percentage
by tchemit＠users.chorem.org 23 Dec '13

23 Dec '13

Author: tchemit Date: 2013-12-23 14:56:12 +0100 (Mon, 23 Dec 2013) New Revision: 3860 Url: http://chorem.org/projects/pollen/repository/revisions/3860 Log: [maven-release-plugin] prepare release pollen-1.5.5 Modified: branches/pollen-1.5.x/pollen-persistence/pom.xml branches/pollen-1.5.x/pollen-services/pom.xml branches/pollen-1.5.x/pollen-ui-struts2/pom.xml branches/pollen-1.5.x/pollen-votecounting-aggregator/pom.xml branches/pollen-1.5.x/pollen-votecounting-api/pom.xml branches/pollen-1.5.x/pollen-votecounting-borda/pom.xml branches/pollen-1.5.x/pollen-votecounting-condorcet/pom.xml branches/pollen-1.5.x/pollen-votecounting-coombs/pom.xml branches/pollen-1.5.x/pollen-votecounting-instant-runoff/pom.xml branches/pollen-1.5.x/pollen-votecounting-normal/pom.xml branches/pollen-1.5.x/pollen-votecounting-number/pom.xml branches/pollen-1.5.x/pollen-votecounting-percentage/pom.xml branches/pollen-1.5.x/pom.xml Modified: branches/pollen-1.5.x/pollen-persistence/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-persistence/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) +++ branches/pollen-1.5.x/pollen-persistence/pom.xml 2013-12-23 13:56:12 UTC (rev 3860) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-services/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-services/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) +++ branches/pollen-1.5.x/pollen-services/pom.xml 2013-12-23 13:56:12 UTC (rev 3860) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-ui-struts2/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) +++ branches/pollen-1.5.x/pollen-ui-struts2/pom.xml 2013-12-23 13:56:12 UTC (rev 3860) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-aggregator/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-aggregator/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) +++ branches/pollen-1.5.x/pollen-votecounting-aggregator/pom.xml 2013-12-23 13:56:12 UTC (rev 3860) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-api/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-api/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) +++ branches/pollen-1.5.x/pollen-votecounting-api/pom.xml 2013-12-23 13:56:12 UTC (rev 3860) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-borda/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-borda/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) +++ branches/pollen-1.5.x/pollen-votecounting-borda/pom.xml 2013-12-23 13:56:12 UTC (rev 3860) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-condorcet/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-condorcet/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) +++ branches/pollen-1.5.x/pollen-votecounting-condorcet/pom.xml 2013-12-23 13:56:12 UTC (rev 3860) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-coombs/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-coombs/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) +++ branches/pollen-1.5.x/pollen-votecounting-coombs/pom.xml 2013-12-23 13:56:12 UTC (rev 3860) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-instant-runoff/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-instant-runoff/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) +++ branches/pollen-1.5.x/pollen-votecounting-instant-runoff/pom.xml 2013-12-23 13:56:12 UTC (rev 3860) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-normal/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-normal/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) +++ branches/pollen-1.5.x/pollen-votecounting-normal/pom.xml 2013-12-23 13:56:12 UTC (rev 3860) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-number/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-number/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) +++ branches/pollen-1.5.x/pollen-votecounting-number/pom.xml 2013-12-23 13:56:12 UTC (rev 3860) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pollen-votecounting-percentage/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-votecounting-percentage/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) +++ branches/pollen-1.5.x/pollen-votecounting-percentage/pom.xml 2013-12-23 13:56:12 UTC (rev 3860) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.5.x/pom.xml =================================================================== --- branches/pollen-1.5.x/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) +++ branches/pollen-1.5.x/pom.xml 2013-12-23 13:56:12 UTC (rev 3860) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> <modules> <module>pollen-votecounting-api</module> @@ -539,11 +539,11 @@ </build> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.5</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.5 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.5.5</url> </scm> <distributionManagement>

1 0

r3859 - in branches/pollen-1.5.x: . pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2 src/site
by tchemit＠users.chorem.org 23 Dec '13

23 Dec '13

Author: tchemit Date: 2013-12-23 14:44:06 +0100 (Mon, 23 Dec 2013) New Revision: 3859 Url: http://chorem.org/projects/pollen/repository/revisions/3859 Log: fixes #965: Updates mavenpom to 4.4 Modified: branches/pollen-1.5.x/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java branches/pollen-1.5.x/pollen-ui-struts2/pom.xml branches/pollen-1.5.x/pom.xml branches/pollen-1.5.x/src/site/site_en.xml branches/pollen-1.5.x/src/site/site_fr.xml Modified: branches/pollen-1.5.x/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java =================================================================== --- branches/pollen-1.5.x/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2013-12-07 08:00:40 UTC (rev 3858) +++ branches/pollen-1.5.x/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2013-12-23 13:44:06 UTC (rev 3859) @@ -39,6 +39,7 @@ import org.chorem.pollen.services.PollenServiceSupport; import org.nuiton.util.StringUtil; +import java.util.Comparator; import java.util.List; import java.util.Locale; @@ -325,7 +326,7 @@ return new PollenEmail(to, subject, content); } - public static class PollenEmail { + public static class PollenEmail implements Comparable<PollenEmail>{ protected String subject; @@ -351,5 +352,10 @@ public String getTo() { return to; } + + @Override + public int compareTo(PollenEmail o) { + return toString().compareTo(o.toString()); + } } } Modified: branches/pollen-1.5.x/pollen-ui-struts2/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/pom.xml 2013-12-07 08:00:40 UTC (rev 3858) +++ branches/pollen-1.5.x/pollen-ui-struts2/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) @@ -32,6 +32,9 @@ http://localhost:8080/${defaultWebContextPath} </defaultSiteUrl> <defaultLogDir>${basedir}/target</defaultLogDir> + +  + <skipPostRelease>false</skipPostRelease> </properties> <dependencies> Modified: branches/pollen-1.5.x/pom.xml =================================================================== --- branches/pollen-1.5.x/pom.xml 2013-12-07 08:00:40 UTC (rev 3858) +++ branches/pollen-1.5.x/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>4.4</version> </parent> <groupId>org.chorem</groupId> @@ -166,6 +166,8 @@ <seleniumVersion>2.33.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> + <httpCommonsHttpclientVersion>4.3</httpCommonsHttpclientVersion> + <pollenI18nBundle>pollen-i18n</pollenI18nBundle>  <license.licenseName>agpl_v3</license.licenseName> Modified: branches/pollen-1.5.x/src/site/site_en.xml =================================================================== --- branches/pollen-1.5.x/src/site/site_en.xml 2013-12-07 08:00:40 UTC (rev 3858) +++ branches/pollen-1.5.x/src/site/site_en.xml 2013-12-23 13:44:06 UTC (rev 3859) @@ -38,7 +38,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>1.3.1</version> </skin> <custom> @@ -56,34 +56,34 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="http://maven-site.nuiton.org/public/images/logos/logos/maven-feather.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="http://maven-site.nuiton.org/public/images/logos/struts2-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/restructuredtext-logo.…"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="http://maven-site.nuiton.org/public/images/logos/topia-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/argouml-logo.png"/> </poweredBy> <body> <head> <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + src="http://maven-site.chorem.org/common/0.2/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + href="http://maven-site.chorem.org/common/0.2/css/mavenpom-site.css"/> </head> <breadcrumbs> @@ -134,7 +134,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_vmFiles=",install.html," + scmwebeditor_skipDefaultFiles="true"> </div> </footer> Modified: branches/pollen-1.5.x/src/site/site_fr.xml =================================================================== --- branches/pollen-1.5.x/src/site/site_fr.xml 2013-12-07 08:00:40 UTC (rev 3858) +++ branches/pollen-1.5.x/src/site/site_fr.xml 2013-12-23 13:44:06 UTC (rev 3859) @@ -38,7 +38,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>1.3.1</version> </skin> <custom> @@ -59,31 +59,31 @@ img="${project.url}/images/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="http://maven-site.nuiton.org/public/images/logos/struts2-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/restructuredtext-logo.…"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="http://maven-site.nuiton.org/public/images/logos/topia-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/argouml-logo.png"/> </poweredBy> <body> <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + src="http://maven-site.chorem.org/common/0.2/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + href="http://maven-site.chorem.org/common/0.2/css/mavenpom-site.css"/> </head> <breadcrumbs> @@ -130,7 +130,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_vmFiles=",install.html," + scmwebeditor_skipDefaultFiles="true"> </div> </footer>

1 0

r3858 - branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form
by tchemit＠users.chorem.org 07 Dec '13

07 Dec '13

Author: tchemit Date: 2013-12-07 09:00:40 +0100 (Sat, 07 Dec 2013) New Revision: 3858 Url: http://chorem.org/projects/pollen/repository/revisions/3858 Log: fixes #962: You cannot modify the end date if there is a date to add choices Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ClonePoll.java branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/CreatePoll.java branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/EditPoll.java Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java 2013-12-02 13:10:39 UTC (rev 3857) +++ branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java 2013-12-07 08:00:40 UTC (rev 3858) @@ -194,7 +194,7 @@ * * @since 1.3 */ - private Map<Integer, VotingList> votingLists; + Map<Integer, VotingList> votingLists; private PollUri pollUri; @@ -204,6 +204,8 @@ public abstract boolean isEdit(); + protected abstract void validateChoiceDate(Date currentTime); + @Override public void prepare() throws Exception { @@ -528,7 +530,19 @@ } validateInformations(); - validateOptions(); + validateVotingLists(); + + validateCreatorEmail(); + + Date currentTime = serviceContext.getCurrentTime(); + + validateChoiceDate(currentTime); + + validatePollDate(currentTime); + + validateMaxChoices(); + + validateReminderHourCountdown(); } @Override @@ -942,80 +956,43 @@ } } - protected void validateOptions() { - - if (isVoteStarted()) { - - // no validation on votingLists if vote is started - - } else { - - // -- VotingList -- // - - if (poll.isPollFree()) { - - // nothing to validate - - } else { - - Set<String> groups = Sets.newHashSet(); - Set<String> voters = Sets.newHashSet(); - Set<String> emails = Sets.newHashSet(); - - for (Map.Entry<Integer, VotingList> entry : votingLists.entrySet()) { - validateVotingList(entry.getKey(), - entry.getValue(), - groups, - voters, - emails); - } - } - } - - String creatorEmail = poll.getCreator().getEmail(); - if (StringUtils.isNotBlank(creatorEmail) && - !StringUtil.isEmail(creatorEmail)) { - - addOptionsError("poll.creator.email", - _("pollen.error.email.invalid")); - } - - Date currentTime = serviceContext.getCurrentTime(); - - if (validateEndDate(poll.getBeginChoiceDate(), poll.getEndChoiceDate())) { - - addOptionsError( - "poll.endChoiceDate", - _("pollen.error.poll.endChoiceDate.before.beginChoiceDate")); - } - - if (validateEndDate(currentTime, poll.getEndChoiceDate())) { - - addOptionsError( - "poll.endChoiceDate", - _("pollen.error.poll.endChoiceDate.before.now")); - } - + protected void validatePollDate(Date currentTime) { + // --- beginDate < endDate if (validateEndDate(poll.getBeginDate(), poll.getEndDate())) { addOptionsError("poll.endDate", _("pollen.error.poll.endDate.before.beginDate")); } - + // --- currentTime < endDate if (validateEndDate(currentTime, poll.getEndDate())) { addOptionsError( "poll.endDate", _("pollen.error.poll.endDate.before.now")); } + } - if (validateEndDate(poll.getEndChoiceDate(), poll.getEndDate())) { + protected void validateReminderHourCountdown() { + if (isReminder()) { - addOptionsError("poll.endChoiceDate", - _("pollen.error.poll.endChoiceDate.after.endDate")); + // validate reminderHourCountdown + + if (getReminderHourCountdown() == null) { + + // reminderHourCountdown == null + addOptionsError("reminderHourCountdown", + _("pollen.error.poll.reminderHourCountdown.required")); + } else if (getReminderHourCountdown() < 1) { + + // reminderHourCountdown <= 0 + addOptionsError("reminderHourCountdown", + _("pollen.error.poll.reminderHourCountdown.greater.than.0")); + } } + } + protected void validateMaxChoices() { if (isLimitChoice()) { // validate maxChoices @@ -1030,21 +1007,45 @@ _("pollen.error.poll.maxChoice.greater.than.0")); } } + } - if (isReminder()) { + protected void validateCreatorEmail() { + String creatorEmail = poll.getCreator().getEmail(); + if (StringUtils.isNotBlank(creatorEmail) && + !StringUtil.isEmail(creatorEmail)) { - // validate reminderHourCountdown + addOptionsError("poll.creator.email", + _("pollen.error.email.invalid")); + } + } - if (getReminderHourCountdown() == null) { + protected void validateVotingLists() { - // reminderHourCountdown == null - addOptionsError("reminderHourCountdown", - _("pollen.error.poll.reminderHourCountdown.required")); - } else if (getReminderHourCountdown() < 1) { + if (isVoteStarted()) { - // reminderHourCountdown <= 0 - addOptionsError("reminderHourCountdown", - _("pollen.error.poll.reminderHourCountdown.greater.than.0")); + // no validation on votingLists if vote is started + + } else { + + // -- VotingList -- // + + if (poll.isPollFree()) { + + // nothing to validate + + } else { + + Set<String> groups = Sets.newHashSet(); + Set<String> voters = Sets.newHashSet(); + Set<String> emails = Sets.newHashSet(); + + for (Map.Entry<Integer, VotingList> entry : votingLists.entrySet()) { + validateVotingList(entry.getKey(), + entry.getValue(), + groups, + voters, + emails); + } } } } Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ClonePoll.java =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ClonePoll.java 2013-12-02 13:10:39 UTC (rev 3857) +++ branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ClonePoll.java 2013-12-07 08:00:40 UTC (rev 3858) @@ -24,6 +24,8 @@ import org.chorem.pollen.business.persistence.Poll; +import java.util.Date; + /** * Clones a poll. * @@ -51,4 +53,22 @@ return poll; } + @Override + protected void validateChoiceDate(Date currentTime) { + + // --- beginChoicedate < endChoiceDate + if (validateEndDate(poll.getBeginChoiceDate(), poll.getEndChoiceDate())) { + + addOptionsError( + "poll.endChoiceDate", + _("pollen.error.poll.endChoiceDate.before.beginChoiceDate")); + } + + // --- endChoiceDate < endDate + if (validateEndDate(poll.getEndChoiceDate(), poll.getEndDate())) { + + addOptionsError("poll.endChoiceDate", + _("pollen.error.poll.endChoiceDate.after.endDate")); + } + } } Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/CreatePoll.java =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/CreatePoll.java 2013-12-02 13:10:39 UTC (rev 3857) +++ branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/CreatePoll.java 2013-12-07 08:00:40 UTC (rev 3858) @@ -24,6 +24,8 @@ import org.chorem.pollen.business.persistence.Poll; +import java.util.Date; + /** * Creates a poll. * @@ -51,4 +53,30 @@ return poll; } + @Override + protected void validateChoiceDate(Date currentTime ) { + + // --- beginChoicedate < endChoiceDate + if (validateEndDate(poll.getBeginChoiceDate(), poll.getEndChoiceDate())) { + + addOptionsError( + "poll.endChoiceDate", + _("pollen.error.poll.endChoiceDate.before.beginChoiceDate")); + } + + // --- currentTime < endChoiceDate + if (validateEndDate(currentTime, poll.getEndChoiceDate())) { + + addOptionsError( + "poll.endChoiceDate", + _("pollen.error.poll.endChoiceDate.before.now")); + } + + // --- endChoiceDate < endDate + if (validateEndDate(poll.getEndChoiceDate(), poll.getEndDate())) { + + addOptionsError("poll.endChoiceDate", + _("pollen.error.poll.endChoiceDate.after.endDate")); + } + } } Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/EditPoll.java =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/EditPoll.java 2013-12-02 13:10:39 UTC (rev 3857) +++ branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/EditPoll.java 2013-12-07 08:00:40 UTC (rev 3858) @@ -25,6 +25,8 @@ import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.services.exceptions.PollNotFoundException; +import java.util.Date; + /** * Edit a poll (load it via {@link #input()}), and save it * via {@link #execute()}). @@ -55,4 +57,23 @@ return poll; } + @Override + protected void validateChoiceDate(Date currentTime) { + + // --- beginChoicedate < endChoiceDate + if (validateEndDate(poll.getBeginChoiceDate(), poll.getEndChoiceDate())) { + + addOptionsError( + "poll.endChoiceDate", + _("pollen.error.poll.endChoiceDate.before.beginChoiceDate")); + } + + // --- endChoiceDate < endDate + if (validateEndDate(poll.getEndChoiceDate(), poll.getEndDate())) { + + addOptionsError("poll.endChoiceDate", + _("pollen.error.poll.endChoiceDate.after.endDate")); + } + } + }

1 0

r3857 - in branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp: admin user
by tchemit＠users.chorem.org 02 Dec '13

02 Dec '13

Author: tchemit Date: 2013-12-02 14:10:39 +0100 (Mon, 02 Dec 2013) New Revision: 3857 Url: http://chorem.org/projects/pollen/repository/revisions/3857 Log: fixes #961: Can't modify an account Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2013-10-25 15:13:13 UTC (rev 3856) +++ branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2013-12-02 13:10:39 UTC (rev 3857) @@ -123,6 +123,7 @@ label="%{getText('pollen.common.lastName')}" size="40"/> <s:checkbox key="editUser.administrator" label="%{getText('pollen.common.administrator')}"/> + <s:hidden key="editUser.email" label=""/> </fieldset> <br/> <s:submit action="edit" key="pollen.action.validate" align="center"/> Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2013-10-25 15:13:13 UTC (rev 3856) +++ branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2013-12-02 13:10:39 UTC (rev 3857) @@ -52,6 +52,9 @@ key="pollen.common.firstName"/> <s:textfield name="pollenUserAccount.lastName" key="pollen.common.lastName"/> + <s:if test="exists"> + <s:hidden key="pollenUserAccount.email" label=""/> + </s:if> </fieldset> <br/> <s:submit action="edit" key="pollen.action.validate" align="center"/>

1 0

r3856 - trunk/pollen-rest-api
by tchemit＠users.chorem.org 25 Oct '13

25 Oct '13

Author: tchemit Date: 2013-10-25 17:13:13 +0200 (Fri, 25 Oct 2013) New Revision: 3856 Url: http://chorem.org/projects/pollen/repository/revisions/3856 Log: explain how to launch services Modified: trunk/pollen-rest-api/README.txt Modified: trunk/pollen-rest-api/README.txt =================================================================== --- trunk/pollen-rest-api/README.txt 2013-10-21 20:15:23 UTC (rev 3855) +++ trunk/pollen-rest-api/README.txt 2013-10-25 15:13:13 UTC (rev 3856) @@ -0,0 +1,8 @@ +Pour tester les services, lancer mvn tomcat7:run -Ptest + +Une base vierge sera alors créée dans target/pollen + +Les services seront appelables sur http://localhost:8080/pollen/v1 + +Exemple : http://localhost:8080/pollen/v1/polls retourne la liste des +sondages. \ No newline at end of file

1 0

r3855 - branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui
by tchemit＠users.chorem.org 21 Oct '13

21 Oct '13

Author: tchemit Date: 2013-10-21 22:15:23 +0200 (Mon, 21 Oct 2013) New Revision: 3855 Url: http://chorem.org/projects/pollen/repository/revisions/3855 Log: fixes #954: Can't hot-deploy application when using h2 database Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2013-09-13 13:10:21 UTC (rev 3854) +++ branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2013-10-21 20:15:23 UTC (rev 3855) @@ -42,15 +42,22 @@ import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaUtil; import org.nuiton.util.FileUtil; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; +import java.beans.Introspector; import java.io.File; import java.io.IOException; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; import java.util.Date; import java.util.Locale; import java.util.Map; @@ -146,11 +153,16 @@ @Override public void contextDestroyed(ServletContextEvent sce) { - if (log.isInfoEnabled()) { log.info("Application is ending at " + new Date() + "..."); } + // see http://wiki.apache.org/commons/Logging/FrequentlyAskedQuestions#A_memory_le… + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + LogFactory.release(contextClassLoader); + + Introspector.flushCaches(); + ServletContext servletContext = sce.getServletContext(); PollenApplicationContext applicationContext = PollenApplicationContext.get(servletContext); @@ -161,7 +173,7 @@ closePollenNotifierWorker(applicationContext.getPollenNotifierWorker()); // close topia root context to pollen db - closeRootcontext(applicationContext.getRootContext()); + closeRootcontext((TopiaContextImplementor) applicationContext.getRootContext()); } } @@ -230,24 +242,59 @@ } } - private void closeRootcontext(TopiaContext rootContext) { + private void closeRootcontext(TopiaContextImplementor rootContext) { if (rootContext != null) { if (log.isInfoEnabled()) { log.info("Shuting down RootContext... " + rootContext); } - if (!rootContext.isClosed()) { - try { - rootContext.closeContext(); - } catch (TopiaException te) { - if (log.isErrorEnabled()) { - log.error("Could not close rootContext", te); + + String dialectName = (String) rootContext.getConfig().get(TopiaContextFactory.CONFIG_DIALECT); + + try { + if (!rootContext.isClosed()) { + try { + rootContext.closeContext(); + } catch (TopiaException te) { + if (log.isErrorEnabled()) { + log.error("Could not close rootContext", te); + } } } + } finally { + if (dialectName.contains("H2Dialect")) { + try { + releaseH2RootContext(rootContext); + } catch (SQLException e) { + if (log.isErrorEnabled()) { + log.error("Could not shutdown h2 databse", e); + } + } + } } } } + private void releaseH2RootContext(TopiaContext context) throws SQLException { + + TopiaContextImplementor rootContext = ((TopiaContextImplementor) context).getRootContext(); + + String url = (String) rootContext.getConfig().get(TopiaContextFactory.CONFIG_URL); + String login = (String) rootContext.getConfig().get(TopiaContextFactory.CONFIG_USER); + String password = (String) rootContext.getConfig().get(TopiaContextFactory.CONFIG_PASS); + + Connection conn = DriverManager.getConnection(url, login, password); + + try { + Statement statement = conn.createStatement(); + statement.execute("SHUTDOWN;"); + statement.close(); + conn.close(); + } finally { + conn.close(); + } + } + protected void initDB(PollenApplicationContext applicationContext) throws TopiaException { ActionContext context = ActionContext.getContext();

1 0