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

[Suiviobsmer-commits] r643 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 23 Aug '10

23 Aug '10

Author: fdesbois Date: 2010-08-23 18:05:14 +0000 (Mon, 23 Aug 2010) New Revision: 643 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 2010-08-23 18:05:10 UTC (rev 642) +++ trunk/pom.xml 2010-08-23 18:05:14 UTC (rev 643) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -299,9 +299,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.2</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.2</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.2?root=suiviob…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-08-23 18:05:10 UTC (rev 642) +++ trunk/wao-business/pom.xml 2010-08-23 18:05:14 UTC (rev 643) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -204,9 +204,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.2/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.2/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.2/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> </scm>  Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-08-23 18:05:10 UTC (rev 642) +++ trunk/wao-ui/pom.xml 2010-08-23 18:05:14 UTC (rev 643) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.2/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.2/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.2/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r642 - tags
by fdesbois＠users.labs.libre-entreprise.org 23 Aug '10

23 Aug '10

Author: fdesbois Date: 2010-08-23 18:05:10 +0000 (Mon, 23 Aug 2010) New Revision: 642 Log: [maven-release-plugin] copy for tag wao-1.5.2 Added: tags/wao-1.5.2/

1 0

[Suiviobsmer-commits] r641 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 23 Aug '10

23 Aug '10

Author: fdesbois Date: 2010-08-23 18:05:06 +0000 (Mon, 23 Aug 2010) New Revision: 641 Log: [maven-release-plugin] prepare release wao-1.5.2 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-23 18:02:57 UTC (rev 640) +++ trunk/pom.xml 2010-08-23 18:05:06 UTC (rev 641) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> <modules> <module>wao-ui</module> @@ -299,9 +299,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.2</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.2</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.2?root=suiviob…</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-08-23 18:02:57 UTC (rev 640) +++ trunk/wao-business/pom.xml 2010-08-23 18:05:06 UTC (rev 641) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -204,9 +204,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.2/?root=suivio…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.2/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.2/wao-business</developerConnection> </scm>  Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-08-23 18:02:57 UTC (rev 640) +++ trunk/wao-ui/pom.xml 2010-08-23 18:05:06 UTC (rev 641) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.2/?root=suivio…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.2/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.2/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r640 - trunk
by fdesbois＠users.labs.libre-entreprise.org 23 Aug '10

23 Aug '10

Author: fdesbois Date: 2010-08-23 18:02:57 +0000 (Mon, 23 Aug 2010) New Revision: 640 Log: comment nuiton repository, now available on maven central :) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-23 17:37:42 UTC (rev 639) +++ trunk/pom.xml 2010-08-23 18:02:57 UTC (rev 640) @@ -377,73 +377,73 @@ </mailingLists> - <repositories> +  -  +  - <repository> - <id>nuiton.release</id> - <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> +  +  +  +  +  +  +  +  +  +  +  +  -  +  - <repository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> +  +  +  +  +  +  +  +  +  +  +  +  - </repositories> +  - <pluginRepositories> +  -  +  - <pluginRepository> +  - <id>nuiton.release</id> - <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </pluginRepository> +  +  +  +  +  +  +  +  +  +  +  -  +  - <pluginRepository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </pluginRepository> +  +  +  +  +  +  +  +  +  +  +  +  - </pluginRepositories> +  </project>

1 0

[Suiviobsmer-commits] r639 - in trunk: . src/announcement wao-business/src/main/java/fr/ifremer/wao/service
by fdesbois＠users.labs.libre-entreprise.org 23 Aug '10

23 Aug '10

Author: fdesbois Date: 2010-08-23 17:37:42 +0000 (Mon, 23 Aug 2010) New Revision: 639 Log: Ano #2374 : change from user for contactDoneEmail Added: trunk/src/announcement/release-email-1.5.2.txt Modified: trunk/changelog.txt trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-08-11 14:51:10 UTC (rev 638) +++ trunk/changelog.txt 2010-08-23 17:37:42 UTC (rev 639) @@ -3,6 +3,15 @@ Historique des versions +1.5.2 +----- + +Anomalies ++++++++++ + +- [fdesbois] Ano #2374 : L'expéditeur lors de l'envoi du mail automatique + d'un contact avec embarquement programmé/réalisé n'est pas bon. + 1.5.1 ----- Added: trunk/src/announcement/release-email-1.5.2.txt =================================================================== --- trunk/src/announcement/release-email-1.5.2.txt (rev 0) +++ trunk/src/announcement/release-email-1.5.2.txt 2010-08-23 17:37:42 UTC (rev 639) @@ -0,0 +1,20 @@ + +La nouvelle version 1.5.1 de l'applicatif Wao est disponible ! + +Résolution d'anomalies : + +- L'expéditeur lors de l'envoi du mail automatique d'un contact avec + embarquement programmé/réalisé n'est pas bon. [fdesbois-Ano #2374] + +Documentation : + +http://suiviobsmer.labs.libre-entreprise.org/wao/ + +Téléchargement : + +https://labs.libre-entreprise.org/frs/?group_id=154 + +Cordialement, + +L'équipe Wao + 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 2010-08-11 14:51:10 UTC (rev 638) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-08-23 17:37:42 UTC (rev 639) @@ -936,6 +936,8 @@ ); email.addTo(observerEmail); + // ANO #2374 : use observerEmail as from user + email.setFrom(observerEmail); email.send(); // Update the contact

1 0

[Suiviobsmer-commits] r638 - trunk
by tchemit＠users.labs.libre-entreprise.org 11 Aug '10

11 Aug '10

Author: tchemit Date: 2010-08-11 14:51:10 +0000 (Wed, 11 Aug 2010) New Revision: 638 Log: Utilisation de mavenpom4labs 2.2.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-27 21:10:59 UTC (rev 637) +++ trunk/pom.xml 2010-08-11 14:51:10 UTC (rev 638) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.2.2.1</version> + <version>2.2.3</version> </parent> <groupId>fr.ifremer</groupId>

1 0

[Suiviobsmer-commits] r637 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 27 Jul '10

27 Jul '10

Author: fdesbois Date: 2010-07-27 21:10:59 +0000 (Tue, 27 Jul 2010) New Revision: 637 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 2010-07-27 21:10:50 UTC (rev 636) +++ trunk/pom.xml 2010-07-27 21:10:59 UTC (rev 637) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.1</version> + <version>1.5.2-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -299,9 +299,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.1</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.1</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.1?root=suiviob…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-07-27 21:10:50 UTC (rev 636) +++ trunk/wao-business/pom.xml 2010-07-27 21:10:59 UTC (rev 637) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.1</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -204,9 +204,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.1/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.1/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.1/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> </scm>  Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-07-27 21:10:50 UTC (rev 636) +++ trunk/wao-ui/pom.xml 2010-07-27 21:10:59 UTC (rev 637) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.1</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.1/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.1/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.1/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r636 - tags
by fdesbois＠users.labs.libre-entreprise.org 27 Jul '10

27 Jul '10

Author: fdesbois Date: 2010-07-27 21:10:50 +0000 (Tue, 27 Jul 2010) New Revision: 636 Log: [maven-release-plugin] copy for tag wao-1.5.1 Added: tags/wao-1.5.1/

1 0

[Suiviobsmer-commits] r635 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 27 Jul '10

27 Jul '10

Author: fdesbois Date: 2010-07-27 21:10:37 +0000 (Tue, 27 Jul 2010) New Revision: 635 Log: [maven-release-plugin] prepare release wao-1.5.1 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-27 21:06:56 UTC (rev 634) +++ trunk/pom.xml 2010-07-27 21:10:37 UTC (rev 635) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> <modules> <module>wao-ui</module> @@ -299,9 +299,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.1</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.1</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.1?root=suiviob…</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-07-27 21:06:56 UTC (rev 634) +++ trunk/wao-business/pom.xml 2010-07-27 21:10:37 UTC (rev 635) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -204,9 +204,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.1/?root=suivio…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.1/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.1/wao-business</developerConnection> </scm>  Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-07-27 21:06:56 UTC (rev 634) +++ trunk/wao-ui/pom.xml 2010-07-27 21:10:37 UTC (rev 635) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.1/?root=suivio…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.1/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.1/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r634 - in trunk: . src/announcement wao-business/src/main/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by fdesbois＠users.labs.libre-entreprise.org 27 Jul '10

27 Jul '10

Author: fdesbois Date: 2010-07-27 21:06:56 +0000 (Tue, 27 Jul 2010) New Revision: 634 Log: - Evo #2361 : Add BOARDING_EXPECTED in case to send email - Update changelog + use last Topia + add email announcement Added: trunk/src/announcement/release-email-1.5.1.txt Modified: trunk/changelog.txt trunk/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-07-25 17:31:49 UTC (rev 633) +++ trunk/changelog.txt 2010-07-27 21:06:56 UTC (rev 634) @@ -12,6 +12,7 @@ - [fdesbois] Evo #2370 : Cartographie contacts : modifier taille du camembert en fonction du nombre de contacts. - [fdesbois] Evo #2369 : Ajout filtres sur carte des contacts. +- [fdesbois] Evo #2361 : Mail automatique suite à un embarquement programmé. Anomalies +++++++++ @@ -22,7 +23,7 @@ Mise à jour librairies ++++++++++++++++++++++ -- **ToPIA** 2.4 -> 2.4.1 [http://maven-site.nuiton.org/topia/topia-persistence] +- **ToPIA** 2.4 -> 2.4.2 [http://maven-site.nuiton.org/topia/topia-persistence] - **EUGene** 2.1 -> 2.1.1 [http://maven-site.nuiton.org/eugene] 1.5 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-25 17:31:49 UTC (rev 633) +++ trunk/pom.xml 2010-07-27 21:06:56 UTC (rev 634) @@ -288,7 +288,7 @@ <i18n.version>1.2.2</i18n.version> <nuitonutils.version>1.3.1</nuitonutils.version> <nuitonweb.version>0.1</nuitonweb.version> - <topia.version>2.4.1</topia.version> + <topia.version>2.4.2</topia.version> <eugene.version>2.1.1</eugene.version> <tapestry.version>5.1.0.5</tapestry.version> Added: trunk/src/announcement/release-email-1.5.1.txt =================================================================== --- trunk/src/announcement/release-email-1.5.1.txt (rev 0) +++ trunk/src/announcement/release-email-1.5.1.txt 2010-07-27 21:06:56 UTC (rev 634) @@ -0,0 +1,32 @@ + +La nouvelle version 1.5.1 de l'applicatif Wao est disponible ! + +Nouveautés : + +- Cartographie contacts : modifier taille du camembert en fonction du nombre de + contacts. [fdesbois-Evo #2370] +- Ajout filtres sur carte des contacts. [fdesbois-Evo #2369] +- Mail automatique suite à un embarquement programmé. [fdesbois-Evo #2361] + +Résolution d'anomalies : + +- Une ligne du plan d'échantillonnage ne doit pas pouvoir être supprimée si + elle est liée à des contacts. [fdesbois-Ano #2366] + +Mise à jour librairie : + +- ToPIA 2.4 -> 2.4.2 [http://maven-site.nuiton.org/topia/topia-persistence] +- EUGene 2.1 -> 2.1.1 [http://maven-site.nuiton.org/eugene] + +Documentation : + +http://suiviobsmer.labs.libre-entreprise.org/wao/ + +Téléchargement : + +https://labs.libre-entreprise.org/frs/?group_id=154 + +Cordialement, + +L'équipe Wao + 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 2010-07-25 17:31:49 UTC (rev 633) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-07-27 21:06:56 UTC (rev 634) @@ -890,11 +890,16 @@ throws WaoBusinessException, TopiaException { // Do nothing in this case - if (!contact.getContactState().equals(ContactState.BOARDING_DONE) || - contact.getEmailSent()) { + if (contact.getEmailSent()) { return false; } + // Only for states BOARDING_DONE and BOARDING_EXPECTED + if (!contact.getContactState().equals(ContactState.BOARDING_DONE) && + !contact.getContactState().equals(ContactState.BOARDING_EXPECTED)) { + return false; + } + ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); // Retrieve existing contact Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-07-25 17:31:49 UTC (rev 633) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-07-27 21:06:56 UTC (rev 634) @@ -613,12 +613,22 @@ protected void addSendEmailScript() { // Ask user to send an email if not already sent if (contactEdited != null && !contactEdited.getEmailSent()) { - renderSupport.addScript("new ContactSendEmail('%s', '%s');", + + String confirmMessage = "Souhaitez vous envoyer un email de demande d\\'ajout " + "du navire à votre portefeuille Allegro afin de pouvoir " + - "saisir les données ?", + "saisir les données ?"; + + // TODO-fdesbois-2010-07-27 : manage array of states in JavaScript + renderSupport.addScript("new ContactSendEmail('%s', '%s');", + confirmMessage, // Check state BOARDING_DONE ContactState.BOARDING_DONE.name()); + + renderSupport.addScript("new ContactSendEmail('%s', '%s');", + confirmMessage, + // Check state BOARDING_EXPECTED + ContactState.BOARDING_EXPECTED.name()); } }

1 0