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

r3673 - trunk/pollen-persistence/src/main/resources/i18n
by tchemit＠users.chorem.org 04 Sep '12

04 Sep '12

Author: tchemit Date: 2012-09-04 17:40:30 +0200 (Tue, 04 Sep 2012) New Revision: 3673 Url: http://chorem.org/repositories/revision/pollen/3673 Log: fix typo Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties =================================================================== --- trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-09-04 15:36:19 UTC (rev 3672) +++ trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-09-04 15:40:30 UTC (rev 3673) @@ -27,10 +27,10 @@ pollen.pollCommentVisibilty.everybody=Utiliser les commentaires pollen.pollCommentVisibilty.nobody=Interdir les commentaires sur le sondage pollen.pollVoteVisibilty.creatorOnly=Visible pour le créateur -pollen.pollVoteVisibilty.creatorOnly.help=Seule le créateur ou un administrateur peut voir les votes +pollen.pollVoteVisibilty.creatorOnly.help=Seul le créateur ou un administrateur peut voir les votes pollen.pollVoteVisibilty.everybody=Vote publique pollen.pollVoteVisibilty.everybody.help=Tout le monde peut voir les votes pollen.pollVoteVisibilty.nobody=Sondage anonyme pollen.pollVoteVisibilty.nobody.help=Le sondage est anonyme, personne ne peut voir les votes pollen.pollVoteVisibilty.participantOnly=Visible pour les participants -pollen.pollVoteVisibilty.participantOnly.help=Seul les participants du sondage peuvent voir les votes +pollen.pollVoteVisibilty.participantOnly.help=Seuls les participants du sondage peuvent voir les votes

1 0

r3672 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 04 Sep '12

04 Sep '12

Author: tchemit Date: 2012-09-04 17:36:19 +0200 (Tue, 04 Sep 2012) New Revision: 3672 Url: http://chorem.org/repositories/revision/pollen/3672 Log: fixes #802: Cannot delete my vote Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 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-09-04 14:06:07 UTC (rev 3671) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-09-04 15:36:19 UTC (rev 3672) @@ -328,7 +328,7 @@ </s:a> </s:if> <s:if test="isDeleteVoteAllowed(#vote)"> - <s:a action="deleteVote/%{pollUri}" namespace="/poll" href="#" + <s:a namespace="/poll" href="#" onclick="return openDeleteVoteDialog('%{#vote.topiaId}');" id='deleteVote_%{#vote.pollAccount.accountId}'> <img src="<s:url value="/img/delete.png"/>"

1 0

r3671 - in trunk: pollen-votecounting-strategy-coombs/src/test/resources pollen-votecounting-strategy-instant-runoff/src/test/resources pollen-votecounting-strategy-normal/src/test/resources pollen-votecounting-strategy-number/src/test/resources pollen-votecounting-strategy-percentage/src/test/resources src/site src/site/fr/rst src/site/rst
by tchemit＠users.chorem.org 04 Sep '12

04 Sep '12

Author: tchemit Date: 2012-09-04 16:06:07 +0200 (Tue, 04 Sep 2012) New Revision: 3671 Url: http://chorem.org/repositories/revision/pollen/3671 Log: improve doc re-add log4j config files (for tests) Added: trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties Modified: trunk/src/site/fr/rst/configure.rst trunk/src/site/fr/rst/depouillement.rst trunk/src/site/rst/methods.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Copied: trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties (from rev 3670, trunk/pollen-votecounting-strategy-borda/src/test/resources/log4j.properties) =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties 2012-09-04 14:06:07 UTC (rev 3671) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +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 Copied: trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties (from rev 3670, trunk/pollen-votecounting-strategy-borda/src/test/resources/log4j.properties) =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties 2012-09-04 14:06:07 UTC (rev 3671) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +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 Copied: trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties (from rev 3670, trunk/pollen-votecounting-strategy-borda/src/test/resources/log4j.properties) =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties 2012-09-04 14:06:07 UTC (rev 3671) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +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 Copied: trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties (from rev 3670, trunk/pollen-votecounting-strategy-borda/src/test/resources/log4j.properties) =================================================================== --- trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties 2012-09-04 14:06:07 UTC (rev 3671) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +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 Copied: trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties (from rev 3670, trunk/pollen-votecounting-strategy-borda/src/test/resources/log4j.properties) =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties 2012-09-04 14:06:07 UTC (rev 3671) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +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 Modified: trunk/src/site/fr/rst/configure.rst =================================================================== --- trunk/src/site/fr/rst/configure.rst 2012-09-04 13:17:44 UTC (rev 3670) +++ trunk/src/site/fr/rst/configure.rst 2012-09-04 14:06:07 UTC (rev 3671) @@ -101,4 +101,4 @@ | MySql | org.hibernate.dialect.MySQLDialect | com.mysql.jdbc.Driver | jdbc:mysql:pollen | +-------------------------+------------------------------------------+-----------------------------------+------------------------------------------+ -.. _page des options: ./pollen-ui-struts2/application-config-report.html +.. _page des options: ./application-config-report.html Modified: trunk/src/site/fr/rst/depouillement.rst =================================================================== --- trunk/src/site/fr/rst/depouillement.rst 2012-09-04 13:17:44 UTC (rev 3670) +++ trunk/src/site/fr/rst/depouillement.rst 2012-09-04 14:06:07 UTC (rev 3671) @@ -82,3 +82,17 @@ - la somme des nombres parmi les votes non blanc - la moyenne des nombres parmi les votes non blanc +Méthode Coombs +-------------- + +A venir en version 2.5 (http://chorem.org/issues/543) + +Méthode instant-runoff +---------------------- + +A venir en version 2.5 (http://chorem.org/issues/541) + +Méthode Borda +------------- + +A venir en version 2.5 (http://chorem.org/issues/542) Modified: trunk/src/site/rst/methods.rst =================================================================== --- trunk/src/site/rst/methods.rst 2012-09-04 13:17:44 UTC (rev 3670) +++ trunk/src/site/rst/methods.rst 2012-09-04 14:06:07 UTC (rev 3671) @@ -79,3 +79,19 @@ - The number of white votes - The sum of votes among non-white - The average number of votes among non-white + +Méthode Coombs +-------------- + +Coming soon in version 2.5 (http://chorem.org/issues/543) + +Méthode instant-runoff +---------------------- + +Coming soon in version 2.5 (http://chorem.org/issues/541) + +Méthode Borda +------------- + +Coming soon in version 2.5 (http://chorem.org/issues/542) + Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-09-04 13:17:44 UTC (rev 3670) +++ trunk/src/site/site_en.xml 2012-09-04 14:06:07 UTC (rev 3671) @@ -56,23 +56,23 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> + img="http://maven-site.nuiton.org/public/images/logos/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="http://maven-site.nuiton.org/public/images/struts2-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/restructuredtext-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.nuiton.org/public/images/jrst-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="http://maven-site.nuiton.org/public/images/topia-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="http://maven-site.nuiton.org/public/images/argouml-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/> </poweredBy> <body> @@ -97,6 +97,11 @@ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> </links> + <menu name="User documentation"> + <item name="Home" href="./index.html"/> + <item name="Vote counting methods" href="./methods.html"/> + </menu> + <menu name="Install"> <item name="Install Pollen" href="install.html"/> <item name="Configure Pollen" href="configure.html"/> @@ -120,7 +125,7 @@ <menu ref="reports"/> <footer> - <div id='projectMetas' + <div id='projectMetas' locale='en' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-09-04 13:17:44 UTC (rev 3670) +++ trunk/src/site/site_fr.xml 2012-09-04 14:06:07 UTC (rev 3671) @@ -97,6 +97,11 @@ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> </links> + <menu name="Documentation utilisateur"> + <item name="Accueil" href="./index.html"/> + <item name="Méthodes de dépouillement" href="./depouillement.html"/> + </menu> + <menu name="Installation"> <item name="Installer Pollen" href="install.html"/> <item name="Configurer Pollen" href="configure.html"/> @@ -107,7 +112,7 @@ <item name="Instance de tests (utilise la dernière version de dev, pour tests uniquement)" href="http://demo.codelutin.com/pollen"/> </menu> - <menu name="Language"> + <menu name="Langue"> <item name="Français" href="index.html"/> <item name="English" href="../index.html"/> </menu> @@ -116,7 +121,7 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}'

1 0

04 Sep '12

Author: tchemit Date: 2012-09-04 15:17:44 +0200 (Tue, 04 Sep 2012) New Revision: 3670 Url: http://chorem.org/repositories/revision/pollen/3670 Log: fixes #800: Updates to nuiton-i18n 2.5 fixes #720: Updates to nuiton-utils 2.6.1 fixes #781: Updates to topia 2.6.13 do not generate site for modules Removed: trunk/pollen-persistence/src/site/ trunk/pollen-services/src/site/ trunk/pollen-ui-struts2/src/site/ trunk/pollen-votecounting-api/src/site/ trunk/pollen-votecounting-strategy-borda/src/site/ trunk/pollen-votecounting-strategy-condorcet/src/site/ trunk/pollen-votecounting-strategy-coombs/src/site/ trunk/pollen-votecounting-strategy-instant-runoff/src/site/ trunk/pollen-votecounting-strategy-normal/src/site/ trunk/pollen-votecounting-strategy-number/src/site/ trunk/pollen-votecounting-strategy-percentage/src/site/ trunk/pollen-votecounting-strategy/src/site/ trunk/pollen-votecounting/src/site/ Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-strategy-borda/pom.xml trunk/pollen-votecounting-strategy-condorcet/pom.xml trunk/pollen-votecounting-strategy-coombs/pom.xml trunk/pollen-votecounting-strategy-instant-runoff/pom.xml trunk/pollen-votecounting-strategy-normal/pom.xml trunk/pollen-votecounting-strategy-number/pom.xml trunk/pollen-votecounting-strategy-percentage/pom.xml trunk/pollen-votecounting-strategy/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-persistence/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -82,6 +82,12 @@ <name>Pollen :: Persistence</name> <description>Pollen Persistence Layer</description> + <properties> +  + <maven.site.skip>true</maven.site.skip> + <maven.site.deploy.skip>true</maven.site.deploy.skip> + </properties> + <build> <plugins> @@ -124,7 +130,7 @@ </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <configuration> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-services/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -113,13 +113,19 @@ <name>Pollen :: Services</name> <description>Pollen Service Layer</description> + <properties> +  + <maven.site.skip>true</maven.site.skip> + <maven.site.deploy.skip>true</maven.site.deploy.skip> + </properties> + <build> <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-ui-struts2/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -316,10 +316,20 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> + <id>parseJsp</id> <goals> + <goal>parserStruts2</goal> + </goals> + <configuration> + <acceptKeyFormat>^pollen\..*$</acceptKeyFormat> + </configuration> + </execution> + <execution> + <id>parseOthersAndGenBundle</id> + <goals> <goal>parserValidation</goal> <goal>parserJava</goal> <goal>gen</goal> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -48,7 +48,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-api/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -47,7 +47,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-votecounting-strategy/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-strategy/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -71,7 +71,6 @@ Aggregator of all implementations of votecounting strategy </description> - <packaging>pom</packaging> <profiles> Modified: trunk/pollen-votecounting-strategy-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-borda/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -51,7 +51,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-votecounting-strategy-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -49,7 +49,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-votecounting-strategy-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -51,7 +51,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-votecounting-strategy-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -51,7 +51,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-votecounting-strategy-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-normal/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -45,7 +45,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-votecounting-strategy-number/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-number/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -45,7 +45,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-votecounting-strategy-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -53,7 +53,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -54,7 +54,7 @@ <developer> <id>tchemit</id> <name>Tony Chemit</name> - <email>chemit at codelutin.com</email> + <email>chemit at codelutin dot com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -66,7 +66,7 @@ <developer> <id>jcouteau</id> <name>Jean Couteau</name> - <email>couteau at codelutin.com</email> + <email>couteau at codelutin dot com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -78,7 +78,7 @@ <developer> <id>fdesbois</id> <name>Florian Desbois</name> - <email>desbois at codelutin.com</email> + <email>desbois at codelutin dot com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -89,7 +89,7 @@ <developer> <id>kmorin</id> <name>Kevin Morin</name> - <email>morin at codelutin.com</email> + <email>morin at codelutin dot com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -153,12 +153,12 @@ <projectId>pollen</projectId>  - <topiaVersion>2.6.12</topiaVersion> + <topiaVersion>2.6.13</topiaVersion> <eugenePluginVersion>2.5</eugenePluginVersion> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion> - <nuitonUtilsVersion>2.6</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.1</nuitonUtilsVersion> <h2Version>1.3.167</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.4</struts2Version> @@ -508,7 +508,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> </plugin> @@ -682,6 +682,23 @@ </profile> +  + <profile> + <id>not-site</id> + <activation> + <file> + <missing>src/site</missing> + </file> + </activation> + + + <properties> +  + <maven.site.skip>true</maven.site.skip> + <maven.site.deploy.skip>true</maven.site.deploy.skip> + </properties> + + </profile> </profiles> </project> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/src/site/site_en.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -38,7 +38,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>1.3.0</version> </skin> <custom> @@ -79,15 +79,15 @@ <head> <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/public/css/maven-site-chorem.org.css"/> + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> </head> <breadcrumbs> - <item name="${project.name}" href="${project.url}"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <links> @@ -108,13 +108,13 @@ </menu> <menu name="Language"> - <item name="Français" href="fr/index.html"/> - <item name="English" href="index.html"/> + <item name="Français" href="./fr/index.html"/> + <item name="English" href="./index.html"/> </menu> <menu name="Technical"> - <item name="Security" href="security.html"/> - <item name="UI Tests" href="tests.html"/> + <item name="Security" href="./security.html"/> + <item name="UI Tests" href="./tests.html"/> </menu> <menu ref="reports"/> @@ -124,7 +124,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/src/site/site_fr.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -38,7 +38,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>1.3.0</version> </skin> <custom> @@ -79,15 +79,15 @@ <head> <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/public/css/maven-site-chorem.org.css"/> + href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> </head> <breadcrumbs> - <item name="${project.name}" href="${project.url}"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <links> @@ -120,7 +120,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'

1 0