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

[Suiviobsmer-commits] r1037 - in trunk: wao-business/src/license wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/service wao-ui/src/license
by bleny＠users.labs.libre-entreprise.org Feb. 21, 2011

Feb. 21, 2011

Author: bleny Date: 2011-02-21 13:36:22 +0000 (Mon, 21 Feb 2011) New Revision: 1037 Log: third party licences + headers Modified: trunk/wao-business/src/license/THIRD-PARTY.properties trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactStateMotifImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/EntitiesTranslator.java trunk/wao-ui/src/license/THIRD-PARTY.properties Modified: trunk/wao-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-business/src/license/THIRD-PARTY.properties 2011-02-21 11:07:36 UTC (rev 1036) +++ trunk/wao-business/src/license/THIRD-PARTY.properties 2011-02-21 13:36:22 UTC (rev 1037) @@ -1,36 +1,17 @@ -### -# #%L -# Wao :: Business -# %% -# Copyright (C) 2009 - 2011 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License # - BSD license # - BSD style +# - CDDL 1.1 # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - GNU General Public Library # - GNU Lesser General Public License # - GNU Library or Lesser General Public License +# - GPL2 w/ CPE # - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 # - MIT License @@ -41,12 +22,9 @@ # Please fill the missing licenses for dependencies : # # -#Fri Nov 26 17:04:07 CET 2010 +#Mon Feb 21 12:11:54 CET 2011 antlr--antlr--2.7.6--jar=BSD -com.sun.xml.bind--jaxb-impl--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -com.sun.xml.bind--jaxb-xjc--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1--jar=BSD javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.xml.bind--jaxb-api--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactStateMotifImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactStateMotifImpl.java 2011-02-21 11:07:36 UTC (rev 1036) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactStateMotifImpl.java 2011-02-21 13:36:22 UTC (rev 1037) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoUtils; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/EntitiesTranslator.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/EntitiesTranslator.java 2011-02-21 11:07:36 UTC (rev 1036) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/EntitiesTranslator.java 2011-02-21 13:36:22 UTC (rev 1037) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.service; import fr.ifremer.wao.WaoDAOHelper; Modified: trunk/wao-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-ui/src/license/THIRD-PARTY.properties 2011-02-21 11:07:36 UTC (rev 1036) +++ trunk/wao-ui/src/license/THIRD-PARTY.properties 2011-02-21 13:36:22 UTC (rev 1037) @@ -2,14 +2,16 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Affero General Public License (AGPL) +# - Apache Software License - Version 2.0 # - Apache Software License 2.0 # - BSD License # - BSD license # - BSD style +# - CDDL 1.1 # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 +# - Eclipse Public License - Version 1.0 # - GNU General Public Library # - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 # - GNU Lesser General Public Licence @@ -17,6 +19,7 @@ # - GNU Lesser General Public License version 2.1 # - GNU Library or Lesser General Public License # - GPL, LGPL, MPL +# - GPL2 w/ CPE # - LGPL 2.1 # - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 @@ -32,15 +35,14 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 07 10:25:43 CET 2011 +#Mon Feb 21 12:16:55 CET 2011 antlr--antlr--2.7.6--jar=BSD -com.formos.tapestry--tapestry-testify--1.0.2--jar=The Apache Software License, Version 2.0 -com.sun.xml.bind--jaxb-impl--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -com.sun.xml.bind--jaxb-xjc--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +com.formos.tapestry--tapestry-testify--1.0.3--jar=no licence (see http://tapestry.formos.com/nightly/tapestry-testify/license.html) commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1--jar=BSD javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javax.servlet--servlet-api--2.5--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.xml.bind--jaxb-api--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +jetty--org.mortbay.jetty--5.1.12--jar=ASL 2.0 ognl--ognl--2.7.3--jar=The OpenSymphony Software License, Version 1.1 org.antlr--antlr-runtime--3.1.1--jar=BSD

1 0

[Suiviobsmer-commits] r1036 - in trunk: . wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org Feb. 21, 2011

Feb. 21, 2011

Author: bleny Date: 2011-02-21 11:07:36 +0000 (Mon, 21 Feb 2011) New Revision: 1036 Log: replacing call to nuiton-utils snapshot Modified: trunk/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-21 10:51:03 UTC (rev 1035) +++ trunk/pom.xml 2011-02-21 11:07:36 UTC (rev 1036) @@ -312,7 +312,7 @@  <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <nuitonUtilsVersion>2.1-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.0</nuitonUtilsVersion> <nuitonWebVersion>1.0</nuitonWebVersion> <topiaVersion>2.5.2</topiaVersion> <eugeneVersion>2.3</eugeneVersion> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-02-21 10:51:03 UTC (rev 1035) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-02-21 11:07:36 UTC (rev 1036) @@ -152,4 +152,13 @@ DateFormat dateFormat = new SimpleDateFormat(pattern, context.getLocale()); return dateFormat.format(date); } + + /** + * + * @deprecated should be replaced by StringUtil.isEmail + */ + @Deprecated + public static boolean isEmail(String str) { + return str.matches("^[a-z0-9!#$%&'*+/=?^_`{|}~-]+((\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)?)+@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9\\-]*[a-z0-9])?$"); + } } 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 2011-02-21 10:51:03 UTC (rev 1035) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-02-21 11:07:36 UTC (rev 1036) @@ -439,7 +439,7 @@ // sending the same e-mail to all of them for (WaoUser waoUser : waoUsers) { String userLogin = waoUser.getLogin(); - if (StringUtil.isEmail(userLogin)) { + if (WaoUtils.isEmail(userLogin)) { try { WaoUtils.sendEmail(userLogin, object, body); } catch (EmailException e) { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2011-02-21 10:51:03 UTC (rev 1035) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2011-02-21 11:07:36 UTC (rev 1036) @@ -31,6 +31,7 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.WaoQueryHelper; +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ConnectedUserImpl; import fr.ifremer.wao.bean.ObsProgram; @@ -253,7 +254,7 @@ transaction.commitTransaction(); try { - if (StringUtil.isEmail(user.getLogin()) && user.isPasswordChanged()) { + if (WaoUtils.isEmail(user.getLogin()) && user.isPasswordChanged()) { String subject = "[WAO] "; String msg = "Bonjour,\n\n"; if (isNewUser) {

1 0

[Suiviobsmer-commits] r1035 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org Feb. 21, 2011

Feb. 21, 2011

Author: bleny Date: 2011-02-21 10:51:03 +0000 (Mon, 21 Feb 2011) New Revision: 1035 Log: update pom for release Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-21 10:16:27 UTC (rev 1034) +++ trunk/pom.xml 2011-02-21 10:51:03 UTC (rev 1035) @@ -181,36 +181,21 @@ <artifactId>xercesImpl</artifactId> <version>2.9.1</version> </dependency> - <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> <version>1.3.03</version> </dependency> - -  -  -  -  -  -  -  -  -  -  -  <dependency> <groupId>net.sourceforge.javacsv</groupId> <artifactId>javacsv</artifactId> <version>2.0</version> </dependency> - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version> </dependency> -  <dependency> <groupId>com.h2database</groupId> @@ -228,12 +213,6 @@ <version>0.9.10-hudson-24</version> <scope>provided</scope> </dependency> -  <dependency> <groupId>com.formos.tapestry</groupId> <artifactId>tapestry-testify</artifactId> @@ -353,20 +332,13 @@ scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </connection> <developerConnection> - scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </developerConnection> <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer </url> </scm> <build> -  - <pluginManagement> <plugins> @@ -433,74 +405,4 @@ </mailingList> </mailingLists> - -  - -  - -  -  -  -  -  -  -  -  -  -  -  -  - -  - -  -  -  -  -  -  -  -  -  -  -  -  - -  - -  - -  - -  - -  -  -  -  -  -  -  -  -  -  -  - -  - -  -  -  -  -  -  -  -  -  -  -  -  - -  - </project> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-02-21 10:16:27 UTC (rev 1034) +++ trunk/wao-business/pom.xml 2011-02-21 10:51:03 UTC (rev 1035) @@ -88,16 +88,7 @@ <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> - </dependency> -  -  -  -  -  -  -  -  -  + </dependency> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> @@ -116,11 +107,6 @@ <artifactId>h2</artifactId> <scope>test</scope> </dependency> -  -  -  -  -  <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -250,21 +236,8 @@ scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business </connection> <developerConnection> - scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business </developerConnection> </scm> - -  -  -  -  -  -  -  -  -  -  -  - </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-02-21 10:16:27 UTC (rev 1034) +++ trunk/wao-ui/pom.xml 2011-02-21 10:51:03 UTC (rev 1035) @@ -316,7 +316,7 @@ scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </connection> <developerConnection> - scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </developerConnection> </scm>

1 0

[Suiviobsmer-commits] r1034 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-ui/src/main/java/fr/ifremer/wao/ui/services
by bleny＠users.labs.libre-entreprise.org Feb. 21, 2011

Feb. 21, 2011

Author: bleny Date: 2011-02-21 10:16:27 +0000 (Mon, 21 Feb 2011) New Revision: 1034 Log: add trace to show where i18n bug is from Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2011-02-18 17:14:56 UTC (rev 1033) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2011-02-21 10:16:27 UTC (rev 1034) @@ -495,6 +495,23 @@ protected Locale initialValue() { return Locale.FRENCH; } + + @Override + public Locale get() { + Locale locale = super.get(); + if (log.isTraceEnabled()) { + log.trace("thread " + Thread.currentThread().getName() + " get locale " + locale); + } + return locale; + } + + @Override + public void set(Locale locale) { + if (log.isTraceEnabled()) { + log.trace("thread " + Thread.currentThread().getName() + " set locale to " + locale); + } + super.set(locale); + } }; @Override Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-02-18 17:14:56 UTC (rev 1033) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-02-21 10:16:27 UTC (rev 1034) @@ -132,7 +132,7 @@ public static final String dateTimePattern = "dd/MM/yyyy HH:mm"; public static final String timePattern = "HH:mm"; - public static String formatMonthTime(Date date) { + public static String formatMonth(Date date) { return formatDate(date, monthPattern); } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2011-02-18 17:14:56 UTC (rev 1033) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2011-02-21 10:16:27 UTC (rev 1034) @@ -291,10 +291,10 @@ public void changeLocale() { Locale currentLocale = getCurrentLocale(); Locale newLocale; - if (Locale.ENGLISH.equals(currentLocale)) { + if (Locale.FRENCH.equals(currentLocale)) { + newLocale = Locale.ENGLISH; + } else { newLocale = Locale.FRENCH; - } else { - newLocale = Locale.ENGLISH; } localeService.set(newLocale); context.setLocale(newLocale);

1 0

[Suiviobsmer-commits] r1033 - trunk
by bleny＠users.labs.libre-entreprise.org Feb. 18, 2011

Feb. 18, 2011

Author: bleny Date: 2011-02-18 17:14:56 +0000 (Fri, 18 Feb 2011) New Revision: 1033 Log: update chenillekit Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-18 14:50:26 UTC (rev 1032) +++ trunk/pom.xml 2011-02-18 17:14:56 UTC (rev 1033) @@ -103,7 +103,7 @@ <dependency> <groupId>org.chenillekit</groupId> <artifactId>chenillekit-tapestry</artifactId> - <version>1.3.0</version> + <version>1.3.2</version> <exclusions> <exclusion> <groupId>jboss</groupId>

1 0

[Suiviobsmer-commits] r1032 - trunk/wao-business/src/main/java/fr/ifremer/wao
by bleny＠users.labs.libre-entreprise.org Feb. 18, 2011

Feb. 18, 2011

Author: bleny Date: 2011-02-18 14:50:26 +0000 (Fri, 18 Feb 2011) New Revision: 1032 Log: add reference modification due to user imported bad data and cannot remove it Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-02-18 11:16:03 UTC (rev 1031) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-02-18 14:50:26 UTC (rev 1032) @@ -785,4 +785,10 @@ "locale CHARACTER VARYING(30)," + "\"text\" TEXT);"); } + + @Override + protected void correctFishingZoneReferential_2_1(List<String> queries) { + // Here we deal with a user who want to update data but miss the feature in Wao + queries.add("UPDATE FishingZone SET districtCode='GSA07' WHERE topiaId='fr.ifremer.wao.entity.FishingZone#1264666466997#0.7383156631150655'"); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2011-02-18 11:16:03 UTC (rev 1031) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2011-02-18 14:50:26 UTC (rev 1032) @@ -129,6 +129,8 @@ protected abstract void addTranslations_2_1(List<String> queries); + protected abstract void correctFishingZoneReferential_2_1(List<String> queries); + protected static final Version[] VERSIONS = new Version[] { VersionUtil.valueOf("1.0"), VersionUtil.valueOf("1.1"), @@ -454,6 +456,8 @@ addTranslations_2_1(queries); + correctFishingZoneReferential_2_1(queries); + String[] strings = queries.toArray(new String[queries.size()]); executeSQL(tx, showSql, showProgression, strings); }

1 0

[Suiviobsmer-commits] r1031 - trunk/wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Feb. 18, 2011

Feb. 18, 2011

Author: bleny Date: 2011-02-18 11:16:03 +0000 (Fri, 18 Feb 2011) New Revision: 1031 Log: hide feature for professionnal Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-02-18 10:28:16 UTC (rev 1030) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-02-18 11:16:03 UTC (rev 1031) @@ -339,9 +339,11 @@ <img src="${asset:context:}/img/boat-unavailable-22px.png" alt="Navire impossible" /> </p:else> </t:if> - <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> - <img src="${asset:context:}/img/clock-22px.png" alt="Historique" title="Voir historique de la ligne"/> - </a> + <t:unless test="user.professional"> + <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> + <img src="${asset:context:}/img/clock-22px.png" alt="Historique" title="Voir historique de la ligne"/> + </a> + </t:unless> </t:unless> <t:if t:test="canEditSampleRow()"> <a t:type="pagelink" t:page="sampleRowForm" t:context="row.topiaId">

1 0

[Suiviobsmer-commits] r1030 - trunk/wao-business/src/main/java/fr/ifremer/wao
by bleny＠users.labs.libre-entreprise.org Feb. 18, 2011

Feb. 18, 2011

Author: bleny Date: 2011-02-18 10:28:16 +0000 (Fri, 18 Feb 2011) New Revision: 1030 Log: fix query when filtering on multiple line code Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-02-18 09:33:45 UTC (rev 1029) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-02-18 10:28:16 UTC (rev 1030) @@ -246,15 +246,12 @@ } } - query.addEquals(sampleRowProperty.$alias(), new Object[]{ - filter.getSampleRows().toArray( - new SampleRow[filter.getSampleRows().size()])}); - // another implementation for above line : (not tested) - // List<String> sampleRowsCodes = new ArrayList<String>(sampleRows.size()); - // for (SampleRow row : sampleRows) { - // sampleRowsCodes.add(row.getCode()); - // } - // query.addEquals(SampleRow.CODE, sampleRowsCodes.toArray(new String[sampleRowsCodes.size()])); + List<SampleRow> sampleRows = filter.getSampleRows(); + List<String> sampleRowsCodes = new ArrayList<String>(sampleRows.size()); + for (SampleRow row : sampleRows) { + sampleRowsCodes.add(row.getCode()); + } + query.addEquals(sampleRowProperty.code(), sampleRowsCodes.toArray(new String[sampleRowsCodes.size()])); if (logger.isDebugEnabled()) { logger.debug("query for filtering multiple rows is " + query);

1 0

[Suiviobsmer-commits] r1029 - in trunk: wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org Feb. 18, 2011

Feb. 18, 2011

Author: bleny Date: 2011-02-18 09:33:45 +0000 (Fri, 18 Feb 2011) New Revision: 1029 Log: sampling plan cut for ObsVente Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java 2011-02-17 17:27:22 UTC (rev 1028) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java 2011-02-18 09:33:45 UTC (rev 1029) @@ -58,6 +58,8 @@ } else if (row.getObsProgram() == ObsProgram.OBSVENTE) { facade = row.getTerrestrialLocation().getCoastFAOName(); sectors = row.getTerrestrialLocation().getCountryName(); + } else { + throw new IllegalArgumentException("obsProgram " + row.getObsProgram()); } // Prepare sectors Map Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-02-17 17:27:22 UTC (rev 1028) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-02-18 09:33:45 UTC (rev 1029) @@ -497,7 +497,7 @@ addLeftJoin(sampleRowProperty.fishingZone(), fishingZoneProperty.$alias(), false). addLeftJoin(sampleRowProperty.terrestrialLocation(), terrestrialLocationProperty.$alias(), false). addLeftJoin(sampleRowProperty.dCF5Code(), dcf5CodeProperty.$alias(), false). - // Order By facade, sector, districtCode, sampleRowCode + // Order By terrestrial location addOrder(terrestrialLocationProperty.coastFAOName(), terrestrialLocationProperty.countryName(), sampleRowProperty.code()); @@ -514,6 +514,8 @@ List<SampleRow> results = dao.findAllByQuery(query); for (SampleRow row : results) { + row.sizeSampleRowLog(); // force load + // use FacadeRow to complete ordering using maps result.addRow(row); } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2011-02-17 17:27:22 UTC (rev 1028) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2011-02-18 09:33:45 UTC (rev 1029) @@ -42,10 +42,12 @@ import fr.ifremer.wao.ui.data.ExportStreamResponse; import fr.ifremer.wao.ui.data.RequiresAuthentication; import fr.ifremer.wao.ui.services.WaoManager; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.BooleanUtils; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; @@ -321,20 +323,49 @@ return months; } + @Log public boolean isFacadeChanged() { - if (!row.getFacade().equals(currentFacadeName)) { - currentFacadeName = row.getFacade(); - return true; + boolean facadeChanged = false; + if (row.getObsProgram().equals(ObsProgram.OBSMER)) { + if (!row.getFacade().equals(currentFacadeName)) { + currentFacadeName = row.getFacade(); + facadeChanged = true; + } + } else if (row.getObsProgram().equals(ObsProgram.OBSVENTE)) { + if (!row.getTerrestrialLocation().getCoastFAOName().equals(currentFacadeName)) { + currentFacadeName = row.getTerrestrialLocation().getCoastFAOName(); + facadeChanged = true; + } + } else { + throw new IllegalArgumentException("obsProgram " + row.getObsProgram()); } - return false; + + if (facadeChanged) { + // reset currentSectorName to force re-print even if + // it's the same + currentSectorName = null; + } + + return facadeChanged; } + @Log public boolean isSectorChanged() { - if (!row.getSectors().equals(currentSectorName)) { - currentSectorName = row.getSectors(); - return true; + boolean sectorChanged = false; + if (row.getObsProgram().equals(ObsProgram.OBSMER)) { + if (!row.getSectors().equals(currentSectorName)) { + currentSectorName = row.getSectors(); + sectorChanged = true; + } + } else if (row.getObsProgram().equals(ObsProgram.OBSVENTE)) { + if (!row.getTerrestrialLocation().getCountryName().equals(currentSectorName)) { + currentSectorName = row.getTerrestrialLocation().getCountryName(); + sectorChanged = true; + } + } else { + throw new IllegalArgumentException("obsProgram " + row.getObsProgram()); } - return false; + return sectorChanged; } public String getCompanyName() { @@ -662,10 +693,8 @@ } public boolean isRowModified() { - // XXX bleny 20101105 this is a dirty hack. Actually, we should test - // CollectionUtils.isEmpty(row.getSampleRowLog()) - // but it's not initialized by hibernate - return row.getTopiaVersion() > 1; + boolean rowHasHistoric = CollectionUtils.isNotEmpty(row.getSampleRowLog()); + return rowHasHistoric; } }

1 0

[Suiviobsmer-commits] r1028 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/i18n wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Feb. 17, 2011

Feb. 17, 2011

Author: bleny Date: 2011-02-17 17:27:22 +0000 (Thu, 17 Feb 2011) New Revision: 1028 Log: misc fixes Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties trunk/wao-ui/src/main/webapp/Cartography.tml trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-02-17 15:33:11 UTC (rev 1027) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-02-17 17:27:22 UTC (rev 1028) @@ -234,7 +234,7 @@ // FishingZone filter (sectorName OR facadeName) if (logger.isDebugEnabled()) { - logger.debug("CollectionUtils.isNotEmpty(filter.getSampleRows())" + + logger.debug("CollectionUtils.isNotEmpty(filter.getSampleRows()) == " + CollectionUtils.isNotEmpty(filter.getSampleRows())); } @@ -242,7 +242,7 @@ if (logger.isDebugEnabled()) { for (SampleRow row : filter.getSampleRows()) { - logger.debug("sampleRows contains row " + row); + logger.debug("sampleRows contains row " + row.getCode()); } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-02-17 15:33:11 UTC (rev 1027) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-02-17 17:27:22 UTC (rev 1028) @@ -262,7 +262,7 @@ public SamplingFilter getFilter() throws WaoException { if (dataSamplingFilter == null) { dataSamplingFilter = new SamplingFilterImpl(); - if (!user.isAdmin()) { + if (user.isCoordinatorOrObserver()) { dataSamplingFilter.setCompany(user.getCompany()); } dataSamplingFilter.setObsProgram(user.getProfile().getObsProgram()); Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-02-17 15:33:11 UTC (rev 1027) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-02-17 17:27:22 UTC (rev 1028) @@ -44,6 +44,7 @@ wao.ui.boatinfo.title=Infos about %s wao.ui.boats.associatedLine=Sample row(s) associated with this boat wao.ui.boats.nbObservations=%s observation(s), %s with your company (all programs considered) +wao.ui.cartography.help=Click on the graphs to get the details. wao.ui.cartography.title=Dispatching of the contacts among boat districts wao.ui.cartography.title.company=Dispatching of the contacts among boat districts for company %s wao.ui.chart.boardingsSince=Queries since %s Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-02-17 15:33:11 UTC (rev 1027) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-02-17 17:27:22 UTC (rev 1028) @@ -44,6 +44,7 @@ wao.ui.boatinfo.title=Informations sur %s wao.ui.boats.associatedLine=Ligne(s) du plan associ\u00E9e(s) \u00E0 ce navire wao.ui.boats.nbObservations=%s observation(s) dont %s avec votre soci\u00E9t\u00E9 +wao.ui.cartography.help=Cliquez sur les graphiques pour avoir le d\u00E9tail. wao.ui.cartography.title=R\u00E9partition des contacts par quartier des navires wao.ui.cartography.title.company=R\u00E9partition des contacts par quartier des navires pour la soci\u00E9t\u00E9 %s wao.ui.chart.boardingsSince=Nombre de sollicitations depuis le %s Modified: trunk/wao-ui/src/main/webapp/Cartography.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Cartography.tml 2011-02-17 15:33:11 UTC (rev 1027) +++ trunk/wao-ui/src/main/webapp/Cartography.tml 2011-02-17 17:27:22 UTC (rev 1028) @@ -94,13 +94,17 @@  </t:zone> - <p class="mtop5"> + <p class="mtop10"> <input t:type="submit" class="ico search" value="Search" t:title="${message:wao.ui.action.filter}" /> <input t:type="submit" class="ico undo22px" t:id="reset" value="Reset" title="${message:wao.ui.action.resetFields}" /> </p> </form> </div> + <p class="mtop30" style="text-align: center; font-size: 80%;"> + ${message:wao.ui.cartography.help} + </p> + <t:if test="user.obsMer"> <div class="acenter mtop30"> <a href="mailto:obsmer at ifremer.fr" title="${message:wao.ui.action.contactAdmin}"> Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-02-17 15:33:11 UTC (rev 1027) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-02-17 17:27:22 UTC (rev 1028) @@ -226,9 +226,11 @@ </a> <t:if test="rowModified"> <t:unless test="user.observer"> - <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> - <img src="${asset:context:}/img/clock-22px.png" class="fright" alt=" * " title="Cette ligne a été modifiée (voir l'historique)"/> - </a> + <t:unless test="user.professional"> + <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> + <img src="${asset:context:}/img/clock-22px.png" class="fright" alt=" * " title="Cette ligne a été modifiée (voir l'historique)"/> + </a> + </t:unless> </t:unless> </t:if> </td>

1 0