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

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 13 Oct '12

13 Oct '12

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 11 Oct '12

11 Oct '12

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 05 Oct '12

05 Oct '12

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

r3723 - trunk/pollen-ui-struts2
by tchemit＠users.chorem.org 05 Oct '12

05 Oct '12

Author: tchemit Date: 2012-10-05 16:12:32 +0200 (Fri, 05 Oct 2012) New Revision: 3723 Url: http://chorem.org/repositories/revision/pollen/3723 Log: improve embedded application create process Modified: trunk/pollen-ui-struts2/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-10-01 12:09:56 UTC (rev 3722) +++ trunk/pollen-ui-struts2/pom.xml 2012-10-05 14:12:32 UTC (rev 3723) @@ -399,6 +399,12 @@ <value>true</value> </property> </activation> + <properties> + <embeddedWarName>pollen-${project.version}-embedded</embeddedWarName> + <embeddedTmpWarDir> + ${project.build.directory}/${embeddedWarName}-temp + </embeddedTmpWarDir> + </properties> <build> <defaultGoal>verify</defaultGoal> <plugins> @@ -411,7 +417,7 @@ <phase>generate-resources</phase> <configuration> <target> - <mkdir dir="${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes" /> + <mkdir dir="${embeddedTmpWarDir}/WEB-INF/classes" /> </target> </configuration> <goals> @@ -435,10 +441,10 @@ </goals> <configuration> <generatedClasses> - ${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes + ${embeddedTmpWarDir}/WEB-INF/classes </generatedClasses> <webXmlFragment> - ${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/webfrag.xml + ${embeddedTmpWarDir}/WEB-INF/webfrag.xml </webXmlFragment> <packageRoot>org.apache.jsp</packageRoot> @@ -475,26 +481,24 @@ <artifactId>maven-war-plugin</artifactId> <executions> <execution> - <id>pack</id> + <id>pack-embedded-war</id> <goals> <goal>war</goal> </goals> <configuration> <primaryArtifact>false</primaryArtifact> <webappDirectory> - ${basedir}/target/pollen-embedded-${project.version} + ${project.build.directory}/${embeddedWarName} </webappDirectory> <archive> <manifest> <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> </manifest> </archive> - <warName>pollen-${project.version}-embedded</warName> + <warName>${embeddedWarName}</warName> <webResources> <webResource> - <directory> - target/pollen-embedded-temp-${project.version} - </directory> + <directory>${embeddedTmpWarDir}</directory> <includes> <include>**/*</include> </includes>

1 0

r3722 - trunk
by tchemit＠users.chorem.org 01 Oct '12

01 Oct '12

Author: tchemit Date: 2012-10-01 14:09:56 +0200 (Mon, 01 Oct 2012) New Revision: 3722 Url: http://chorem.org/repositories/revision/pollen/3722 Log: fixes #822: Updates to shiro 1.2.1 fixes #823: Updates to struts2 2.3.4.1 fixes #824: Updates to struts2 jquery 3.3.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-01 11:51:54 UTC (rev 3721) +++ trunk/pom.xml 2012-10-01 12:09:56 UTC (rev 3722) @@ -156,9 +156,9 @@ <nuitonUtilsVersion>2.6.2</nuitonUtilsVersion> <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <struts2Version>2.3.4</struts2Version> - <jqueryPluginVersion>3.3.1</jqueryPluginVersion> - <shiroVersion>1.2.0</shiroVersion> + <struts2Version>2.3.4.1</struts2Version> + <jqueryPluginVersion>3.3.3</jqueryPluginVersion> + <shiroVersion>1.2.1</shiroVersion> <slf4jVersion>1.6.6</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> <hibernateVersion>3.6.10.Final</hibernateVersion>

1 0

r3721 - trunk/pollen-votecounting-api
by tchemit＠users.chorem.org 01 Oct '12

01 Oct '12

Author: tchemit Date: 2012-10-01 13:51:54 +0200 (Mon, 01 Oct 2012) New Revision: 3721 Url: http://chorem.org/repositories/revision/pollen/3721 Log: optimize dependencies Modified: trunk/pollen-votecounting-api/pom.xml Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-10-01 11:48:28 UTC (rev 3720) +++ trunk/pollen-votecounting-api/pom.xml 2012-10-01 11:51:54 UTC (rev 3721) @@ -20,11 +20,6 @@ <dependencies> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency>

1 0

r3720 - trunk
by tchemit＠users.chorem.org 01 Oct '12

01 Oct '12

Author: tchemit Date: 2012-10-01 13:48:28 +0200 (Mon, 01 Oct 2012) New Revision: 3720 Url: http://chorem.org/repositories/revision/pollen/3720 Log: updates to mavenpom 3.3.8 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-01 11:32:38 UTC (rev 3719) +++ trunk/pom.xml 2012-10-01 11:48:28 UTC (rev 3720) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.7</version> + <version>3.3.8</version> </parent> <groupId>org.chorem</groupId>

1 0

r3719 - in trunk: pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote
by tchemit＠users.chorem.org 01 Oct '12

01 Oct '12

Author: tchemit Date: 2012-10-01 13:32:38 +0200 (Mon, 01 Oct 2012) New Revision: 3719 Url: http://chorem.org/repositories/revision/pollen/3719 Log: fixes #805: RSS flux must be disabled or modified with vote visibility Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-10-01 10:52:00 UTC (rev 3718) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-10-01 11:32:38 UTC (rev 3719) @@ -91,13 +91,13 @@ commentCreated.setPollAccount(pollAccountLoaded); } - commitTransaction("Could not create comment (" + comment.getAuthor() + ") " + comment.getText()); - // feed notification PollFeedService pollFeedService = newService(PollFeedService.class); pollFeedService.onCommentAdded(poll, commentCreated); + commitTransaction("Could not create comment (" + comment.getAuthor() + ") " + comment.getText()); + return commentCreated; } catch (TopiaException e) { throw new PollenTechnicalException(e); @@ -119,13 +119,13 @@ dao.delete(comment); - commitTransaction("Could not delete comment " + comment.getText()); - // feed notification PollFeedService pollFeedService = newService(PollFeedService.class); pollFeedService.onCommentDeleted(poll, comment, reason); + commitTransaction("Could not delete comment " + comment.getText()); + } catch (TopiaException e) { throw new PollenTechnicalException(e); } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java 2012-10-01 10:52:00 UTC (rev 3718) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java 2012-10-01 11:32:38 UTC (rev 3719) @@ -22,6 +22,7 @@ */ package org.chorem.pollen.services.impl; +import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.sun.syndication.feed.synd.SyndContent; @@ -33,6 +34,7 @@ import com.sun.syndication.io.SyndFeedInput; import com.sun.syndication.io.SyndFeedOutput; import com.sun.syndication.io.XmlReader; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenTechnicalException; @@ -46,6 +48,8 @@ import java.io.File; import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; import java.io.Writer; import java.util.List; @@ -82,6 +86,25 @@ return result; } + /** + * Obtain the feed file of the given poll. + * + * @param poll poll + * @return the location of the feed of the given poll + */ + public String getFeed(Poll poll) { + + File feedDirectory = getConfiguration().getFeedDirectory(); + String filename = poll.getPollId() + ".xml"; + File feedFile = new File(feedDirectory, filename); + try { + String result = FileUtils.readFileToString(feedFile, Charsets.UTF_8); + return result; + } catch (IOException e) { + throw new PollenTechnicalException("Could not read feed file",e); + } + } + public void onPollCreated(Poll poll) { File file = getFeedLocation(poll); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-10-01 10:52:00 UTC (rev 3718) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-10-01 11:32:38 UTC (rev 3719) @@ -344,18 +344,18 @@ throw new PollenTechnicalException("Can't save votingLists", e); } + // feed notification + // XXX-fdesbois-2012-04-12 : if the feed is the same for everybody maybe + // not publish restricted poll that can't be accessed by everybody + PollFeedService pollFeedService = newService(PollFeedService.class); + pollFeedService.onPollCreated(result); + commitTransaction("Could not create poll " + poll.getTitle()); // email notification EmailService emailService = newService(EmailService.class); emailService.onPollCreated(result); - // feed notification - // XXX-fdesbois-2012-04-12 : if the feed is the same for everybody maybe - // not publish restricted poll that can't be accessed by everybody - PollFeedService pollFeedService = newService(PollFeedService.class); - pollFeedService.onPollCreated(result); - return result; } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-10-01 10:52:00 UTC (rev 3718) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-10-01 11:32:38 UTC (rev 3719) @@ -544,4 +544,25 @@ "from account '" + accountId + "'", e); } } + + public boolean isCanShowFeed(PollenUserSecurityContext userSecurityContext) { + Poll poll = userSecurityContext.getPoll(); + boolean result = newService(PollFeedService.class).isFeedExists(poll); + if (result) { + PollVoteVisibility voteVisibility = poll.getPollVoteVisibility(); + switch (voteVisibility) { + case NOBODY: + case CREATOR_ONLY: + result = userSecurityContext.isAdmin() || userSecurityContext.isCreator(); + break; + case PARTICIPANT_ONLY: + result = userSecurityContext.isVoter() || userSecurityContext.isRestrictedVoter(); + break; + case EVERYBODY: + result = true; + break; + } + } + return result; + } } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-10-01 10:52:00 UTC (rev 3718) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-10-01 11:32:38 UTC (rev 3719) @@ -199,9 +199,10 @@ personToList.setHasVoted(true); } - // regnenerate poll results + // feed notification -// generatePollResult(pollToUpdate); + PollFeedService pollFeedService = newService(PollFeedService.class); + pollFeedService.onVoteAdded(pollToUpdate, result); commitTransaction("Could not create vote"); @@ -209,11 +210,6 @@ PreventRuleService preventRuleService = newService(PreventRuleService.class); preventRuleService.onVoteAdded(poll); - // feed notification - - PollFeedService pollFeedService = newService(PollFeedService.class); - pollFeedService.onVoteAdded(pollToUpdate, result); - return result; } @@ -263,14 +259,13 @@ log.debug("Entity updated: " + result.getTopiaId()); } -// generatePollResult(poll); - - commitTransaction("Could not update vote"); - // feed notification PollFeedService pollFeedService = newService(PollFeedService.class); pollFeedService.onVoteUpdated(poll, result); + + commitTransaction("Could not update vote"); + return result; } @@ -333,14 +328,12 @@ log.debug("Entity deleted: " + voteId); } -// generatePollResult(poll); - - commitTransaction("Could not delete vote"); - // feed notification - PollFeedService pollFeedService = newService(PollFeedService.class); pollFeedService.onVoteDeleted(poll, entityToDelete, voteAccount, reason); + + commitTransaction("Could not delete vote"); + } public List<Vote> getAllVotes(Poll poll) { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java 2012-10-01 10:52:00 UTC (rev 3718) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java 2012-10-01 11:32:38 UTC (rev 3719) @@ -23,11 +23,10 @@ package org.chorem.pollen.ui.actions.poll; import com.google.common.base.Preconditions; +import org.apache.commons.io.IOUtils; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.ui.actions.PollenActionSupport; -import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; /** @@ -65,11 +64,11 @@ Poll poll = getPollService().getExistingPollByPollId(pollId); - File feedLocation = getPollFeedService().getFeedLocation(poll); + String content = getPollFeedService().getFeed(poll); - contentLength = feedLocation.length(); + contentLength = content.length(); - inputStream = new FileInputStream(feedLocation); + inputStream = IOUtils.toInputStream(content); return SUCCESS; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-10-01 10:52:00 UTC (rev 3718) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-10-01 11:32:38 UTC (rev 3719) @@ -246,7 +246,8 @@ choicesById = Maps.uniqueIndex(poll.getChoice(), TopiaId.GET_TOPIA_ID); - feedFileExisting = getPollFeedService().isFeedExists(poll); + feedFileExisting = + getSecurityService().isCanShowFeed(getUserSecurityContext()); PollVoteCountingService voteCountingService = getService(PollVoteCountingService.class); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java 2012-10-01 10:52:00 UTC (rev 3718) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java 2012-10-01 11:32:38 UTC (rev 3719) @@ -441,7 +441,8 @@ comments = getPollCommentService().getAllComments(poll.getPollId()); } - feedFileExisting = getPollFeedService().isFeedExists(poll); + feedFileExisting = + getSecurityService().isCanShowFeed(getUserSecurityContext()); if (log.isDebugEnabled()) { Date now = serviceContext.getCurrentTime();

1 0

r3718 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 01 Oct '12

01 Oct '12

Author: tchemit Date: 2012-10-01 12:52:00 +0200 (Mon, 01 Oct 2012) New Revision: 3718 Url: http://chorem.org/repositories/revision/pollen/3718 Log: fixes #818: Remove export poll feature (for the moment) Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp 2012-10-01 05:56:15 UTC (rev 3717) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp 2012-10-01 10:52:00 UTC (rev 3718) @@ -165,14 +165,14 @@ </div> <%--Export--%> -<div class="ui-widget-content-blue ui-corner-all"> +<%--div class="ui-widget-content-blue ui-corner-all"> <img src="<s:url value='/img/export.png'/>" class="imgAction" alt="<s:text name='pollen.action.exportPoll.help'/>" title="<s:text name='pollen.action.exportPoll.help'/>"/> <s:a href="%{exportUrl}"> <strong><s:text name='pollen.label.pollExportPage'/></strong> </s:a> -</div> +</div--%> <%--Clone--%> <div class="ui-widget-content-blue ui-corner-all">

1 0

r3717 - in trunk/pollen-ui-struts2/src/main/webapp: WEB-INF/jsp/poll css
by tchemit＠users.chorem.org 01 Oct '12

01 Oct '12

Author: tchemit Date: 2012-10-01 07:56:15 +0200 (Mon, 01 Oct 2012) New Revision: 3717 Url: http://chorem.org/repositories/revision/pollen/3717 Log: push back vote visibility in vote page (was lost...) Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollInformation.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp trunk/pollen-ui-struts2/src/main/webapp/css/pollInformation.css Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollInformation.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollInformation.jsp 2012-10-01 05:11:24 UTC (rev 3716) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollInformation.jsp 2012-10-01 05:56:15 UTC (rev 3717) @@ -66,5 +66,11 @@ key='pollen.common.voteCountingType' tooltip="%{voteCountingTypeHelp}" tooltipIconPath="/img/tooltip.png"/> + <s:if test="showVoteVisibility"> + <s:label value="%{pollVoteVisibilityName}" + key='pollen.common.pollVoteVisibility' + tooltip="%{pollVoteVisibilityHelp}" + tooltipIconPath="/img/tooltip.png"/> + </s:if> </fieldset> </div> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-10-01 05:11:24 UTC (rev 3716) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-10-01 05:56:15 UTC (rev 3717) @@ -116,6 +116,7 @@  <s:set name="showVoteUrl" value="false"/> <s:set name="showResultUrl" value="true"/> +<s:set name="showVoteVisibility" value="true"/> <%@include file="pollInformation.jsp" %> <div id="pollZone"> Modified: trunk/pollen-ui-struts2/src/main/webapp/css/pollInformation.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/pollInformation.css 2012-10-01 05:11:24 UTC (rev 3716) +++ trunk/pollen-ui-struts2/src/main/webapp/css/pollInformation.css 2012-10-01 05:56:15 UTC (rev 3717) @@ -32,7 +32,7 @@ } #pollInformationTop fieldset { - width: 350px; + width: 380px; border: 1px solid #aab; padding: 15px; padding-bottom: 10px;

1 0