June 2013 - Wao-commits - mailman.cloud.codelutin.com

r1673 - in trunk: . wao-business wao-ui
by maven-release＠users.forge.codelutin.com June 7, 2013

June 7, 2013

Author: maven-release Date: 2013-06-07 16:33:40 +0200 (Fri, 07 Jun 2013) New Revision: 1673 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1673 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-07 14:33:32 UTC (rev 1672) +++ trunk/pom.xml 2013-06-07 14:33:40 UTC (rev 1673) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4.1</version> + <version>3.5-SNAPSHOT</version> <modules> <module>wao-business</module> @@ -355,12 +355,12 @@ <scm> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.4.1 + scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.4.1 + scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/wao/tags/wao-3.4.1</url> + <url>http://forge.codelutin.com/repositories/browse/wao/trunk</url> </scm> <distributionManagement> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2013-06-07 14:33:32 UTC (rev 1672) +++ trunk/wao-business/pom.xml 2013-06-07 14:33:40 UTC (rev 1673) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4.1</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2013-06-07 14:33:32 UTC (rev 1672) +++ trunk/wao-ui/pom.xml 2013-06-07 14:33:40 UTC (rev 1673) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4.1</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1672 - in tags: . wao-3.4.1
by maven-release＠users.forge.codelutin.com June 7, 2013

June 7, 2013

Author: maven-release Date: 2013-06-07 16:33:32 +0200 (Fri, 07 Jun 2013) New Revision: 1672 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1672 Log: [maven-release-plugin] copy for tag wao-3.4.1 Added: tags/wao-3.4.1/ Property changes on: tags/wao-3.4.1 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.idea target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

r1671 - in trunk: . wao-business wao-ui
by maven-release＠users.forge.codelutin.com June 7, 2013

June 7, 2013

Author: maven-release Date: 2013-06-07 16:33:24 +0200 (Fri, 07 Jun 2013) New Revision: 1671 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1671 Log: [maven-release-plugin] prepare release wao-3.4.1 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-07 14:26:24 UTC (rev 1670) +++ trunk/pom.xml 2013-06-07 14:33:24 UTC (rev 1671) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4.1-SNAPSHOT</version> + <version>3.4.1</version> <modules> <module>wao-business</module> @@ -355,12 +355,12 @@ <scm> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk + scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.4.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk + scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.4.1 </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/wao/trunk</url> + <url>http://forge.codelutin.com/repositories/browse/wao/tags/wao-3.4.1</url> </scm> <distributionManagement> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2013-06-07 14:26:24 UTC (rev 1670) +++ trunk/wao-business/pom.xml 2013-06-07 14:33:24 UTC (rev 1671) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4.1-SNAPSHOT</version> + <version>3.4.1</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2013-06-07 14:26:24 UTC (rev 1670) +++ trunk/wao-ui/pom.xml 2013-06-07 14:33:24 UTC (rev 1671) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4.1-SNAPSHOT</version> + <version>3.4.1</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1670 - in trunk: . wao-business wao-ui
by bleny＠users.forge.codelutin.com June 7, 2013

June 7, 2013

Author: bleny Date: 2013-06-07 16:26:24 +0200 (Fri, 07 Jun 2013) New Revision: 1670 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1670 Log: pom versions to 3.4.1 according to roadmap Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-07 08:14:31 UTC (rev 1669) +++ trunk/pom.xml 2013-06-07 14:26:24 UTC (rev 1670) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4.1-SNAPSHOT</version> <modules> <module>wao-business</module> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2013-06-07 08:14:31 UTC (rev 1669) +++ trunk/wao-business/pom.xml 2013-06-07 14:26:24 UTC (rev 1670) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2013-06-07 08:14:31 UTC (rev 1669) +++ trunk/wao-ui/pom.xml 2013-06-07 14:26:24 UTC (rev 1670) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1669 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com June 7, 2013

June 7, 2013

Author: bleny Date: 2013-06-07 10:14:31 +0200 (Fri, 07 Jun 2013) New Revision: 1669 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1669 Log: fixes #2611 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2013-05-31 13:23:24 UTC (rev 1668) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2013-06-07 08:14:31 UTC (rev 1669) @@ -1176,8 +1176,15 @@ throw new IllegalStateException(contactState + " should not lead to a mail sent"); } - for (WaoUser observer : contactReloaded.getAllObservers()) { + // in obsvente, only the main observer + List<WaoUser> observers = new LinkedList<WaoUser>(); + observers.add(contactReloaded.getMainObserver()); + if (obsProgram == ObsProgram.OBSMER && contactReloaded.getSecondaryObservers() != null) { + observers.addAll(contactReloaded.getSecondaryObservers()); + } + for (WaoUser observer : observers) { + boolean boatAlreadyInWallet = observer.getAllegroWalletByTopiaId(boatId) != null; if (boatAlreadyInWallet) {

1 0