July 2013 - Cantharella-commits - mailman.cloud.codelutin.com

r259 - in trunk: . cantharella.data cantharella.service cantharella.utils cantharella.web
by maven-release＠users.forge.codelutin.com July 2, 2013

July 2, 2013

Author: maven-release Date: 2013-07-02 19:47:49 +0200 (Tue, 02 Jul 2013) New Revision: 259 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/259 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/cantharella.data/pom.xml trunk/cantharella.service/pom.xml trunk/cantharella.utils/pom.xml trunk/cantharella.web/pom.xml trunk/pom.xml Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2013-07-02 17:47:41 UTC (rev 258) +++ trunk/cantharella.data/pom.xml 2013-07-02 17:47:49 UTC (rev 259) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.3</version> + <version>1.1.4-SNAPSHOT</version> </parent> <artifactId>cantharella.data</artifactId> Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2013-07-02 17:47:41 UTC (rev 258) +++ trunk/cantharella.service/pom.xml 2013-07-02 17:47:49 UTC (rev 259) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1.3</version> + <version>1.1.4-SNAPSHOT</version> </parent> <artifactId>cantharella.service</artifactId> Modified: trunk/cantharella.utils/pom.xml =================================================================== --- trunk/cantharella.utils/pom.xml 2013-07-02 17:47:41 UTC (rev 258) +++ trunk/cantharella.utils/pom.xml 2013-07-02 17:47:49 UTC (rev 259) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.3</version> + <version>1.1.4-SNAPSHOT</version> </parent> <artifactId>cantharella.utils</artifactId> Modified: trunk/cantharella.web/pom.xml =================================================================== --- trunk/cantharella.web/pom.xml 2013-07-02 17:47:41 UTC (rev 258) +++ trunk/cantharella.web/pom.xml 2013-07-02 17:47:49 UTC (rev 259) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1.3</version> + <version>1.1.4-SNAPSHOT</version> </parent> <artifactId>cantharella.web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-02 17:47:41 UTC (rev 258) +++ trunk/pom.xml 2013-07-02 17:47:49 UTC (rev 259) @@ -10,7 +10,7 @@ <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.3</version> + <version>1.1.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Cantharella</name> <description>Pharmacochemical database of natural substances</description> @@ -67,12 +67,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1.3</url> + <url>http://svn.forge.codelutin.com/svn/cantharella/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1… + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1… + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk </developerConnection> </scm>

1 0

r258 - tags
by maven-release＠users.forge.codelutin.com July 2, 2013

July 2, 2013

Author: maven-release Date: 2013-07-02 19:47:41 +0200 (Tue, 02 Jul 2013) New Revision: 258 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/258 Log: [maven-release-plugin] copy for tag cantharella-1.1.3 Added: tags/cantharella-1.1.3/

1 0

r257 - in trunk: . cantharella.data cantharella.service cantharella.utils cantharella.web
by maven-release＠users.forge.codelutin.com July 2, 2013

July 2, 2013

Author: maven-release Date: 2013-07-02 19:47:32 +0200 (Tue, 02 Jul 2013) New Revision: 257 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/257 Log: [maven-release-plugin] prepare release cantharella-1.1.3 Modified: trunk/cantharella.data/pom.xml trunk/cantharella.service/pom.xml trunk/cantharella.utils/pom.xml trunk/cantharella.web/pom.xml trunk/pom.xml Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2013-07-01 12:32:04 UTC (rev 256) +++ trunk/cantharella.data/pom.xml 2013-07-02 17:47:32 UTC (rev 257) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.3</version> </parent> <artifactId>cantharella.data</artifactId> Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2013-07-01 12:32:04 UTC (rev 256) +++ trunk/cantharella.service/pom.xml 2013-07-02 17:47:32 UTC (rev 257) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.3</version> </parent> <artifactId>cantharella.service</artifactId> Modified: trunk/cantharella.utils/pom.xml =================================================================== --- trunk/cantharella.utils/pom.xml 2013-07-01 12:32:04 UTC (rev 256) +++ trunk/cantharella.utils/pom.xml 2013-07-02 17:47:32 UTC (rev 257) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.3</version> </parent> <artifactId>cantharella.utils</artifactId> Modified: trunk/cantharella.web/pom.xml =================================================================== --- trunk/cantharella.web/pom.xml 2013-07-01 12:32:04 UTC (rev 256) +++ trunk/cantharella.web/pom.xml 2013-07-02 17:47:32 UTC (rev 257) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.3</version> </parent> <artifactId>cantharella.web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-01 12:32:04 UTC (rev 256) +++ trunk/pom.xml 2013-07-02 17:47:32 UTC (rev 257) @@ -10,7 +10,7 @@ <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.3</version> <packaging>pom</packaging> <name>Cantharella</name> <description>Pharmacochemical database of natural substances</description> @@ -67,12 +67,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/cantharella/trunk</url> + <url>http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1.3</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1… </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1… </developerConnection> </scm>

1 0

r256 - trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl
by echatellier＠users.forge.codelutin.com July 1, 2013

July 1, 2013

Author: echatellier Date: 2013-07-01 14:32:04 +0200 (Mon, 01 Jul 2013) New Revision: 256 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/256 Log: Remove specific case for admin Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2013-06-27 09:41:12 UTC (rev 255) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2013-07-01 12:32:04 UTC (rev 256) @@ -261,11 +261,6 @@ */ private SearchResult filterResults(SearchResult result, Utilisateur utilisateur) { - // no filtering - if (utilisateur.getTypeDroit() == TypeDroit.ADMINISTRATEUR) { - return result; - } - // get campagnes and lots data to manage rigths List<Campagne> campagnes = new ArrayList<Campagne>(); campagnes.addAll(utilisateur.getCampagnesCreees());

1 0