Author: tchemit Date: 2012-12-30 21:18:25 +0100 (Sun, 30 Dec 2012) New Revision: 2701 Url: http://nuiton.org/projects/topia/repository/revisions/2701 Log: updates some libs Modified: trunk/pom.xml trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaFilterPagerUtil.java trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-30 20:03:54 UTC (rev 2700) +++ trunk/pom.xml 2012-12-30 20:18:25 UTC (rev 2701) @@ -69,14 +69,14 @@ <!-- libs version --> <eugeneVersion>2.6</eugeneVersion> - <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.5</nuitonUtilsVersion> <processorPluginVersion>1.2.2</processorPluginVersion> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <nuitonI18nVersion>2.5</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> - <hibernateVersion>4.1.3.Final</hibernateVersion> - <sl4jVersion>1.6.4</sl4jVersion> - <h2Version>1.3.167</h2Version> - <mockitoVersion>1.9.0</mockitoVersion> + <hibernateVersion>4.1.9.Final</hibernateVersion> + <sl4jVersion>1.7.2</sl4jVersion> + <h2Version>1.3.170</h2Version> + <mockitoVersion>1.9.5</mockitoVersion> <geronimoJpaSpecVersion>1.1</geronimoJpaSpecVersion> </properties> @@ -212,21 +212,20 @@ <developer> <name>Benjamin Poussin</name> <id>bpoussin</id> - <email>poussin@codelutin.com</email> + <email>poussin at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> - <role>Debian packager</role> </roles> </developer> <developer> <name>Arnaud Thimel</name> <id>athimel</id> - <email>thimel@codelutin.com</email> + <email>thimel at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -235,9 +234,9 @@ <developer> <name>Julien Ruchaud</name> <id>jruchaud</id> - <email>ruchaud@codelutin.com</email> + <email>ruchaud at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -246,9 +245,9 @@ <developer> <name>Eric Chatellier</name> <id>echatellier</id> - <email>chatellier@codelutin.com</email> + <email>chatellier at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -257,9 +256,9 @@ <developer> <name>Tony Chemit</name> <id>tchemit</id> - <email>chemit@codelutin.com</email> + <email>chemit at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -268,31 +267,20 @@ <developer> <name>Sylvain Letellier</name> <id>sletellier</id> - <email>letellier@codelutin.com</email> + <email>letellier at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> </developer> <developer> - <name>Florian Desbois</name> - <id>fdesbois</id> - <email>desbois@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - - <developer> <name>Brendan Le Ny</name> <id>bleny</id> - <email>bleny@codelutin.com</email> + <email>bleny at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -301,9 +289,9 @@ <developer> <name>Jean Couteau</name> <id>jcouteau</id> - <email>couteau@codelutin.com</email> + <email>couteau at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Documentation writer</role> </roles> @@ -313,40 +301,31 @@ <contributors> <contributor> <name>Nicolas Dupont</name> - <email>ndupont@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> </contributor> <contributor> <name>Eduardo Ore</name> - <email>eore@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> </contributor> <contributor> <name>Gabriel Landais</name> - <email>glandais@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> </contributor> <contributor> <name>Stéphane Chorlet</name> - <email>schorlet@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> </contributor> <contributor> <name>Jonathan pepin</name> - <email>jpepin@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> </contributor> <contributor> <name>Nolwenn Ranou</name> - <email>nrannou@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> </contributor> + <contributor> + <name>Florian Desbois</name> + </contributor> </contributors> <!-- ************************************************************* --> @@ -458,6 +437,7 @@ <report>license</report> <report>scm</report> <report>dependencies</report> + <report>dependency-info</report> <report>dependency-convergence</report> <report>plugin-management</report> <report>plugins</report> @@ -508,7 +488,9 @@ <!-- Source control management. --> <scm> <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/topia/trunk + </developerConnection> <url>http://www.nuiton.org/projects/topia/repository/show/trunk</url> </scm> Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaFilterPagerUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaFilterPagerUtil.java 2012-12-30 20:03:54 UTC (rev 2700) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaFilterPagerUtil.java 2012-12-30 20:18:25 UTC (rev 2701) @@ -27,7 +27,8 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.framework.TopiaQuery; -import org.nuiton.util.PagerUtil; +import org.nuiton.util.PagerBean; +import org.nuiton.util.PagerBeanUtil; import java.io.Serializable; import java.util.ArrayList; @@ -37,13 +38,13 @@ import java.util.Map; /** - * Extension of the simple {@link PagerUtil} from nuiton-utils to offer + * Extension of the simple {@link PagerBeanUtil} from nuiton-utils to offer * order and filter api. * * @author tchemit <chemit@codelutin.com> * @since 2.6.9 */ -public class TopiaFilterPagerUtil extends PagerUtil { +public class TopiaFilterPagerUtil extends PagerBeanUtil { protected TopiaFilterPagerUtil() { } @@ -51,9 +52,9 @@ @Deprecated public static TopiaQuery addPagerToQuery(TopiaQuery query, FilterPagerBean pager) { - PagerUtil.computeRecordIndexesAndPagesNumber(pager); - query.setLimit(pager.getRecordStartIndex(), - pager.getRecordEndIndex() - 1); + computeRecordIndexesAndPagesNumber(pager); + query.setLimit((int) pager.getRecordStartIndex(), + (int) pager.getRecordEndIndex() - 1); if (StringUtils.isNotEmpty(pager.getSortColumn())) { if (pager.isSortAscendant()) { @@ -68,7 +69,7 @@ public static <E> List<E> getPageFromList(List<E> elements, FilterPagerBean pager) { - PagerUtil.computeRecordIndexesAndPagesNumber(pager); + computeRecordIndexesAndPagesNumber(pager); List<E> subList = getPage(elements, pager.getPageIndex(), pager.getPageSize()); List<E> result = new ArrayList<E>(subList); Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2012-12-30 20:03:54 UTC (rev 2700) +++ trunk/topia-service-security/pom.xml 2012-12-30 20:18:25 UTC (rev 2701) @@ -155,7 +155,7 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jpa_2.0_spec</artifactId> - <version>1.1</version> + <version>${geronimoJpaSpecVersion}</version> <scope>compile</scope> </dependency> </dependencies>