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

r3733 - trunk
by tchemit＠users.chorem.org Oct. 30, 2012

Oct. 30, 2012

Author: tchemit Date: 2012-10-30 08:45:37 +0100 (Tue, 30 Oct 2012) New Revision: 3733 Url: http://chorem.org/repositories/revision/pollen/3733 Log: Update mavenpom4redmine to 3.4.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-29 14:46:09 UTC (rev 3732) +++ trunk/pom.xml 2012-10-30 07:45:37 UTC (rev 3733) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.2</version> + <version>3.4.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r3732 - in trunk: . 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 Oct. 29, 2012

Oct. 29, 2012

Author: tchemit Date: 2012-10-29 15:46:09 +0100 (Mon, 29 Oct 2012) New Revision: 3732 Url: http://chorem.org/repositories/revision/pollen/3732 Log: bumb version to 1.5.1-SNAPSHOT Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-aggregator/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-borda/pom.xml trunk/pollen-votecounting-condorcet/pom.xml trunk/pollen-votecounting-coombs/pom.xml trunk/pollen-votecounting-instant-runoff/pom.xml trunk/pollen-votecounting-normal/pom.xml trunk/pollen-votecounting-number/pom.xml trunk/pollen-votecounting-percentage/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-10-29 14:40:40 UTC (rev 3731) +++ trunk/pollen-persistence/pom.xml 2012-10-29 14:46:09 UTC (rev 3732) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-10-29 14:40:40 UTC (rev 3731) +++ trunk/pollen-services/pom.xml 2012-10-29 14:46:09 UTC (rev 3732) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-10-29 14:40:40 UTC (rev 3731) +++ trunk/pollen-ui-struts2/pom.xml 2012-10-29 14:46:09 UTC (rev 3732) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-aggregator/pom.xml =================================================================== --- trunk/pollen-votecounting-aggregator/pom.xml 2012-10-29 14:40:40 UTC (rev 3731) +++ trunk/pollen-votecounting-aggregator/pom.xml 2012-10-29 14:46:09 UTC (rev 3732) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-10-29 14:40:40 UTC (rev 3731) +++ trunk/pollen-votecounting-api/pom.xml 2012-10-29 14:46:09 UTC (rev 3732) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-borda/pom.xml 2012-10-29 14:40:40 UTC (rev 3731) +++ trunk/pollen-votecounting-borda/pom.xml 2012-10-29 14:46:09 UTC (rev 3732) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-condorcet/pom.xml 2012-10-29 14:40:40 UTC (rev 3731) +++ trunk/pollen-votecounting-condorcet/pom.xml 2012-10-29 14:46:09 UTC (rev 3732) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-coombs/pom.xml 2012-10-29 14:40:40 UTC (rev 3731) +++ trunk/pollen-votecounting-coombs/pom.xml 2012-10-29 14:46:09 UTC (rev 3732) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-instant-runoff/pom.xml 2012-10-29 14:40:40 UTC (rev 3731) +++ trunk/pollen-votecounting-instant-runoff/pom.xml 2012-10-29 14:46:09 UTC (rev 3732) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-normal/pom.xml 2012-10-29 14:40:40 UTC (rev 3731) +++ trunk/pollen-votecounting-normal/pom.xml 2012-10-29 14:46:09 UTC (rev 3732) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-number/pom.xml =================================================================== --- trunk/pollen-votecounting-number/pom.xml 2012-10-29 14:40:40 UTC (rev 3731) +++ trunk/pollen-votecounting-number/pom.xml 2012-10-29 14:46:09 UTC (rev 3732) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-percentage/pom.xml 2012-10-29 14:40:40 UTC (rev 3731) +++ trunk/pollen-votecounting-percentage/pom.xml 2012-10-29 14:46:09 UTC (rev 3732) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-29 14:40:40 UTC (rev 3731) +++ trunk/pom.xml 2012-10-29 14:46:09 UTC (rev 3732) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> <modules> <module>pollen-votecounting-api</module>

1 0

r3731 - trunk/pollen-ui-struts2/src/main/resources
by tchemit＠users.chorem.org Oct. 29, 2012

Oct. 29, 2012

Author: tchemit Date: 2012-10-29 15:40:40 +0100 (Mon, 29 Oct 2012) New Revision: 3731 Url: http://chorem.org/repositories/revision/pollen/3731 Log: fixes #834: Erreur 500 lors de la cr?\195?\169ation d'un sondage portant sur des images Modified: trunk/pollen-ui-struts2/src/main/resources/struts.xml Modified: trunk/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-10-29 10:27:29 UTC (rev 3730) +++ trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-10-29 14:40:40 UTC (rev 3731) @@ -115,8 +115,8 @@ <interceptor-ref name="i18n"/> <interceptor-ref name="checkbox"/> <interceptor-ref name="multiselect"/> + <interceptor-ref name="servletConfig"/> <interceptor-ref name="pollenFileUpload"/> - <interceptor-ref name="servletConfig"/> <interceptor-ref name="pollenUserSecurity"/> <interceptor-ref name="staticParams"/>

1 0

r3730 - trunk/pollen-ui-struts2/src/main/webapp/css
by kmorin＠users.chorem.org Oct. 29, 2012

Oct. 29, 2012

Author: kmorin Date: 2012-10-29 11:27:29 +0100 (Mon, 29 Oct 2012) New Revision: 3730 Url: http://chorem.org/repositories/revision/pollen/3730 Log: add border radius for webkit and all css3 browsers Modified: trunk/pollen-ui-struts2/src/main/webapp/css/main.css trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css trunk/pollen-ui-struts2/src/main/webapp/css/vote.css Modified: trunk/pollen-ui-struts2/src/main/webapp/css/main.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/main.css 2012-10-26 11:45:12 UTC (rev 3729) +++ trunk/pollen-ui-struts2/src/main/webapp/css/main.css 2012-10-29 10:27:29 UTC (rev 3730) @@ -108,7 +108,9 @@ #po-header-connection a:hover, #po-header-connection span:hover { + -webkit-border-radius: 10px; -moz-border-radius: 10px; + border-radius: 10px; background-color: #000; color: #fff; } @@ -159,7 +161,9 @@ } #menu li a:hover { + -webkit-border-radius: 10px; -moz-border-radius: 10px; + border-radius: 10px; background-color: #000; color: #fff; } @@ -203,8 +207,12 @@ margin-top: 0px; background-color: #ff0; border-top: none; + -webkit-border-bottom-right-radius: 15px; + -webkit-border-bottom-left-radius: 15px; -moz-border-radius-bottomright: 15px; -moz-border-radius-bottomleft: 15px; + border-bottom-right-radius: 15px; + border-bottom-left-radius: 15px; padding: 10px; padding-top: 0px; min-width: 140px; @@ -236,8 +244,12 @@ margin-top: 0px; background-color: #32b5c9; border-top: none; + -webkit-border-bottom-right-radius: 15px; + -webkit-border-bottom-left-radius: 15px; -moz-border-radius-bottomright: 15px; -moz-border-radius-bottomleft: 15px; + border-bottom-right-radius: 15px; + border-bottom-left-radius: 15px; padding: 10px; padding-top: 0px; min-width: 140px; @@ -269,8 +281,12 @@ margin-top: 0px; background-color: #55cb00; border-top: none; + -webkit-border-bottom-right-radius: 15px; + -webkit-border-bottom-left-radius: 15px; -moz-border-radius-bottomright: 15px; -moz-border-radius-bottomleft: 15px; + border-bottom-right-radius: 15px; + border-bottom-left-radius: 15px; padding: 10px; padding-top: 0px; min-width: 140px; @@ -302,8 +318,12 @@ margin-top: 0px; background-color: #ff1920; border-top: none; + -webkit-border-bottom-right-radius: 15px; + -webkit-border-bottom-left-radius: 15px; -moz-border-radius-bottomright: 15px; -moz-border-radius-bottomleft: 15px; + border-bottom-right-radius: 15px; + border-bottom-left-radius: 15px; padding: 10px; padding-top: 0px; min-width: 140px; Modified: trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-10-26 11:45:12 UTC (rev 3729) +++ trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-10-29 10:27:29 UTC (rev 3730) @@ -52,7 +52,9 @@ #pollCreationZone { width: 550px; margin: auto; - -moz-border-radius: 15px; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } legend { @@ -120,14 +122,18 @@ #listsCreationFormDiv .currentGroupDiv { background-color: #d0d0ff; - padding: 5px; - -moz-border-radius: 3px; + padding: 5px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } #listsCreationFormDiv .groupTitleDiv { background-color: #32b5c9; - padding: 3px; - -moz-border-radius: 3px; + padding: 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } #listsCreationFormDiv .cmd { Modified: trunk/pollen-ui-struts2/src/main/webapp/css/vote.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-10-26 11:45:12 UTC (rev 3729) +++ trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-10-29 10:27:29 UTC (rev 3730) @@ -23,7 +23,9 @@ #pollZone { /*padding: 10px;*/ text-align: center; + -webkit-border-radius: 15px; -moz-border-radius: 15px; + border-radius: 15px; } #pollZone form {

1 0

r3729 - trunk
by tchemit＠users.chorem.org Oct. 26, 2012

Oct. 26, 2012

Author: tchemit Date: 2012-10-26 13:45:12 +0200 (Fri, 26 Oct 2012) New Revision: 3729 Url: http://chorem.org/repositories/revision/pollen/3729 Log: Update mavenpom4redmine to 3.4.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-13 07:20:02 UTC (rev 3728) +++ trunk/pom.xml 2012-10-26 11:45:12 UTC (rev 3729) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4</version> + <version>3.4.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r3728 - in trunk: . 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 Oct. 13, 2012

Oct. 13, 2012

Author: tchemit Date: 2012-10-13 09:20:02 +0200 (Sat, 13 Oct 2012) New Revision: 3728 Url: http://chorem.org/repositories/revision/pollen/3728 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-aggregator/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-borda/pom.xml trunk/pollen-votecounting-condorcet/pom.xml trunk/pollen-votecounting-coombs/pom.xml trunk/pollen-votecounting-instant-runoff/pom.xml trunk/pollen-votecounting-normal/pom.xml trunk/pollen-votecounting-number/pom.xml trunk/pollen-votecounting-percentage/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-10-13 07:19:59 UTC (rev 3727) +++ trunk/pollen-persistence/pom.xml 2012-10-13 07:20:02 UTC (rev 3728) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-10-13 07:19:59 UTC (rev 3727) +++ trunk/pollen-services/pom.xml 2012-10-13 07:20:02 UTC (rev 3728) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-10-13 07:19:59 UTC (rev 3727) +++ trunk/pollen-ui-struts2/pom.xml 2012-10-13 07:20:02 UTC (rev 3728) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-aggregator/pom.xml =================================================================== --- trunk/pollen-votecounting-aggregator/pom.xml 2012-10-13 07:19:59 UTC (rev 3727) +++ trunk/pollen-votecounting-aggregator/pom.xml 2012-10-13 07:20:02 UTC (rev 3728) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-10-13 07:19:59 UTC (rev 3727) +++ trunk/pollen-votecounting-api/pom.xml 2012-10-13 07:20:02 UTC (rev 3728) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-borda/pom.xml 2012-10-13 07:19:59 UTC (rev 3727) +++ trunk/pollen-votecounting-borda/pom.xml 2012-10-13 07:20:02 UTC (rev 3728) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-condorcet/pom.xml 2012-10-13 07:19:59 UTC (rev 3727) +++ trunk/pollen-votecounting-condorcet/pom.xml 2012-10-13 07:20:02 UTC (rev 3728) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-coombs/pom.xml 2012-10-13 07:19:59 UTC (rev 3727) +++ trunk/pollen-votecounting-coombs/pom.xml 2012-10-13 07:20:02 UTC (rev 3728) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-instant-runoff/pom.xml 2012-10-13 07:19:59 UTC (rev 3727) +++ trunk/pollen-votecounting-instant-runoff/pom.xml 2012-10-13 07:20:02 UTC (rev 3728) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-normal/pom.xml 2012-10-13 07:19:59 UTC (rev 3727) +++ trunk/pollen-votecounting-normal/pom.xml 2012-10-13 07:20:02 UTC (rev 3728) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-number/pom.xml =================================================================== --- trunk/pollen-votecounting-number/pom.xml 2012-10-13 07:19:59 UTC (rev 3727) +++ trunk/pollen-votecounting-number/pom.xml 2012-10-13 07:20:02 UTC (rev 3728) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-percentage/pom.xml 2012-10-13 07:19:59 UTC (rev 3727) +++ trunk/pollen-votecounting-percentage/pom.xml 2012-10-13 07:20:02 UTC (rev 3728) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-13 07:19:59 UTC (rev 3727) +++ trunk/pom.xml 2012-10-13 07:20:02 UTC (rev 3728) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> <modules> <module>pollen-votecounting-api</module> @@ -531,11 +531,11 @@ </build> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.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 + scm:svn:http://svn.chorem.org/svn/pollen/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.5</url> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0

r3727 - in tags: . pollen-1.5
by tchemit＠users.chorem.org Oct. 13, 2012

Oct. 13, 2012

Author: tchemit Date: 2012-10-13 09:19:59 +0200 (Sat, 13 Oct 2012) New Revision: 3727 Url: http://chorem.org/repositories/revision/pollen/3727 Log: [maven-release-plugin] copy for tag pollen-1.5 Added: tags/pollen-1.5/ Property changes on: tags/pollen-1.5 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

r3726 - in trunk: . 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 Oct. 13, 2012

Oct. 13, 2012

Author: tchemit Date: 2012-10-13 09:19:57 +0200 (Sat, 13 Oct 2012) New Revision: 3726 Url: http://chorem.org/repositories/revision/pollen/3726 Log: [maven-release-plugin] prepare release pollen-1.5 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-aggregator/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-borda/pom.xml trunk/pollen-votecounting-condorcet/pom.xml trunk/pollen-votecounting-coombs/pom.xml trunk/pollen-votecounting-instant-runoff/pom.xml trunk/pollen-votecounting-normal/pom.xml trunk/pollen-votecounting-number/pom.xml trunk/pollen-votecounting-percentage/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-10-11 02:51:22 UTC (rev 3725) +++ trunk/pollen-persistence/pom.xml 2012-10-13 07:19:57 UTC (rev 3726) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-10-11 02:51:22 UTC (rev 3725) +++ trunk/pollen-services/pom.xml 2012-10-13 07:19:57 UTC (rev 3726) @@ -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.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-10-11 02:51:22 UTC (rev 3725) +++ trunk/pollen-ui-struts2/pom.xml 2012-10-13 07:19:57 UTC (rev 3726) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-aggregator/pom.xml =================================================================== --- trunk/pollen-votecounting-aggregator/pom.xml 2012-10-11 02:51:22 UTC (rev 3725) +++ trunk/pollen-votecounting-aggregator/pom.xml 2012-10-13 07:19:57 UTC (rev 3726) @@ -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.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-10-11 02:51:22 UTC (rev 3725) +++ trunk/pollen-votecounting-api/pom.xml 2012-10-13 07:19:57 UTC (rev 3726) @@ -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.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-borda/pom.xml 2012-10-11 02:51:22 UTC (rev 3725) +++ trunk/pollen-votecounting-borda/pom.xml 2012-10-13 07:19:57 UTC (rev 3726) @@ -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.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-condorcet/pom.xml 2012-10-11 02:51:22 UTC (rev 3725) +++ trunk/pollen-votecounting-condorcet/pom.xml 2012-10-13 07:19:57 UTC (rev 3726) @@ -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.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-coombs/pom.xml 2012-10-11 02:51:22 UTC (rev 3725) +++ trunk/pollen-votecounting-coombs/pom.xml 2012-10-13 07:19:57 UTC (rev 3726) @@ -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.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-instant-runoff/pom.xml 2012-10-11 02:51:22 UTC (rev 3725) +++ trunk/pollen-votecounting-instant-runoff/pom.xml 2012-10-13 07:19:57 UTC (rev 3726) @@ -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.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-normal/pom.xml 2012-10-11 02:51:22 UTC (rev 3725) +++ trunk/pollen-votecounting-normal/pom.xml 2012-10-13 07:19:57 UTC (rev 3726) @@ -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.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-number/pom.xml =================================================================== --- trunk/pollen-votecounting-number/pom.xml 2012-10-11 02:51:22 UTC (rev 3725) +++ trunk/pollen-votecounting-number/pom.xml 2012-10-13 07:19:57 UTC (rev 3726) @@ -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.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-percentage/pom.xml 2012-10-11 02:51:22 UTC (rev 3725) +++ trunk/pollen-votecounting-percentage/pom.xml 2012-10-13 07:19:57 UTC (rev 3726) @@ -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.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-11 02:51:22 UTC (rev 3725) +++ trunk/pom.xml 2012-10-13 07:19:57 UTC (rev 3726) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> <modules> <module>pollen-votecounting-api</module> @@ -531,11 +531,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</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.5</url> </scm> <distributionManagement>

1 0

r3725 - trunk
by tchemit＠users.chorem.org Oct. 11, 2012

Oct. 11, 2012

Author: tchemit Date: 2012-10-11 04:51:22 +0200 (Thu, 11 Oct 2012) New Revision: 3725 Url: http://chorem.org/repositories/revision/pollen/3725 Log: Update mavenpom4redmine to 3.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-05 17:01:51 UTC (rev 3724) +++ trunk/pom.xml 2012-10-11 02:51:22 UTC (rev 3725) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.8</version> + <version>3.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r3724 - in trunk/pollen-ui-struts2/src/main/assembly: . dist
by tchemit＠users.chorem.org Oct. 5, 2012

Oct. 5, 2012

Author: tchemit Date: 2012-10-05 19:01:51 +0200 (Fri, 05 Oct 2012) New Revision: 3724 Url: http://chorem.org/repositories/revision/pollen/3724 Log: fix embedded application package (no REAMD.txt included + improve launch scripts) Modified: trunk/pollen-ui-struts2/src/main/assembly/bin.xml trunk/pollen-ui-struts2/src/main/assembly/dist/README.txt 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/bin.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/bin.xml 2012-10-05 14:12:32 UTC (rev 3723) +++ trunk/pollen-ui-struts2/src/main/assembly/bin.xml 2012-10-05 17:01:51 UTC (rev 3724) @@ -49,8 +49,10 @@ <fileSet> <directory>src/main/assembly/dist</directory> <outputDirectory>/</outputDirectory> + <filtered>true</filtered> <includes> <include>**/*.properties</include> + <include>**/*.txt</include> </includes> <excludes> <exclude>**/*.sh</exclude> Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/README.txt =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/README.txt 2012-10-05 14:12:32 UTC (rev 3723) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/README.txt 2012-10-05 17:01:51 UTC (rev 3724) @@ -1,18 +1,48 @@ -=========================== Pollen - ${project.version} -=========================== + +First launch +------------ + +To start Pollen: + +- You need to have java installed on your computer (and that's all). +- Then just starts + +./pollen.start (under linux) + +or + +pollen.bat (under windows) + +Default configuration +--------------------- + +In embedded mode, here is the default configuration used: + +- data are stored in a h2 database located in directory data/db +- other resources (images) are stored in directory data/images +- configuration is stored in *pollen.properties* file + +To configure pollen +------------------- + +Just modify the *pollen.properties* file + +For more information about what can be done in this file consult +http://maven-site.chorem.org/pollen/configure.html +http://maven-site.chorem.org/pollen/application-config-report.html + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Premier démarrage ----------------- Pour démarrer Pollen : -- Il faut avoir une JDK d'installer sur la machine cible. +- Il faut avoir java d'installer sur la machine (et c'est tout!) +- Ensuite on lance -- la variable JDK_HOME doit être positionnée dans les variables d'environements. - -En suite on lance - ./pollen.start (sous linux) ou @@ -34,5 +64,6 @@ Il suffit de modifier la configuration dans le fichier pollen.properties -Pour plus d'infromations consulter le site : -http://maven-site.chorem.org/pollen/install.html +Pour plus d'informations consulter le site : +http://maven-site.chorem.org/pollen/fr/configure.html +http://maven-site.chorem.org/pollen/fr/application-config-report.html \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-10-05 14:12:32 UTC (rev 3723) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-10-05 17:01:51 UTC (rev 3724) @@ -1,17 +1,28 @@ - @REM ---------------------------------------------------------------------------- @REM Pollen Start Up Batch script @REM ---------------------------------------------------------------------------- @echo off -set JAVA_COMMAND="java.exe" +java.exe -version -set POLLEN_OPTS="-Xms512m -Xmx1024m -Dpollen.log.dir=./logs" -echo java options used : %POLLEN_OPTS% +IF "%ERRORLEVEL%" == "0" GOTO launch -%JAVA_COMMAND% "%POLLEN_OPTS%" -jar pollen-${project.version}-embedded.war %1 %2 %3 %4 %5 %6 %7 %8 %9 +echo. +echo ERROR: "java.exe" not found. +echo Please install java on your computer. +echo. +GOTO error -pause -cmd /C exit /B %ERROR_CODE% +:error +SET ERROR_CODE=1 +GOTO end +:launch +set POLLEN_OPTS="-Xms512m -Xmx1024m -Dpollen.log.dir=./logs" +java.exe "%POLLEN_OPTS%" -jar pollen-${project.version}-embedded.war %1 %2 %3 %4 %5 %6 %7 %8 %9 +GOTO end + +:end +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-10-05 14:12:32 UTC (rev 3723) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2012-10-05 17:01:51 UTC (rev 3724) @@ -1,10 +1,11 @@ #!/bin/sh + # Test if java exists -java -version 2&> /dev/null +java -version -if [ "$?" = "1" ]; then - echo "Could not find java application, please add it into your PATH" +if [ ! $? -eq 0 ]; then + echo "Do not find java, please install java on your computer" exit 1 fi

1 0