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

r2769 - trunk/src/site/rst
by jcouteau＠users.chorem.org 04 Sep '09

04 Sep '09

Author: jcouteau Date: 2009-09-04 17:19:14 +0200 (Fri, 04 Sep 2009) New Revision: 2769 Removed: trunk/src/site/rst/developper/ trunk/src/site/rst/user/ Log: Multi language maven site English by default and french Translation of french doc to english

1 0

r2768 - in trunk: . pollen-ui
by echatellier＠users.chorem.org 04 Sep '09

04 Sep '09

Author: echatellier Date: 2009-09-04 15:14:08 +0200 (Fri, 04 Sep 2009) New Revision: 2768 Modified: trunk/pollen-ui/pom.xml trunk/pom.xml Log: Add launcher code on war based on winstone Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2009-09-01 12:12:19 UTC (rev 2767) +++ trunk/pollen-ui/pom.xml 2009-09-04 13:14:08 UTC (rev 2768) @@ -63,6 +63,11 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>net.sourceforge.winstone</groupId> + <artifactId>winstone</artifactId> + <scope>provided</scope> + </dependency> </dependencies>  @@ -80,33 +85,51 @@ <packaging>war</packaging> <reporting> -  -  +  +  </reporting> <build> +  <finalName>pollen-${project.version}</finalName> + +  <plugins> <plugin> - <groupId>net.sf.alchim</groupId> - <artifactId>winstone-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>embed</goal> - </goals> - <phase>package</phase> - </execution> - </executions> + <artifactId>maven-war-plugin</artifactId> + <version>2.1-beta-1</version> + <configuration> + <webResources> + <resource> + <directory>${basedir}/target/classes</directory> + <includes> + <include>**/war/*</include> + </includes> + </resource> + </webResources> +  + <archive> + <manifest> + <mainClass>org.chorem.pollen.war.PollenWarLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>net.sourceforge.winstone</groupId> + <artifactId>winstone</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> </plugin> </plugins> </build> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-01 12:12:19 UTC (rev 2767) +++ trunk/pom.xml 2009-09-04 13:14:08 UTC (rev 2768) @@ -131,7 +131,11 @@ <version>4.6</version> <scope>test</scope> </dependency> - + <dependency> + <groupId>net.sourceforge.winstone</groupId> + <artifactId>winstone</artifactId> + <version>0.9.10</version> + </dependency> </dependencies> </dependencyManagement>

1 0

r2767 - trunk/pollen-ui
by echatellier＠users.chorem.org 01 Sep '09

01 Sep '09

Author: echatellier Date: 2009-09-01 14:12:19 +0200 (Tue, 01 Sep 2009) New Revision: 2767 Modified: trunk/pollen-ui/pom.xml Log: Call final name "pollen-xxx.war" Add standalone jar with embedded container (winstone) Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2009-08-27 16:29:23 UTC (rev 2766) +++ trunk/pollen-ui/pom.xml 2009-09-01 12:12:19 UTC (rev 2767) @@ -1,5 +1,6 @@ <?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/maven-v4_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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -15,7 +16,7 @@ <groupId>org.chorem.pollen</groupId> <artifactId>pollen-ui</artifactId> - + <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -62,7 +63,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - </dependencies>  @@ -71,26 +71,43 @@ <name>Pollen Web Interface</name> <description>Interface Web Tapestry pour Pollen</description> - +    <packaging>war</packaging> - + <reporting> -  -  +  + </reporting> + + <build> + <finalName>pollen-${project.version}</finalName> + <plugins> <plugin> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-component-report</artifactId> - <version>${tapestry.version}</version> - <configuration> - <rootPackage>org.chorem.pollen.ui</rootPackage> - </configuration> + <groupId>net.sf.alchim</groupId> + <artifactId>winstone-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>embed</goal> + </goals> + <phase>package</phase> + </execution> + </executions> </plugin> - </plugins> --> - </reporting> - + </plugins> + </build> </project>

1 0

r2766 - in trunk: pollen-business/src/main/resources pollen-ui/src/main/java/org/chorem/pollen/ui/services pollen-ui/src/main/resources pollen-votecounting/src/main/resources
by nrannou＠users.chorem.org 27 Aug '09

27 Aug '09

Author: nrannou Date: 2009-08-27 18:29:23 +0200 (Thu, 27 Aug 2009) New Revision: 2766 Modified: trunk/pollen-business/src/main/resources/log4j.properties trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java trunk/pollen-ui/src/main/resources/log4j.properties trunk/pollen-votecounting/src/main/resources/log4j.properties Log: prepare next iteration : log=debug, production_mode=false Modified: trunk/pollen-business/src/main/resources/log4j.properties =================================================================== --- trunk/pollen-business/src/main/resources/log4j.properties 2009-08-27 15:54:10 UTC (rev 2765) +++ trunk/pollen-business/src/main/resources/log4j.properties 2009-08-27 16:29:23 UTC (rev 2766) @@ -5,4 +5,4 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.chorem.pollen=INFO +log4j.logger.org.chorem.pollen=DEBUG Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java 2009-08-27 15:54:10 UTC (rev 2765) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java 2009-08-27 16:29:23 UTC (rev 2766) @@ -88,7 +88,7 @@ // The factory default is true but during the early stages of an application // overriding to false is a good idea. In addition, this is often overridden // on the command line as -Dtapestry.production-mode=false - configuration.add(SymbolConstants.PRODUCTION_MODE, "true"); + configuration.add(SymbolConstants.PRODUCTION_MODE, "false"); // Restricting file size in upload component configuration.add(UploadSymbols.FILESIZE_MAX, "1048576"); Modified: trunk/pollen-ui/src/main/resources/log4j.properties =================================================================== --- trunk/pollen-ui/src/main/resources/log4j.properties 2009-08-27 15:54:10 UTC (rev 2765) +++ trunk/pollen-ui/src/main/resources/log4j.properties 2009-08-27 16:29:23 UTC (rev 2766) @@ -42,4 +42,4 @@ # up and running, replacing it with more selecting debugging output. log4j.category.org.chorem.test=debug -log4j.logger.org.chorem.pollen=INFO +log4j.logger.org.chorem.pollen=DEBUG Modified: trunk/pollen-votecounting/src/main/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting/src/main/resources/log4j.properties 2009-08-27 15:54:10 UTC (rev 2765) +++ trunk/pollen-votecounting/src/main/resources/log4j.properties 2009-08-27 16:29:23 UTC (rev 2766) @@ -5,4 +5,4 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.chorem.pollen=INFO +log4j.logger.org.chorem.pollen=DEBUG

1 0

r2765 - in trunk: . pollen-business pollen-ui pollen-votecounting
by nrannou＠users.chorem.org 27 Aug '09

27 Aug '09

Author: nrannou Date: 2009-08-27 17:54:10 +0200 (Thu, 27 Aug 2009) New Revision: 2765 Modified: trunk/pollen-business/pom.xml trunk/pollen-ui/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2009-08-27 15:54:07 UTC (rev 2764) +++ trunk/pollen-business/pom.xml 2009-08-27 15:54:10 UTC (rev 2765) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0</version> + <version>1.1.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2009-08-27 15:54:07 UTC (rev 2764) +++ trunk/pollen-ui/pom.xml 2009-08-27 15:54:10 UTC (rev 2765) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0</version> + <version>1.1.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2009-08-27 15:54:07 UTC (rev 2764) +++ trunk/pollen-votecounting/pom.xml 2009-08-27 15:54:10 UTC (rev 2765) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0</version> + <version>1.1.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-27 15:54:07 UTC (rev 2764) +++ trunk/pom.xml 2009-08-27 15:54:10 UTC (rev 2765) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0</version> + <version>1.1.1-SNAPSHOT</version> <modules> <module>pollen-ui</module> @@ -311,9 +311,9 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.1.0</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.1.0</developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.1.0</url> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <repositories>

1 0

r2764 - tags
by nrannou＠users.chorem.org 27 Aug '09

27 Aug '09

Author: nrannou Date: 2009-08-27 17:54:07 +0200 (Thu, 27 Aug 2009) New Revision: 2764 Added: tags/pollen-1.1.0/ Log: [maven-scm] copy for tag pollen-1.1.0

1 0

r2763 - in trunk: . pollen-business pollen-ui pollen-votecounting
by nrannou＠users.chorem.org 27 Aug '09

27 Aug '09

Author: nrannou Date: 2009-08-27 17:54:05 +0200 (Thu, 27 Aug 2009) New Revision: 2763 Modified: trunk/pollen-business/pom.xml trunk/pollen-ui/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare release pollen-1.1.0 Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2009-08-27 15:51:09 UTC (rev 2762) +++ trunk/pollen-business/pom.xml 2009-08-27 15:54:05 UTC (rev 2763) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-3-SNAPSHOT</version> + <version>1.1.0</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2009-08-27 15:51:09 UTC (rev 2762) +++ trunk/pollen-ui/pom.xml 2009-08-27 15:54:05 UTC (rev 2763) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-3-SNAPSHOT</version> + <version>1.1.0</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2009-08-27 15:51:09 UTC (rev 2762) +++ trunk/pollen-votecounting/pom.xml 2009-08-27 15:54:05 UTC (rev 2763) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-3-SNAPSHOT</version> + <version>1.1.0</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-27 15:51:09 UTC (rev 2762) +++ trunk/pom.xml 2009-08-27 15:54:05 UTC (rev 2763) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.1.0-beta-3-SNAPSHOT</version> + <version>1.1.0</version> <modules> <module>pollen-ui</module> @@ -311,9 +311,9 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.1.0</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.1.0</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.1.0</url> </scm> <repositories>

1 0

r2761 - trunk/src/site
by nrannou＠users.chorem.org 27 Aug '09

27 Aug '09

Author: nrannou Date: 2009-08-27 17:40:24 +0200 (Thu, 27 Aug 2009) New Revision: 2761 Modified: trunk/src/site/site.xml Log: modification site Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-08-27 15:10:53 UTC (rev 2760) +++ trunk/src/site/site.xml 2009-08-27 15:40:24 UTC (rev 2761) @@ -1,16 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="Pollen"> +<project name="${project.name}"> <publishDate format="dd/MM/yyyy"/> <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0-rc-1</version> + <version>1.0.0</version> </skin> <bannerLeft> - <name>Code Lutin - Chorem</name> + <name>${project.name}</name> + <href>index.html</href> </bannerLeft> <bannerRight> @@ -25,37 +26,16 @@ </poweredBy> <body> -  - - <menu name="Projet" inherit="top"> -  - </menu> - - <menu name="Pollen" inherit="top"> -  - -  - </menu> - + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + <menu name="Utilisateur"> <item name="Installation" href="user/install.html"/> <item name="Tutoriel" href="user/tutoriel.html"/> </menu> + <menu name="Développeur"> <item name="Analyse" href="developper/analyse.html"/> <item name="Architecture" href="developper/architecture.html"/> @@ -66,24 +46,8 @@ </item> </menu> -  - -  - -  - <menu ref="parent"/> - <menu ref="modules"/> - +  <menu ref="reports"/> </body>

2 1

r2762 - in trunk: pollen-business/src/main/resources pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll pollen-ui/src/main/java/org/chorem/pollen/ui/services pollen-ui/src/main/resources pollen-votecounting/src/main/resources
by nrannou＠users.chorem.org 27 Aug '09

27 Aug '09

Author: nrannou Date: 2009-08-27 17:51:09 +0200 (Thu, 27 Aug 2009) New Revision: 2762 Modified: trunk/pollen-business/src/main/resources/log4j.properties trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ConfirmPoll.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java trunk/pollen-ui/src/main/resources/log4j.properties trunk/pollen-votecounting/src/main/resources/log4j.properties Log: prepare release : log=info, production_mode=true Modified: trunk/pollen-business/src/main/resources/log4j.properties =================================================================== --- trunk/pollen-business/src/main/resources/log4j.properties 2009-08-27 15:40:24 UTC (rev 2761) +++ trunk/pollen-business/src/main/resources/log4j.properties 2009-08-27 15:51:09 UTC (rev 2762) @@ -5,4 +5,4 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.chorem.pollen=DEBUG +log4j.logger.org.chorem.pollen=INFO Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ConfirmPoll.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ConfirmPoll.java 2009-08-27 15:40:24 UTC (rev 2761) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ConfirmPoll.java 2009-08-27 15:51:09 UTC (rev 2762) @@ -20,7 +20,6 @@ import org.apache.tapestry5.BindingConstants; import org.apache.tapestry5.annotations.InjectPage; -import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; @@ -98,7 +97,6 @@ * * @return la page de validation de cloture */ - @Log public Object onActionFromValidateButton() { switch (pollAction) { case CLOSE: Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java 2009-08-27 15:40:24 UTC (rev 2761) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java 2009-08-27 15:51:09 UTC (rev 2762) @@ -88,7 +88,7 @@ // The factory default is true but during the early stages of an application // overriding to false is a good idea. In addition, this is often overridden // on the command line as -Dtapestry.production-mode=false - configuration.add(SymbolConstants.PRODUCTION_MODE, "false"); + configuration.add(SymbolConstants.PRODUCTION_MODE, "true"); // Restricting file size in upload component configuration.add(UploadSymbols.FILESIZE_MAX, "1048576"); Modified: trunk/pollen-ui/src/main/resources/log4j.properties =================================================================== --- trunk/pollen-ui/src/main/resources/log4j.properties 2009-08-27 15:40:24 UTC (rev 2761) +++ trunk/pollen-ui/src/main/resources/log4j.properties 2009-08-27 15:51:09 UTC (rev 2762) @@ -42,4 +42,4 @@ # up and running, replacing it with more selecting debugging output. log4j.category.org.chorem.test=debug -log4j.logger.org.chorem.pollen=DEBUG +log4j.logger.org.chorem.pollen=INFO Modified: trunk/pollen-votecounting/src/main/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting/src/main/resources/log4j.properties 2009-08-27 15:40:24 UTC (rev 2761) +++ trunk/pollen-votecounting/src/main/resources/log4j.properties 2009-08-27 15:51:09 UTC (rev 2762) @@ -5,4 +5,4 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.chorem.pollen=DEBUG +log4j.logger.org.chorem.pollen=INFO

1 0

r2760 - trunk/src/site/rst/user
by nrannou＠users.chorem.org 27 Aug '09

27 Aug '09

Author: nrannou Date: 2009-08-27 17:10:53 +0200 (Thu, 27 Aug 2009) New Revision: 2760 Modified: trunk/src/site/rst/user/install.rst Log: documentation utilisateur Modified: trunk/src/site/rst/user/install.rst =================================================================== --- trunk/src/site/rst/user/install.rst 2009-08-27 15:01:18 UTC (rev 2759) +++ trunk/src/site/rst/user/install.rst 2009-08-27 15:10:53 UTC (rev 2760) @@ -43,4 +43,4 @@ Il peut-être nécessaire de redéployer l'application après avoir modifié ce fichier. -Un utilisateur avec les droits d'administration est créé automatiquement (identifiant "admin", mot de passe "pollen"). Par mesure de sécurité il est important de supprimer cet utilisateur après avoir créer un autre compte. +Un utilisateur avec les droits d'administration est créé automatiquement (identifiant "admin", mot de passe "pollen"). Par mesure de sécurité il est important de supprimer cet utilisateur après avoir créer un autre compte administrateur.

1 0