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

r2696 - in branches/topia-2.6.x: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by tchemit＠users.nuiton.org 25 Nov '12

25 Nov '12

Author: tchemit Date: 2012-11-25 12:09:42 +0100 (Sun, 25 Nov 2012) New Revision: 2696 Url: http://nuiton.org/repositories/revision/topia/2696 Log: [maven-release-plugin] prepare for next development iteration 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 branches/topia-2.6.x/topia-service-security/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-11-25 11:09:40 UTC (rev 2695) +++ branches/topia-2.6.x/pom.xml 2012-11-25 11:09:42 UTC (rev 2696) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.7.1</version> + <version>2.7.2-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -467,9 +467,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.7.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.7.1</developerConnection> - <url>http://nuiton.org/projects/topia/repository/show/tags/topia-2.7.1</url> + <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://nuiton.org/projects/topia/repository/show/branches/topia-2.6.x</url> </scm> <distributionManagement> Modified: branches/topia-2.6.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/pom.xml 2012-11-25 11:09:40 UTC (rev 2695) +++ branches/topia-2.6.x/topia-persistence/pom.xml 2012-11-25 11:09:42 UTC (rev 2696) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.7.1</version> + <version>2.7.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-migration/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-migration/pom.xml 2012-11-25 11:09:40 UTC (rev 2695) +++ branches/topia-2.6.x/topia-service-migration/pom.xml 2012-11-25 11:09:42 UTC (rev 2696) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.7.1</version> + <version>2.7.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-replication/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-replication/pom.xml 2012-11-25 11:09:40 UTC (rev 2695) +++ branches/topia-2.6.x/topia-service-replication/pom.xml 2012-11-25 11:09:42 UTC (rev 2696) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.7.1</version> + <version>2.7.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-security/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-security/pom.xml 2012-11-25 11:09:40 UTC (rev 2695) +++ branches/topia-2.6.x/topia-service-security/pom.xml 2012-11-25 11:09:42 UTC (rev 2696) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.7.1</version> + <version>2.7.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2695 - in tags: . topia-2.7.1
by tchemit＠users.nuiton.org 25 Nov '12

25 Nov '12

Author: tchemit Date: 2012-11-25 12:09:40 +0100 (Sun, 25 Nov 2012) New Revision: 2695 Url: http://nuiton.org/repositories/revision/topia/2695 Log: [maven-release-plugin] copy for tag topia-2.7.1 Added: tags/topia-2.7.1/ Property changes on: tags/topia-2.7.1 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings .idea Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2694 - in branches/topia-2.6.x: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by tchemit＠users.nuiton.org 25 Nov '12

25 Nov '12

Author: tchemit Date: 2012-11-25 12:09:38 +0100 (Sun, 25 Nov 2012) New Revision: 2694 Url: http://nuiton.org/repositories/revision/topia/2694 Log: [maven-release-plugin] prepare release topia-2.7.1 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 branches/topia-2.6.x/topia-service-security/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-11-25 11:07:55 UTC (rev 2693) +++ branches/topia-2.6.x/pom.xml 2012-11-25 11:09:38 UTC (rev 2694) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.7.1-SNAPSHOT</version> + <version>2.7.1</version> <modules> <module>topia-persistence</module> @@ -467,9 +467,9 @@  <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://nuiton.org/projects/topia/repository/show/branches/topia-2.6.x</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.7.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.7.1</developerConnection> + <url>http://nuiton.org/projects/topia/repository/show/tags/topia-2.7.1</url> </scm> <distributionManagement> Modified: branches/topia-2.6.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/pom.xml 2012-11-25 11:07:55 UTC (rev 2693) +++ branches/topia-2.6.x/topia-persistence/pom.xml 2012-11-25 11:09:38 UTC (rev 2694) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.7.1-SNAPSHOT</version> + <version>2.7.1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-migration/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-migration/pom.xml 2012-11-25 11:07:55 UTC (rev 2693) +++ branches/topia-2.6.x/topia-service-migration/pom.xml 2012-11-25 11:09:38 UTC (rev 2694) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.7.1-SNAPSHOT</version> + <version>2.7.1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-replication/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-replication/pom.xml 2012-11-25 11:07:55 UTC (rev 2693) +++ branches/topia-2.6.x/topia-service-replication/pom.xml 2012-11-25 11:09:38 UTC (rev 2694) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.7.1-SNAPSHOT</version> + <version>2.7.1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-security/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-security/pom.xml 2012-11-25 11:07:55 UTC (rev 2693) +++ branches/topia-2.6.x/topia-service-security/pom.xml 2012-11-25 11:09:38 UTC (rev 2694) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.7.1-SNAPSHOT</version> + <version>2.7.1</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2693 - branches/topia-2.6.x/topia-persistence
by tchemit＠users.nuiton.org 25 Nov '12

25 Nov '12

Author: tchemit Date: 2012-11-25 12:07:55 +0100 (Sun, 25 Nov 2012) New Revision: 2693 Url: http://nuiton.org/repositories/revision/topia/2693 Log: use plugin version fro mavenpom property Modified: branches/topia-2.6.x/topia-persistence/pom.xml Modified: branches/topia-2.6.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/pom.xml 2012-11-25 11:06:54 UTC (rev 2692) +++ branches/topia-2.6.x/topia-persistence/pom.xml 2012-11-25 11:07:55 UTC (rev 2693) @@ -380,7 +380,7 @@ <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.8</version> + <version>${plexusPluginVersion}</version> </plugin> <plugin>

1 0

r2692 - branches/topia-2.6.x/topia-persistence
by tchemit＠users.nuiton.org 25 Nov '12

25 Nov '12

Author: tchemit Date: 2012-11-25 12:06:54 +0100 (Sun, 25 Nov 2012) New Revision: 2692 Url: http://nuiton.org/repositories/revision/topia/2692 Log: fix missing report plugin version Modified: branches/topia-2.6.x/topia-persistence/pom.xml Modified: branches/topia-2.6.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/pom.xml 2012-11-25 11:05:23 UTC (rev 2691) +++ branches/topia-2.6.x/topia-persistence/pom.xml 2012-11-25 11:06:54 UTC (rev 2692) @@ -385,6 +385,7 @@ <plugin> <artifactId>maven-invoker-plugin</artifactId> + <version>${invokerPluginVersion}</version> </plugin> </plugins> </reporting>

1 0

r2691 - branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/security
by tchemit＠users.nuiton.org 25 Nov '12

25 Nov '12

Author: tchemit Date: 2012-11-25 12:05:23 +0100 (Sun, 25 Nov 2012) New Revision: 2691 Url: http://nuiton.org/repositories/revision/topia/2691 Log: fixes #2458: Fix topia-service-security tests Modified: branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java Modified: branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java =================================================================== --- branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java 2012-11-25 11:05:03 UTC (rev 2690) +++ branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java 2012-11-25 11:05:23 UTC (rev 2691) @@ -33,7 +33,9 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestName; import org.nuiton.i18n.I18n; import org.nuiton.topia.TestHelper; import org.nuiton.topia.TopiaContext; @@ -80,20 +82,24 @@ * @author ruchaud */ public class TopiaSecurityTest { + private static final Log log = LogFactory.getLog(TopiaSecurityTest.class); + protected String dbPath; - protected static TopiaContext context; + protected TopiaContext context; - protected static TopiaSecurityService securityManager; + protected TopiaSecurityService securityManager; - protected static TopiaSecurityFactoryFilter factoryFilter; + protected TopiaSecurityFactoryFilter factoryFilter; // FIXME comment il trouve les autres tout seul ? // The grande question !!! protected static File tesDir; + protected static boolean init; + protected static String entitiesList = PersonImpl.class.getName() + "," + PetImpl.class.getName() + "," + @@ -128,7 +134,8 @@ config.setProperty("hibernate.connection.password", ""); config.setProperty("hibernate.connection.driver_class", "org.h2.Driver"); - config.setProperty("hibernate.connection.url", "jdbc:h2:" + new File(tesDir, "topia-security")); +// config.setProperty("hibernate.connection.url", "jdbc:h2:" + new File(tesDir, "topia-security")); + config.setProperty("hibernate.connection.url", "jdbc:h2:" + dbPath); // add this to use security service config.setProperty("topia.service.security", "org.nuiton.topia.security.TopiaSecurityServiceImpl"); @@ -275,7 +282,12 @@ @Before public void setUp() throws TopiaException { - initDatabase(); + dbPath = new File(tesDir, "topia-security").getAbsolutePath(); + if (!init) { + + initDatabase(); + init = true; + } context = TopiaContextFactory.getContext(getProperties()); securityManager = context.getService(TopiaSecurityService.class); factoryFilter = new TopiaSecurityFactoryFilter(securityManager); @@ -287,7 +299,6 @@ context.closeContext(); } } - @Test public void testLoginThimel() throws Exception { /* Authentification de l'utilisateur Thimel */ @@ -377,8 +388,8 @@ List<Person> findAllPerson = personDAO.findAll(); List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); - //Assert.assertEquals(3, personsLOAD.size()); - Assert.assertEquals(12, personsLOAD.size()); + Assert.assertEquals(3, personsLOAD.size()); +// Assert.assertEquals(12, personsLOAD.size()); List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); Assert.assertEquals(0, personsUPDATE.size()); @@ -419,24 +430,24 @@ List<Person> findAllPerson = personDAO.findAll(); List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); - //Assert.assertEquals(3, personsLOAD.size()); - Assert.assertEquals(15, personsLOAD.size()); + Assert.assertEquals(3, personsLOAD.size()); +// Assert.assertEquals(15, personsLOAD.size()); List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); - //Assert.assertEquals(3, personsUPDATE.size()); - Assert.assertEquals(15, personsUPDATE.size()); + Assert.assertEquals(3, personsUPDATE.size()); +// Assert.assertEquals(15, personsUPDATE.size()); /* Annimaux */ PetDAO petDAO = TopiaTestDAOHelper.getPetDAO(childContext); List<Pet> findAllPet = petDAO.findAll(); List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD); - //Assert.assertEquals(3, petLOAD.size()); - Assert.assertEquals(15, petLOAD.size()); + Assert.assertEquals(3, petLOAD.size()); +// Assert.assertEquals(15, petLOAD.size()); List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); - //Assert.assertEquals(3, petUPDATE.size()); - Assert.assertEquals(15, petUPDATE.size()); + Assert.assertEquals(3, petUPDATE.size()); +// Assert.assertEquals(15, petUPDATE.size()); return null; } }, null);

1 0

r2690 - in branches/topia-2.6.x: . topia-persistence
by tchemit＠users.nuiton.org 25 Nov '12

25 Nov '12

Author: tchemit Date: 2012-11-25 12:05:03 +0100 (Sun, 25 Nov 2012) New Revision: 2690 Url: http://nuiton.org/repositories/revision/topia/2690 Log: optimize dependencies Modified: branches/topia-2.6.x/pom.xml branches/topia-2.6.x/topia-persistence/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-11-25 10:01:19 UTC (rev 2689) +++ branches/topia-2.6.x/pom.xml 2012-11-25 11:05:03 UTC (rev 2690) @@ -67,6 +67,7 @@ <hibernateVersion>3.6.10.Final</hibernateVersion> <sl4jVersion>1.6.6</sl4jVersion> <h2Version>1.3.168</h2Version> + <hamcrestVersion>1.3</hamcrestVersion>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -170,6 +171,13 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>${hamcrestVersion}</version> + <scope>test</scope> + </dependency> + </dependencies> </dependencyManagement> Modified: branches/topia-2.6.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/pom.xml 2012-11-25 10:01:19 UTC (rev 2689) +++ branches/topia-2.6.x/topia-persistence/pom.xml 2012-11-25 11:05:03 UTC (rev 2690) @@ -134,6 +134,11 @@ </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </dependency> + + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>test</scope>

1 0

r2689 - branches/topia-2.6.x/topia-persistence/src/site/rst/user
by tchemit＠users.nuiton.org 25 Nov '12

25 Nov '12

Author: tchemit Date: 2012-11-25 11:01:19 +0100 (Sun, 25 Nov 2012) New Revision: 2689 Url: http://nuiton.org/repositories/revision/topia/2689 Log: fix typo Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/user/start_using_api.rst Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/user/start_using_api.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/user/start_using_api.rst 2012-11-25 09:59:33 UTC (rev 2688) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/user/start_using_api.rst 2012-11-25 10:01:19 UTC (rev 2689) @@ -166,7 +166,7 @@  <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> <executions> <!-- Cette exécution permet de rassembler tous les messages i18n

1 0

r2688 - branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 25 Nov '12

25 Nov '12

Author: tchemit Date: 2012-11-25 10:59:33 +0100 (Sun, 25 Nov 2012) New Revision: 2688 Url: http://nuiton.org/repositories/revision/topia/2688 Log: fixes #2457: Fix Hibernate mapping generator format Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2012-11-25 09:57:24 UTC (rev 2687) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2012-11-25 09:59:33 UTC (rev 2688) @@ -649,7 +649,7 @@ <%=prefix%> <key column="OWNER"/> }*/ if (needsIndex) { -/*{<%=prefix%> <list-index/> +/*{<%=prefix%> <list-index/> }*/ } /*{<%=prefix%> <element type="<%=attrType%>" column="<%=attrColumn%>" node="id"/> @@ -741,7 +741,7 @@ <%=prefix%> <key column="<%=reverseAttrDBName%>"/> }*/ if (needsIndex) { -/*{<%=prefix%> <list-index column="<%=reverseAttrDBName%>_idx"/> +/*{<%=prefix%> <list-index column="<%=reverseAttrDBName%>_idx"/> }*/ } /*{<%=prefix%> <many-to-many class="<%=attrType%>" column="<%=attrColumn%>" <%=orderBy%>node="topiaId"/>

1 0

r2687 - branches/topia-2.6.x
by tchemit＠users.nuiton.org 25 Nov '12

25 Nov '12

Author: tchemit Date: 2012-11-25 10:57:24 +0100 (Sun, 25 Nov 2012) New Revision: 2687 Url: http://nuiton.org/repositories/revision/topia/2687 Log: fixes #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:40:45 UTC (rev 2686) +++ branches/topia-2.6.x/pom.xml 2012-11-25 09:57:24 UTC (rev 2687) @@ -59,7 +59,7 @@ <projectId>topia</projectId>  - <eugeneVersion>2.5.6.1-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.5.6.1</eugeneVersion> <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> <processorPluginVersion>1.3</processorPluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion>

1 0