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

r3786 - in trunk: . pollen-ui-struts2/src/main/assembly/dist
by tchemit＠users.chorem.org 29 Apr '13

29 Apr '13

Author: tchemit Date: 2013-04-29 21:01:09 +0200 (Mon, 29 Apr 2013) New Revision: 3786 Url: http://chorem.org/projects/pollen/repository/revisions/3786 Log: refs #908: Updates nuiton-web to 1.13 fixes #907: Pollen does not start well via the embedded version of it Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh trunk/pom.xml Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2013-04-29 09:15:35 UTC (rev 3785) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2013-04-29 19:01:09 UTC (rev 3786) @@ -20,7 +20,7 @@ :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 +java.exe "%POLLEN_OPTS%" -jar pollen-${project.version}-embedded.war --path /home; %1 %2 %3 %4 %5 %6 %7 %8 %9 GOTO end :end Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2013-04-29 09:15:35 UTC (rev 3785) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2013-04-29 19:01:09 UTC (rev 3786) @@ -13,5 +13,5 @@ cd `dirname $0` CURRENTPWD=`pwd` POLLEN_OPTS="$JAVA_OPTS -Xms512m -Xmx1024m -Dpollen.log.dir=$CURRENTPWD/logs" -java $POLLEN_OPTS -jar pollen-${project.version}-embedded.war $* +java $POLLEN_OPTS -jar pollen-${project.version}-embedded.war --path /home; $* cd "$OLDPWD" \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) +++ trunk/pom.xml 2013-04-29 19:01:09 UTC (rev 3786) @@ -152,7 +152,7 @@ <eugenePluginVersion>2.6.1</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> + <nuitonWebVersion>1.13-SNAPSHOT</nuitonWebVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.171</h2Version> <postgresqlVersion>9.2-1002-jdbc4</postgresqlVersion>

1 0

r3785 - 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 maven-release＠users.chorem.org 29 Apr '13

29 Apr '13

Author: maven-release Date: 2013-04-29 11:15:35 +0200 (Mon, 29 Apr 2013) New Revision: 3785 Url: http://chorem.org/projects/pollen/repository/revisions/3785 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 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-persistence/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-services/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-ui-struts2/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-aggregator/pom.xml =================================================================== --- trunk/pollen-votecounting-aggregator/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-aggregator/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-api/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-borda/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-borda/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-condorcet/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-condorcet/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-coombs/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-coombs/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-instant-runoff/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-instant-runoff/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-normal/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-normal/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-number/pom.xml =================================================================== --- trunk/pollen-votecounting-number/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-number/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-percentage/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-percentage/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> <modules> <module>pollen-votecounting-api</module> @@ -535,11 +535,11 @@ </build> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.2</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.2 + scm:svn:http://svn.chorem.org/svn/pollen/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.5.2</url> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0

r3784 - in tags: . pollen-1.5.2
by maven-release＠users.chorem.org 29 Apr '13

29 Apr '13

Author: maven-release Date: 2013-04-29 11:15:33 +0200 (Mon, 29 Apr 2013) New Revision: 3784 Url: http://chorem.org/projects/pollen/repository/revisions/3784 Log: [maven-release-plugin] copy for tag pollen-1.5.2 Added: tags/pollen-1.5.2/ Property changes on: tags/pollen-1.5.2 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea atlassian-ide-plugin.xml Added: svn:mergeinfo +

1 0

r3783 - 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 maven-release＠users.chorem.org 29 Apr '13

29 Apr '13

Author: maven-release Date: 2013-04-29 11:15:31 +0200 (Mon, 29 Apr 2013) New Revision: 3783 Url: http://chorem.org/projects/pollen/repository/revisions/3783 Log: [maven-release-plugin] prepare release pollen-1.5.2 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 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-persistence/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-services/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-ui-struts2/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-aggregator/pom.xml =================================================================== --- trunk/pollen-votecounting-aggregator/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-aggregator/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-api/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-borda/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-borda/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-condorcet/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-condorcet/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-coombs/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-coombs/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-instant-runoff/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-instant-runoff/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-normal/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-normal/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-number/pom.xml =================================================================== --- trunk/pollen-votecounting-number/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-number/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-percentage/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-percentage/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> <modules> <module>pollen-votecounting-api</module> @@ -535,11 +535,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.2</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.2 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.5.2</url> </scm> <distributionManagement>

1 0

r3782 - in trunk: pollen-persistence/src/license pollen-services/src/license pollen-ui-struts2/src/license
by tchemit＠users.chorem.org 29 Apr '13

29 Apr '13

Author: tchemit Date: 2013-04-29 11:05:08 +0200 (Mon, 29 Apr 2013) New Revision: 3782 Url: http://chorem.org/projects/pollen/repository/revisions/3782 Log: update third parties Modified: trunk/pollen-persistence/src/license/THIRD-PARTY.properties trunk/pollen-services/src/license/THIRD-PARTY.properties trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties Modified: trunk/pollen-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-persistence/src/license/THIRD-PARTY.properties 2013-04-29 08:59:51 UTC (rev 3781) +++ trunk/pollen-persistence/src/license/THIRD-PARTY.properties 2013-04-29 09:05:08 UTC (rev 3782) @@ -1,27 +1,30 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache License 2.0 # - BSD License -# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Common Public License Version 1.0 # - GNU Affero General Public License version 3 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License, version 2.1 +# - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 -# - Similar to Apache License but with the acknowledgment clause removed +# - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - The MIT License # - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Apr 13 19:35:55 CEST 2012 -antlr--antlr--2.7.6=BSD License +#Mon Apr 29 11:02:34 CEST 2013 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Modified: trunk/pollen-services/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-services/src/license/THIRD-PARTY.properties 2013-04-29 08:59:51 UTC (rev 3781) +++ trunk/pollen-services/src/license/THIRD-PARTY.properties 2013-04-29 09:05:08 UTC (rev 3782) @@ -1,12 +1,15 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache License 2.0 # - BSD License -# - BSD style # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Common Public License Version 1.0 # - GNU Affero General Public License version 3 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License, version 2.1 # - GNU Library or Lesser General Public License # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 @@ -15,7 +18,7 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 -# - Similar to Apache License but with the acknowledgment clause removed +# - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - license.txt @@ -23,11 +26,9 @@ # Please fill the missing licenses for dependencies : # # -#Wed Jun 06 13:16:20 CEST 2012 -antlr--antlr--2.7.6=BSD License +#Mon Apr 29 11:02:34 CEST 2013 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 jdom--jdom--1.0=The Apache Software License, Version 2.0 rome--rome--1.0=The Apache Software License, Version 2.0 Modified: trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties 2013-04-29 08:59:51 UTC (rev 3781) +++ trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties 2013-04-29 09:05:08 UTC (rev 3782) @@ -2,17 +2,20 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License +# - Apache License 2.0 # - Apache Software License - Version 2.0 # - BSD License -# - BSD style # - BSD-style license # - Bouncy Castle License # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 # - GNU Affero General Public License version 3 +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public Licence +# - GNU Lesser General Public License, version 2.1 # - GNU Library or Lesser General Public License # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 @@ -23,8 +26,8 @@ # - MIT License # - MPL 1.1 # - Mozilla Public License -# - Mozilla Public License version 1.1 -# - Similar to Apache License but with the acknowledgment clause removed +# - Mozilla Public License version 2.0 +# - New BSD License # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 @@ -35,13 +38,11 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jun 19 18:14:05 CEST 2012 -antlr--antlr--2.7.6=BSD License +#Mon Apr 29 11:02:35 CEST 2013 cglib--cglib-nodep--2.1_3=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 jdom--jdom--1.0=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 rome--rome--1.0=The Apache Software License, Version 2.0

1 0

r3781 - in trunk: . pollen-ui-struts2
by tchemit＠users.chorem.org 29 Apr '13

29 Apr '13

Author: tchemit Date: 2013-04-29 10:59:51 +0200 (Mon, 29 Apr 2013) New Revision: 3781 Url: http://chorem.org/projects/pollen/repository/revisions/3781 Log: fixes #906: Updates postgresql to 9.2-1002-jdbc4 Modified: trunk/pollen-ui-struts2/pom.xml trunk/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2013-04-28 20:27:51 UTC (rev 3780) +++ trunk/pollen-ui-struts2/pom.xml 2013-04-29 08:59:51 UTC (rev 3781) @@ -204,7 +204,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>runtime</scope> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-28 20:27:51 UTC (rev 3780) +++ trunk/pom.xml 2013-04-29 08:59:51 UTC (rev 3781) @@ -155,7 +155,7 @@ <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.171</h2Version> - <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> + <postgresqlVersion>9.2-1002-jdbc4</postgresqlVersion> <struts2Version>2.3.12</struts2Version> <jqueryPluginVersion>3.5.1</jqueryPluginVersion> <shiroVersion>1.2.1</shiroVersion> @@ -203,7 +203,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <version>${postgresqlVersion}</version> </dependency>

1 0

r3780 - trunk
by tchemit＠users.chorem.org 28 Apr '13

28 Apr '13

Author: tchemit Date: 2013-04-28 22:27:51 +0200 (Sun, 28 Apr 2013) New Revision: 3780 Url: http://chorem.org/projects/pollen/repository/revisions/3780 Log: fixes #905: Updates topia to 2.8-rc-1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-28 19:54:45 UTC (rev 3779) +++ trunk/pom.xml 2013-04-28 20:27:51 UTC (rev 3780) @@ -148,7 +148,7 @@ <projectId>pollen</projectId>  - <topiaVersion>2.8-rc-1-SNAPSHOT</topiaVersion> + <topiaVersion>2.8-rc-1</topiaVersion> <eugenePluginVersion>2.6.1</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion>

1 0

r3779 - trunk
by tchemit＠users.chorem.org 28 Apr '13

28 Apr '13

Author: tchemit Date: 2013-04-28 21:54:45 +0200 (Sun, 28 Apr 2013) New Revision: 3779 Url: http://chorem.org/projects/pollen/repository/revisions/3779 Log: updates Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-28 19:49:07 UTC (rev 3778) +++ trunk/pom.xml 2013-04-28 19:54:45 UTC (rev 3779) @@ -159,9 +159,9 @@ <struts2Version>2.3.12</struts2Version> <jqueryPluginVersion>3.5.1</jqueryPluginVersion> <shiroVersion>1.2.1</shiroVersion> - <slf4jVersion>1.7.3</slf4jVersion> + <slf4jVersion>1.7.5</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> - <hibernateVersion>4.2.0.Final</hibernateVersion> + <hibernateVersion>4.2.1.Final</hibernateVersion> <seleniumVersion>2.28.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion>

1 0

r3778 - trunk
by tchemit＠users.chorem.org 28 Apr '13

28 Apr '13

Author: tchemit Date: 2013-04-28 21:49:07 +0200 (Sun, 28 Apr 2013) New Revision: 3778 Url: http://chorem.org/projects/pollen/repository/revisions/3778 Log: fixes #900: updates nuiton-utils to 2.6.12 fixes #904: Updates mavenpom to 3.4.10 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-28 19:08:18 UTC (rev 3777) +++ trunk/pom.xml 2013-04-28 19:49:07 UTC (rev 3778) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.7</version> + <version>3.4.10</version> </parent> <groupId>org.chorem</groupId> @@ -153,7 +153,7 @@ <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> - <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.171</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.12</struts2Version> @@ -173,6 +173,10 @@ <locales>en,fr</locales> <scmwebeditorEnabled>true</scmwebeditorEnabled> +  +  </properties> <dependencyManagement>

1 0

r3777 - in trunk/pollen-ui-struts2/src/main/webapp: WEB-INF/decorators WEB-INF/jsp/poll js
by tchemit＠users.chorem.org 28 Apr '13

28 Apr '13

Author: tchemit Date: 2013-04-28 21:08:18 +0200 (Sun, 28 Apr 2013) New Revision: 3777 Url: http://chorem.org/projects/pollen/repository/revisions/3777 Log: refs #894: Can not create or edit a poll while using IE9 Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js trunk/pollen-ui-struts2/src/main/webapp/js/jquery.lightbox-0.5.js Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2013-04-23 21:33:56 UTC (rev 3776) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2013-04-28 19:08:18 UTC (rev 3777) @@ -70,8 +70,6 @@ $(document).one('mousemove', function() { function KMe(node, attrName, pattern) { var attr = node.attr(attrName).replace( pattern + '\/', ''); - //console.info("Unlock " + pattern + " " + node.attr('id') + - // " - " + attrName + " = " + attr); node.attr(attrName, attr); node.removeClass(pattern); } Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2013-04-23 21:33:56 UTC (rev 3776) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2013-04-28 19:08:18 UTC (rev 3777) @@ -74,7 +74,6 @@ function displayVoteCountingHelp(type) { var help= $(document).data('voteCountingTypeHelp'); - console.info("Change vct to "+type+" : "+help[type]); $('#voteCountingHelp').html(help[type]); } $('[name="poll.voteCountingType"]').change(function () { @@ -385,7 +384,6 @@ var item = $(ui.item); var container = item.data('choiceType'); var choiceNumber = item.data('choiceNumber'); - //console.info('Moved ' + container + ' -- ' + choiceNumber); reorder(container); } }); Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2013-04-23 21:33:56 UTC (rev 3776) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2013-04-28 19:08:18 UTC (rev 3777) @@ -386,35 +386,6 @@ function updateUpdownActions(containerId) { reorder(containerId); - /*var firstChoice = getFirstChoice(containerId); - var lastChoice = getLastChoice(containerId); - - getAllChoices(containerId).each(function (index) { - - var currentChoiceNumber = $(this).data('choiceNumber'); - - var labelWidget = $('#' + containerId + "_label_" + currentChoiceNumber); - labelWidget.html(datas['choiceText'] + ' ' + (index + 1)); - - var upWidget = $('#' + containerId + "_up_" + currentChoiceNumber); - if (firstChoice == currentChoiceNumber) { - // hide up - upWidget.addClass('hidden'); - } else { - //show up - upWidget.removeClass('hidden'); - } - - var downWidget = $('#' + containerId + "_down_" + currentChoiceNumber); - if (lastChoice == currentChoiceNumber) { - // hide down - downWidget.addClass('hidden'); - } else { - //show down - downWidget.removeClass('hidden'); - } - });*/ - } function loadChoice(containerId, choicePrefix, url, choiceNumber, nbChoices, tokenId) { @@ -504,78 +475,6 @@ return false; } -/*function upChoice(choiceId) { - var choice = $('#' + choiceId); - var choicePrefix = choice.data('choicePrefix'); - var choiceNumber = choice.data('choiceNumber'); - var newChoiceNumber = (choiceNumber - 1); - - return switchChoices(choicePrefix, choiceNumber, newChoiceNumber); -} - -function downChoice(choiceId) { - var choice = $('#' + choiceId); - var choicePrefix = choice.data('choicePrefix'); - var choiceNumber = choice.data('choiceNumber'); - var newChoiceNumber = (choiceNumber + 1); - - return switchChoices(choicePrefix, choiceNumber, newChoiceNumber); -}*/ - -/*function switchChoices(choicePrefix, choiceNumber, newChoiceNumber) { - - // change topiaId - switchValue(choicePrefix, choiceNumber, newChoiceNumber, '.topiaId'); - // change description - switchValue(choicePrefix, choiceNumber, newChoiceNumber, '.description'); - - // change name - switchValue(choicePrefix, choiceNumber, newChoiceNumber, '.name'); - - if ('imageChoice_' == choicePrefix) { - - // change location - switchValue(choicePrefix, choiceNumber, newChoiceNumber, '.location'); - - // change thumb - switchThumb(choicePrefix, choiceNumber, newChoiceNumber); - } - return false; -} - -function switchValue(choicePrefix, choiceNumber, newChoiceNumber, suffix) { - var choiceTI = $('[name="' + choicePrefix + choiceNumber + suffix + '"]'); - var choiceTIVal = choiceTI.val(); - var newChoiceTI = $('[name="' + choicePrefix + newChoiceNumber + suffix + '"]'); - var newChoiceTIVal = newChoiceTI.val(); - //console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); - choiceTI.val(newChoiceTIVal); - newChoiceTI.val(choiceTIVal); -} - -function switchThumb(choicePrefix, choiceNumber, newChoiceNumber) { - var choiceTI = $('[name="' + choicePrefix + choiceNumber + '.thumb"]'); - var newChoiceTI = $('[name="' + choicePrefix + newChoiceNumber + '.thumb"]'); - - var choiceTIVal = choiceTI.attr("alt"); - var newChoiceTIVal = newChoiceTI.attr("alt"); - //console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); - choiceTI.attr("alt", newChoiceTIVal); - newChoiceTI.attr("alt", choiceTIVal); - - choiceTIVal = choiceTI.attr("title"); - newChoiceTIVal = newChoiceTI.attr("title"); - //console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); - choiceTI.attr("title", newChoiceTIVal); - newChoiceTI.attr("title", choiceTIVal); - - choiceTIVal = choiceTI.attr("src"); - newChoiceTIVal = newChoiceTI.attr("src"); - //console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); - choiceTI.attr("src", newChoiceTIVal); - newChoiceTI.attr("src", choiceTIVal); -}*/ - function confirmClose() { $('.ui-dialog-title').html(datas['confirmCloseTitle']); var dialog = $("#confirmDialog"); Modified: trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2013-04-23 21:33:56 UTC (rev 3776) +++ trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2013-04-28 19:08:18 UTC (rev 3777) @@ -88,13 +88,6 @@ return result; }, -// addAddRowTopic:function (gridId, url) { -// $.subscribe(gridId + '-rowAdd', function (event) { -// var url = event.data.url; -// window.location = url; -// }, {id:gridId, url:url}); -// }, - addSingleRowTopic:function (gridId, action, url, parameterName) { $.subscribe(gridId + '-row' + action, function (event) { var gridId = event.data.id; Modified: trunk/pollen-ui-struts2/src/main/webapp/js/jquery.lightbox-0.5.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/jquery.lightbox-0.5.js 2013-04-23 21:33:56 UTC (rev 3776) +++ trunk/pollen-ui-struts2/src/main/webapp/js/jquery.lightbox-0.5.js 2013-04-28 19:08:18 UTC (rev 3777) @@ -194,8 +194,8 @@ objImagePreloader.onload=function(){}; }; objImagePreloader.src = settings.imageArray[settings.activeImage][0]; - }; - /** + } + /** * Perfomance an effect in the image container resizing it * * @param integer intImageWidth The image�s width that will be showed @@ -222,8 +222,8 @@ } $('#lightbox-container-image-data-box').css({ width: intImageWidth }); $('#lightbox-nav-btnPrev,#lightbox-nav-btnNext').css({ height: intImageHeight + (settings.containerBorderSize * 2) }); - }; - /** + } + /** * Show the prepared image * */ @@ -234,8 +234,8 @@ _set_navigation(); }); _preload_neighbor_images(); - }; - /** + } + /** * Show the image information * */ @@ -436,8 +436,8 @@ } arrayPageSize = new Array(pageWidth,pageHeight,windowWidth,windowHeight); return arrayPageSize; - }; - /** + } + /** / THIRD FUNCTION * getPageScroll() by quirksmode.com * @@ -457,8 +457,8 @@ } arrayPageScroll = new Array(xScroll,yScroll); return arrayPageScroll; - }; - /** + } + /** * Stop the code execution from a escified time in milisecond * */ @@ -467,8 +467,8 @@ curDate = null; do { var curDate = new Date(); } while ( curDate - date < ms); - }; - // Return the jQuery object for chaining. The unbind method is used to avoid click conflict when the plugin is called more than once + } + // Return the jQuery object for chaining. The unbind method is used to avoid click conflict when the plugin is called more than once return this.unbind('click').click(_initialize); }; })(jQuery); // Call and execute the function immediately passing the jQuery object \ No newline at end of file

1 0