November 2012 - Topia-commits - mailman.cloud.codelutin.com

r2686 - in branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton: topia/persistence topiatest
by tchemit＠users.nuiton.org Nov. 16, 2012

Nov. 16, 2012

Author: tchemit Date: 2012-11-16 18:40:45 +0100 (Fri, 16 Nov 2012) New Revision: 2686 Url: http://nuiton.org/repositories/revision/topia/2686 Log: fix deprecated test compilation Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java 2012-11-16 17:40:19 UTC (rev 2685) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java 2012-11-16 17:40:45 UTC (rev 2686) @@ -23,7 +23,7 @@ */ package org.nuiton.topia.persistence; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java 2012-11-16 17:40:19 UTC (rev 2685) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java 2012-11-16 17:40:45 UTC (rev 2686) @@ -26,11 +26,11 @@ package org.nuiton.topia.persistence; import com.google.common.collect.Lists; +import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.junit.matchers.JUnitMatchers; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaException; @@ -76,7 +76,7 @@ public void testCreateAndFindInTransaction() throws Exception { // appel 1 find all - Person person = createPerson("toto"); + createPerson("toto"); List<Person> allPerson = dao.findAll(); Assert.assertEquals(1, allPerson.size()); context.commitTransaction(); @@ -85,7 +85,7 @@ Person person2 = createPerson("titi"); allPerson = dao.findAll(); Assert.assertEquals(2, allPerson.size()); - Assert.assertThat(allPerson, JUnitMatchers.hasItem(person2)); + Assert.assertThat(allPerson, CoreMatchers.hasItem(person2)); context.rollbackTransaction(); @@ -93,7 +93,7 @@ Person person3 = createPerson("tata"); allPerson = dao.findAll(); Assert.assertEquals(2, allPerson.size()); - Assert.assertThat(allPerson, JUnitMatchers.hasItem(person3)); + Assert.assertThat(allPerson, CoreMatchers.hasItem(person3)); context.commitTransaction(); } @@ -171,7 +171,7 @@ List<Person> actual = Lists.newArrayList(); for (Person person : dao) { - Assert.assertThat(excepted, JUnitMatchers.hasItem(person)); + Assert.assertThat(excepted, CoreMatchers.hasItem(person)); actual.add(person); } Assert.assertEquals(excepted.size(), actual.size()); @@ -181,7 +181,7 @@ actual = Lists.newArrayList(); for (Person person : dao) { - Assert.assertThat(excepted, JUnitMatchers.hasItem(person)); + Assert.assertThat(excepted, CoreMatchers.hasItem(person)); actual.add(person); } Assert.assertEquals(excepted.size(), actual.size()); Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java 2012-11-16 17:40:19 UTC (rev 2685) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java 2012-11-16 17:40:45 UTC (rev 2686) @@ -24,7 +24,7 @@ */ package org.nuiton.topiatest; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Rule; import org.junit.Test; import org.nuiton.topia.TopiaContext;

1 0

r2685 - branches/topia-2.6.x
by tchemit＠users.nuiton.org Nov. 16, 2012

Nov. 16, 2012

Author: tchemit Date: 2012-11-16 18:40:19 +0100 (Fri, 16 Nov 2012) New Revision: 2685 Url: http://nuiton.org/repositories/revision/topia/2685 Log: refs #2374: Updates to eugene 2.5.6.1 Modified: branches/topia-2.6.x/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-11-16 17:07:43 UTC (rev 2684) +++ branches/topia-2.6.x/pom.xml 2012-11-16 17:40:19 UTC (rev 2685) @@ -59,7 +59,7 @@ <projectId>topia</projectId>  - <eugeneVersion>2.5.6</eugeneVersion> + <eugeneVersion>2.5.6.1-SNAPSHOT</eugeneVersion> <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> <processorPluginVersion>1.3</processorPluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion>

1 0

r2684 - in branches/topia-2.6.x: . topia-persistence topia-service-migration topia-service-replication
by tchemit＠users.nuiton.org Nov. 16, 2012

Nov. 16, 2012

Author: tchemit Date: 2012-11-16 18:07:43 +0100 (Fri, 16 Nov 2012) New Revision: 2684 Url: http://nuiton.org/repositories/revision/topia/2684 Log: fixes #2445: Updates to i18n-m-p 2.5 fixes #2444: Updates to processor-m-p 1.3 fixes #2375: Updates to nuiton-utils 2.6.4 fixes #2374: Updates to eugene 2.5.6 Modified: branches/topia-2.6.x/pom.xml branches/topia-2.6.x/topia-persistence/pom.xml branches/topia-2.6.x/topia-service-migration/pom.xml branches/topia-2.6.x/topia-service-replication/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-11-16 16:11:42 UTC (rev 2683) +++ branches/topia-2.6.x/pom.xml 2012-11-16 17:07:43 UTC (rev 2684) @@ -59,10 +59,10 @@ <projectId>topia</projectId>  - <eugeneVersion>2.5.5</eugeneVersion> - <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> - <processorPluginVersion>1.2.2</processorPluginVersion> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <eugeneVersion>2.5.6</eugeneVersion> + <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> + <processorPluginVersion>1.3</processorPluginVersion> + <nuitonI18nVersion>2.5</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> <sl4jVersion>1.6.6</sl4jVersion> @@ -348,7 +348,7 @@ <plugin> <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> + <artifactId>processor-maven-plugin</artifactId> <version>${processorPluginVersion}</version> <executions> <execution> @@ -379,7 +379,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> </plugin> Modified: branches/topia-2.6.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/pom.xml 2012-11-16 16:11:42 UTC (rev 2683) +++ branches/topia-2.6.x/topia-persistence/pom.xml 2012-11-16 17:07:43 UTC (rev 2684) @@ -185,12 +185,12 @@ <plugin> <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> + <artifactId>processor-maven-plugin</artifactId> </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: branches/topia-2.6.x/topia-service-migration/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-migration/pom.xml 2012-11-16 16:11:42 UTC (rev 2683) +++ branches/topia-2.6.x/topia-service-migration/pom.xml 2012-11-16 17:07:43 UTC (rev 2684) @@ -131,7 +131,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: branches/topia-2.6.x/topia-service-replication/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-replication/pom.xml 2012-11-16 16:11:42 UTC (rev 2683) +++ branches/topia-2.6.x/topia-service-replication/pom.xml 2012-11-16 17:07:43 UTC (rev 2684) @@ -120,7 +120,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals>

1 0

r2683 - trunk
by tchemit＠users.nuiton.org Nov. 16, 2012

Nov. 16, 2012

Author: tchemit Date: 2012-11-16 17:11:42 +0100 (Fri, 16 Nov 2012) New Revision: 2683 Url: http://nuiton.org/repositories/revision/topia/2683 Log: fix scm url Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-16 16:11:09 UTC (rev 2682) +++ trunk/pom.xml 2012-11-16 16:11:42 UTC (rev 2683) @@ -503,7 +503,7 @@ <scm> <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> + <url>http://www.nuiton.org/projects/topia/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2682 - branches/topia-2.6.x
by tchemit＠users.nuiton.org Nov. 16, 2012

Nov. 16, 2012

Author: tchemit Date: 2012-11-16 17:11:09 +0100 (Fri, 16 Nov 2012) New Revision: 2682 Url: http://nuiton.org/repositories/revision/topia/2682 Log: fix scm url Modified: branches/topia-2.6.x/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-11-16 15:35:14 UTC (rev 2681) +++ branches/topia-2.6.x/pom.xml 2012-11-16 16:11:09 UTC (rev 2682) @@ -461,7 +461,7 @@ <scm> <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</connection> <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/branches/topia-2.6.x</url> + <url>http://nuiton.org/projects/topia/repository/show/branches/topia-2.6.x</url> </scm> <distributionManagement>

1 0

r2681 - branches/topia-2.6.x
by tchemit＠users.nuiton.org Nov. 16, 2012

Nov. 16, 2012

Author: tchemit Date: 2012-11-16 16:35:14 +0100 (Fri, 16 Nov 2012) New Revision: 2681 Url: http://nuiton.org/repositories/revision/topia/2681 Log: Update mavenpom4redmineAndCentral to 3.4.4. Modified: branches/topia-2.6.x/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-11-16 15:35:10 UTC (rev 2680) +++ branches/topia-2.6.x/pom.xml 2012-11-16 15:35:14 UTC (rev 2681) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.3</version> + <version>3.4.4</version> </parent> <artifactId>topia</artifactId>

1 0

r2680 - trunk
by tchemit＠users.nuiton.org Nov. 16, 2012

Nov. 16, 2012

Author: tchemit Date: 2012-11-16 16:35:10 +0100 (Fri, 16 Nov 2012) New Revision: 2680 Url: http://nuiton.org/repositories/revision/topia/2680 Log: Update mavenpom4redmineAndCentral to 3.4.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-30 07:44:43 UTC (rev 2679) +++ trunk/pom.xml 2012-11-16 15:35:10 UTC (rev 2680) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.3</version> + <version>3.4.4</version> </parent> <artifactId>topia</artifactId>

1 0