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

r1600 - trunk/wao-ui/src/main/resources
by fdesbois＠users.forge.codelutin.com April 12, 2012

April 12, 2012

Author: fdesbois Date: 2012-04-12 16:35:38 +0200 (Thu, 12 Apr 2012) New Revision: 1600 Url: http://forge.codelutin.com/repositories/revision/wao/1600 Log: fixes #1108 : add date on RollingFileAppender Modified: trunk/wao-ui/src/main/resources/log4j.properties Modified: trunk/wao-ui/src/main/resources/log4j.properties =================================================================== --- trunk/wao-ui/src/main/resources/log4j.properties 2012-04-06 15:30:25 UTC (rev 1599) +++ trunk/wao-ui/src/main/resources/log4j.properties 2012-04-12 14:35:38 UTC (rev 1600) @@ -38,7 +38,7 @@ log4j.appender.globalFile.Append=true log4j.appender.globalFile.Threshold=INFO log4j.appender.globalFile.layout=org.apache.log4j.PatternLayout -log4j.appender.globalFile.layout.ConversionPattern=%5p [%t] (%c:%L) %M - %m%n +log4j.appender.globalFile.layout.ConversionPattern=%d %5p [%t] (%c:%L) %M - %m%n log4j.logger.fr.ifremer.wao=INFO #log4j.logger.org.nuiton.utils=INFO

1 0

r1599 - in trunk: . wao-business wao-ui
by maven-release＠users.forge.codelutin.com April 6, 2012

April 6, 2012

Author: maven-release Date: 2012-04-06 17:30:25 +0200 (Fri, 06 Apr 2012) New Revision: 1599 Url: http://forge.codelutin.com/repositories/revision/wao/1599 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 2012-04-06 15:30:18 UTC (rev 1598) +++ trunk/pom.xml 2012-04-06 15:30:25 UTC (rev 1599) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.2</version> + <version>3.4-SNAPSHOT</version> <modules> <module>wao-business</module> @@ -354,12 +354,12 @@ <scm> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.3.2 + scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.3.2 + scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/wao/tags/wao-3.3.2</url> + <url>http://forge.codelutin.com/repositories/browse/wao/trunk</url> </scm> <distributionManagement> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2012-04-06 15:30:18 UTC (rev 1598) +++ trunk/wao-business/pom.xml 2012-04-06 15:30:25 UTC (rev 1599) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.2</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2012-04-06 15:30:18 UTC (rev 1598) +++ trunk/wao-ui/pom.xml 2012-04-06 15:30:25 UTC (rev 1599) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.2</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1598 - in tags: . wao-3.3.2
by maven-release＠users.forge.codelutin.com April 6, 2012

April 6, 2012

Author: maven-release Date: 2012-04-06 17:30:18 +0200 (Fri, 06 Apr 2012) New Revision: 1598 Url: http://forge.codelutin.com/repositories/revision/wao/1598 Log: [maven-release-plugin] copy for tag wao-3.3.2 Added: tags/wao-3.3.2/ Property changes on: tags/wao-3.3.2 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.idea target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

r1597 - in trunk: . wao-business wao-ui
by maven-release＠users.forge.codelutin.com April 6, 2012

April 6, 2012

Author: maven-release Date: 2012-04-06 17:30:11 +0200 (Fri, 06 Apr 2012) New Revision: 1597 Url: http://forge.codelutin.com/repositories/revision/wao/1597 Log: [maven-release-plugin] prepare release wao-3.3.2 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-06 14:35:04 UTC (rev 1596) +++ trunk/pom.xml 2012-04-06 15:30:11 UTC (rev 1597) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.2-SNAPSHOT</version> + <version>3.3.2</version> <modules> <module>wao-business</module> @@ -354,12 +354,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.3.2 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk + scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.3.2 </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/wao/trunk</url> + <url>http://forge.codelutin.com/repositories/browse/wao/tags/wao-3.3.2</url> </scm> <distributionManagement> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2012-04-06 14:35:04 UTC (rev 1596) +++ trunk/wao-business/pom.xml 2012-04-06 15:30:11 UTC (rev 1597) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.2-SNAPSHOT</version> + <version>3.3.2</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2012-04-06 14:35:04 UTC (rev 1596) +++ trunk/wao-ui/pom.xml 2012-04-06 15:30:11 UTC (rev 1597) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.2-SNAPSHOT</version> + <version>3.3.2</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1596 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components
by bleny＠users.forge.codelutin.com April 6, 2012

April 6, 2012

Author: bleny Date: 2012-04-06 16:35:04 +0200 (Fri, 06 Apr 2012) New Revision: 1596 Url: http://forge.codelutin.com/repositories/revision/wao/1596 Log: fixes #1088 OBSMER : carte ne s'affiche pas Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java 2012-04-03 13:28:44 UTC (rev 1595) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java 2012-04-06 14:35:04 UTC (rev 1596) @@ -139,8 +139,8 @@ List<String> selectedValues = getSelectedValues(); if (selectedValues != null) { for (String sv : selectedValues) { - if (!values.contains(sv)) { - values.add(selectedValue); + if (sv != null && !values.contains(sv)) { + values.add(sv); } } } @@ -151,7 +151,7 @@ @Override public int compare(String o1, String o2) { - return o1 == null ? -1 : o1.compareTo(o2); + return (o1 == null ? "" : o1).compareTo((o2 == null ? "" : o2)); } }); }

1 0

r1595 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com April 3, 2012

April 3, 2012

Author: bleny Date: 2012-04-03 15:28:44 +0200 (Tue, 03 Apr 2012) New Revision: 1595 Url: http://forge.codelutin.com/repositories/revision/wao/1595 Log: fixes #1079 La mail d'ajout au portefeille Allegro est envoy?\195?\169 plusieurs fois pour un m?\195?\170me utilisateur et un m?\195?\170me navire 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 2012-04-02 14:35:39 UTC (rev 1594) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2012-04-03 13:28:44 UTC (rev 1595) @@ -1135,10 +1135,12 @@ if (addBoatToObserversAllegroWallet) { - ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); + ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); - Contact contactReloaded = dao.findByTopiaId(contact.getTopiaId()); + WaoUserDAO waoUserDAO = WaoDAOHelper.getWaoUserDAO(transaction); + Contact contactReloaded = contactDAO.findByTopiaId(contact.getTopiaId()); + Boat boat = contactReloaded.getBoat(); String boatId = boat.getTopiaId(); @@ -1192,7 +1194,7 @@ email.send(); observer.addAllegroWallet(boat); - + waoUserDAO.update(observer); transaction.commitTransaction(); result = true;

1 0

r1594 - in trunk/wao-business/src/main: java/fr/ifremer/wao java/fr/ifremer/wao/service xmi
by bleny＠users.forge.codelutin.com April 2, 2012

April 2, 2012

Author: bleny Date: 2012-04-02 16:35:39 +0200 (Mon, 02 Apr 2012) New Revision: 1594 Url: http://forge.codelutin.com/repositories/revision/wao/1594 Log: ajout d'une contrainte d'unicit?\195?\169 sur la relation WaoUser AllegroWallet Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/xmi/wao.properties trunk/wao-business/src/main/xmi/wao.zargo Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2012-04-02 13:04:49 UTC (rev 1593) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2012-04-02 14:35:39 UTC (rev 1594) @@ -30,6 +30,9 @@ import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.bean.SynthesisId; import fr.ifremer.wao.bean.UserRole; +import org.apache.commons.lang3.tuple.Pair; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.hibernate.SQLQuery; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; @@ -39,6 +42,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -53,6 +57,11 @@ */ public class PostgresMigrationCallback extends WaoMigrationCallBack { + /** + * Logger + */ + private static final Log log = LogFactory.getLog(PostgresMigrationCallback.class); + @Override protected void createUserRoleColumn_1_1a(List<String> queries) { // Evo #2063 @@ -1133,4 +1142,41 @@ queries.add("CREATE INDEX idx_WaoUser_allegroWallet ON allegrowallet_waouser(waoUser); "); queries.add("CREATE INDEX idx_WaoUser_canReadBoats ON canreadboats_waouser(waoUser); "); } + + @Override + protected void addUniqueConstraintOnAllegroWallet_3_3_2(TopiaContextImplementor tx, List<String> queries) throws TopiaException { + + queries.add("DELETE FROM AllegroWallet_WaoUser"); + + SQLQuery query = tx.getHibernate(). + createSQLQuery("SELECT allegroWallet, waoUser FROM AllegroWallet_WaoUser;"); + + List<Object[]> result = query.list(); + + log.info(result.size() + " rows found in AllegroWallet_WaoUser relation in database"); + + Set<Pair<String, String>> associationsToPreserve = new HashSet<Pair<String, String>>(); + + String insertIntoAllegroWalletWaoUserSql = "INSERT INTO AllegroWallet_WaoUser (allegroWallet, waoUser) VALUES ('%s', '%s')"; + + for (Object[] row : result) { + + String allegroWalletTopiaId = (String) row[0]; + String waoUserTopiaId = (String) row[1]; + + boolean added = associationsToPreserve.add(Pair.of(allegroWalletTopiaId, waoUserTopiaId)); + + if (added) { + + queries.add(String.format(insertIntoAllegroWalletWaoUserSql, allegroWalletTopiaId, waoUserTopiaId)); + + } + } + + log.info(associationsToPreserve.size() + " rows will be preserved"); + + queries.add("ALTER TABLE AllegroWallet_WaoUser ADD CONSTRAINT AllegroWallet_WaoUser_pkey PRIMARY KEY (allegroWallet, waoUser)"); + + } + } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2012-04-02 13:04:49 UTC (rev 1593) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2012-04-02 14:35:39 UTC (rev 1594) @@ -191,7 +191,8 @@ VersionUtil.valueOf("3.0"), VersionUtil.valueOf("3.1"), VersionUtil.valueOf("3.2"), - VersionUtil.valueOf("3.3") + VersionUtil.valueOf("3.3"), + VersionUtil.valueOf("3.3.2") }; @Override @@ -641,4 +642,17 @@ protected abstract void deleteActivityCalendars_3_3(List<String> queries); + public void migrateTo_3_3_2(TopiaContextImplementor tx, + boolean showSql, + boolean showProgression) throws TopiaException { + + List<String> queries = new LinkedList<String>(); + + addUniqueConstraintOnAllegroWallet_3_3_2(tx, queries); + + String[] strings = queries.toArray(new String[queries.size()]); + executeSQL(tx, showSql, showProgression, strings); + } + + protected abstract void addUniqueConstraintOnAllegroWallet_3_3_2(TopiaContextImplementor tx, List<String> queries) throws TopiaException; } 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 2012-04-02 13:04:49 UTC (rev 1593) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2012-04-02 14:35:39 UTC (rev 1594) @@ -1149,14 +1149,14 @@ if (boatAlreadyInWallet) { - if (log.isDebugEnabled()) { - log.debug("user " + observer + " already has " + boat + " in his allegroWallet"); + if (log.isInfoEnabled()) { + log.info("user " + observer + " already has " + boat + " in his allegroWallet"); } } else { - if (log.isDebugEnabled()) { - log.debug("user " + observer + " miss " + boat + " in his allegroWallet, adding"); + if (log.isInfoEnabled()) { + log.info("user " + observer + " miss " + boat + " in his allegroWallet, adding"); } String observerEmail = observer.getLogin(); Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2012-04-02 13:04:49 UTC (rev 1593) +++ trunk/wao-business/src/main/xmi/wao.properties 2012-04-02 14:35:39 UTC (rev 1594) @@ -69,3 +69,5 @@ fr.ifremer.wao.entity.SampleRow.attribute.observers.tagValue.inverse=false fr.ifremer.wao.entity.WaoUser.attribute.SampleRow.tagValue.inverse=true + +fr.ifremer.wao.entity.WaoUser.attribute.allegroWallet.tagValue.unique=true Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ)

1 0

r1593 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.forge.codelutin.com April 2, 2012

April 2, 2012

Author: bleny Date: 2012-04-02 15:04:49 +0200 (Mon, 02 Apr 2012) New Revision: 1593 Url: http://forge.codelutin.com/repositories/revision/wao/1593 Log: descente d'un nouveau de log sur l'activation context dans la page Navires Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2012-03-30 09:12:41 UTC (rev 1592) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2012-04-02 13:04:49 UTC (rev 1593) @@ -162,8 +162,8 @@ boatSelectedImmatriculation = null; companyBoatInfos = null; - if (log.isInfoEnabled()) { - log.info("waoActivationContext " + waoActivationContext); + if (log.isTraceEnabled()) { + log.trace("waoActivationContext " + waoActivationContext); } if (waoActivationContext.getBoatImmatriculation() != null) { getBoatFilter().setBoatImmatriculation(

1 0