Author: tchemit Date: 2012-04-24 12:45:44 +0200 (Tue, 24 Apr 2012) New Revision: 3307 Url: http://chorem.org/repositories/revision/pollen/3307 Log: fixes #531: Updates to h2 1.3.166 uses mavenpom 3.3-SNAPSHOT (make works documentation with it) svn properties Added: trunk/src/site/resources/images/ trunk/src/site/resources/images/logos/ trunk/src/site/resources/images/logos/argouml-logo.png trunk/src/site/resources/images/logos/jrst-logo.png trunk/src/site/resources/images/logos/restructuredtext-logo.png trunk/src/site/resources/images/logos/struts2-logo.png trunk/src/site/resources/images/logos/topia-logo.png Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java trunk/pollen-ui-struts2/src/main/webapp/css/tipTip.css trunk/pollen-ui-struts2/src/main/webapp/js/jquery.tipTip.minified.js trunk/pom.xml trunk/src/site/fr/rst/depouillement.rst trunk/src/site/fr/rst/index.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java 2012-04-24 09:41:18 UTC (rev 3306) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java 2012-04-24 10:45:44 UTC (rev 3307) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.pollen.ui.actions; import com.opensymphony.xwork2.ActionContext; Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/webapp/css/tipTip.css ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/webapp/js/jquery.tipTip.minified.js ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-24 09:41:18 UTC (rev 3306) +++ trunk/pom.xml 2012-04-24 10:45:44 UTC (rev 3307) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.2.1</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.chorem</groupId> @@ -457,7 +457,7 @@ <tapestryVersion>5.1.0.5</tapestryVersion> <nuitonWebVersion>1.11</nuitonWebVersion> <nuitonUtilsVersion>2.4.7</nuitonUtilsVersion> - <h2Version>1.3.165</h2Version> + <h2Version>1.3.166</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.1.2</struts2Version> <jqueryPluginVersion>3.3.0</jqueryPluginVersion> @@ -465,12 +465,12 @@ <slf4jVersion>1.6.4</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> - <!--Multilanguage maven-site --> - <siteLocales>en,fr</siteLocales> - <!-- license to use --> <license.licenseName>agpl_v3</license.licenseName> + <!--Site configuration --> + + <locales>en,fr</locales> <scmwebeditorEnabled>true</scmwebeditorEnabled> </properties> @@ -531,7 +531,9 @@ <scm> <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> + <developerConnection> + scm:svn:http://svn.chorem.org/svn/pollen/trunk + </developerConnection> <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> Modified: trunk/src/site/fr/rst/depouillement.rst =================================================================== --- trunk/src/site/fr/rst/depouillement.rst 2012-04-24 09:41:18 UTC (rev 3306) +++ trunk/src/site/fr/rst/depouillement.rst 2012-04-24 10:45:44 UTC (rev 3307) @@ -68,6 +68,7 @@ nombre de choix, cela permet de varier entre le scrutin uninominal à un tour et le scrutin par assentiment, cela invite également les électeurs à voter sincèrement. + Méthode par nombre ------------------ Modified: trunk/src/site/fr/rst/index.rst =================================================================== --- trunk/src/site/fr/rst/index.rst 2012-04-24 09:41:18 UTC (rev 3306) +++ trunk/src/site/fr/rst/index.rst 2012-04-24 10:45:44 UTC (rev 3307) @@ -64,4 +64,4 @@ .. image:: home.png :alt: Page d'accueil de Pollen -.. _mode de dépouillement: depouillement.html +.. _mode de dépouillement: ./depouillement.html Added: trunk/src/site/resources/images/logos/argouml-logo.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/logos/argouml-logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/site/resources/images/logos/jrst-logo.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/logos/jrst-logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/site/resources/images/logos/restructuredtext-logo.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/logos/restructuredtext-logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/site/resources/images/logos/struts2-logo.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/logos/struts2-logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/site/resources/images/logos/topia-logo.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/logos/topia-logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-04-24 09:41:18 UTC (rev 3306) +++ trunk/src/site/site_en.xml 2012-04-24 10:45:44 UTC (rev 3307) @@ -30,17 +30,7 @@ <name>${project.name}</name> <href>index.html</href> </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - <bannerRight> <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> <href>http://www.codelutin.com</href> @@ -66,9 +56,24 @@ <version position="right" /> <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://maven-site.nuiton.org/jrst/images/restructuredtext-logo.png"/> + <logo href="http://maven.apache.org" name="Maven" + img="images/logos/maven-feather.png"/> + + <logo href="http://struts.apache.org/" name="Struts 2" + img="images/logos/struts2-logo.png"/> + + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" + img="images/logos/restructuredtext-logo.png"/> + + <logo href="http://maven-site.nuiton.org/jrst" name="JRst" + img="images/logos/jrst-logo.png"/> + + <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" + img="images/logos/topia-logo.png"/> + + <logo href="http://argouml.tigris.org/" name="ArgoUML" + img="images/logos/argouml-logo.png"/> </poweredBy> <body> @@ -103,7 +108,8 @@ <menu ref="reports"/> <footer> - <script type="text/javascript" src="./maven-site-chorem.org.js"> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> </script> <div id='projectMetas' Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-04-24 09:41:18 UTC (rev 3306) +++ trunk/src/site/site_fr.xml 2012-04-24 10:45:44 UTC (rev 3307) @@ -56,9 +56,24 @@ <version position="right" /> <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://maven-site.nuiton.org/jrst/images/restructuredtext-logo.png"/> + <logo href="http://maven.apache.org" name="Maven" + img="images/logos/maven-feather.png"/> + + <logo href="http://struts.apache.org/" name="Struts 2" + img="images/logos/struts2-logo.png"/> + + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" + img="images/logos/restructuredtext-logo.png"/> + + <logo href="http://maven-site.nuiton.org/jrst" name="JRst" + img="images/logos/jrst-logo.png"/> + + <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" + img="images/logos/topia-logo.png"/> + + <logo href="http://argouml.tigris.org/" name="ArgoUML" + img="images/logos/argouml-logo.png"/> </poweredBy> <body> @@ -94,7 +109,8 @@ <footer> - <script type="text/javascript" src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> </script> <div id='projectMetas'