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

r2167 - in trunk/wao-web/src/main/webapp/WEB-INF/content: . obsmer obsvente
by bleny＠users.forge.codelutin.com 24 Jul '14

24 Jul '14

Author: bleny Date: 2014-07-24 11:24:17 +0200 (Thu, 24 Jul 2014) New Revision: 2167 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2167 Log: fixes #5506 add missing method in some links Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp 2014-07-24 09:21:11 UTC (rev 2166) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp 2014-07-24 09:24:17 UTC (rev 2167) @@ -169,7 +169,7 @@ </tbody> </table> - <s:url action="contacts" id="viewAssociatedContactsForBoatUrl"> + <s:url action="contacts!applyFilter" id="viewAssociatedContactsForBoatUrl"> <s:param name="filter.boatFilter.registrationCode" value="boatDetails.boatInfos.boat.immatriculation"/> <s:param name="filter.sampleRowFilter.companyIds" value="boatDetails.boatInfos.company.topiaId"/> <s:param name="filter.periodFrom"/> @@ -345,7 +345,7 @@ <s:text name="wao.ui.field.Boat.shipOwner"/> </th> <td class="no-border-top"> - <s:url action="boats" id="shipOwnerBoatsUrl"> + <s:url action="boats!applyFilter" id="shipOwnerBoatsUrl"> <s:param name="filter.shipOwnerIds" value="boatDetails.boatInfos.boat.shipOwner.topiaId"/> </s:url> <s:set name="shipOwnerBoatsTitle"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-07-24 09:21:11 UTC (rev 2166) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-07-24 09:24:17 UTC (rev 2167) @@ -470,7 +470,7 @@ </li> </s:if> <li> - <s:url action="sampling-plan" id="sampleRowZoomUrl"> + <s:url action="sampling-plan!applyFilter" id="sampleRowZoomUrl"> <s:param name="filter.periodFrom" value="%{formatMonth(firstSampleMonthDate)}"/> <s:param name="filter.periodTo" value="%{formatMonth(lastSampleMonthDate)}"/> <s:param name="filter.companyIds" value="%{filter.companyIds}"/> @@ -487,7 +487,7 @@ </li> <s:if test="authenticatedWaoUser.authorizedToViewBoats && elligibleBoatsProvided"> <li> - <s:url action="boats" id="viewElligibleBoatsUrl"> + <s:url action="boats!applyFilter" id="viewElligibleBoatsUrl"> <s:param name="filter.elligibleForSampleRowsFilter.sampleRowCodes" value="code" /> </s:url> <s:a href="%{viewElligibleBoatsUrl}"> @@ -497,7 +497,7 @@ </s:if> <s:if test="authenticatedWaoUser.authorizedToViewContacts && sampleRowContactCounts > 0"> <li> - <s:url action="contacts" id="viewAssociatedContactsUrl"> + <s:url action="contacts!applyFilter" id="viewAssociatedContactsUrl"> <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> <s:param name="filter.periodFrom" /> <s:param name="filter.periodTo" /> @@ -509,7 +509,7 @@ </s:if> <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable"> <li> - <s:url action="boats" id="createAssociatedContactUrl"> + <s:url action="boats!applyFilter" id="createAssociatedContactUrl"> <s:param name="startBoatSelectionForSampleRowId" value="sampleRowId" /> </s:url> <s:a href="%{createAssociatedContactUrl}"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-07-24 09:21:11 UTC (rev 2166) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-07-24 09:24:17 UTC (rev 2167) @@ -443,7 +443,7 @@ </li> </s:if> <li> - <s:url action="sampling-plan" id="sampleRowZoomUrl"> + <s:url action="sampling-plan!applyFilter" id="sampleRowZoomUrl"> <s:param name="filter.periodFrom" value="%{formatMonth(firstSampleMonthDate)}"/> <s:param name="filter.periodTo" value="%{formatMonth(lastSampleMonthDate)}"/> <s:param name="filter.companyIds" value="%{filter.companyIds}"/> @@ -460,7 +460,7 @@ </li> <s:if test="authenticatedWaoUser.authorizedToViewBoats && elligibleBoatsProvided"> <li> - <s:url action="boats" id="viewElligibleBoatsUrl"> + <s:url action="boats!applyFilter" id="viewElligibleBoatsUrl"> <s:param name="filter.elligibleForSampleRowsFilter.sampleRowCodes" value="code" /> </s:url> <s:a href="%{viewElligibleBoatsUrl}"> @@ -470,7 +470,7 @@ </s:if> <s:if test="authenticatedWaoUser.authorizedToViewContacts && sampleRowContactCounts > 0"> <li> - <s:url action="contacts" id="viewAssociatedContactsUrl"> + <s:url action="contacts!applyFilter" id="viewAssociatedContactsUrl"> <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> <s:param name="filter.periodFrom" /> <s:param name="filter.periodTo" /> @@ -482,7 +482,7 @@ </s:if> <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable"> <li> - <s:url action="boats" id="createAssociatedContactUrl"> + <s:url action="boats!applyFilter" id="createAssociatedContactUrl"> <s:param name="startBoatSelectionForSampleRowId" value="sampleRowId" /> </s:url> <s:a href="%{createAssociatedContactUrl}">

1 0

r2166 - trunk/wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com 24 Jul '14

24 Jul '14

Author: bleny Date: 2014-07-24 11:21:11 +0200 (Thu, 24 Jul 2014) New Revision: 2166 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2166 Log: add debug logs for locales Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java 2014-07-24 09:20:31 UTC (rev 2165) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java 2014-07-24 09:21:11 UTC (rev 2166) @@ -22,12 +22,18 @@ */ import fr.ifremer.wao.WaoApplicationConfig; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.web.struts2.BaseAction; +import java.util.Locale; + public class WaoActionSupport extends BaseAction { private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(WaoActionSupport.class); + protected WaoApplicationConfig applicationConfig; protected WaoSession session; @@ -51,4 +57,13 @@ public void setFragment(boolean fragment) { // ignore fragment get parameter: it's managed by sitemesh decorators } + + @Override + public Locale getLocale() { + Locale locale = super.getLocale(); + if (log.isDebugEnabled()) { + log.debug("locale is " + locale); + } + return locale; + } }

1 0

r2165 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com 24 Jul '14

24 Jul '14

Author: bleny Date: 2014-07-24 11:20:31 +0200 (Thu, 24 Jul 2014) New Revision: 2165 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2165 Log: refs #5487 add trace on NPE found in logs Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-07-24 09:19:09 UTC (rev 2164) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-07-24 09:20:31 UTC (rev 2165) @@ -680,6 +680,11 @@ SampleMonth month = sampleRow.getSampleMonth(observationBeginDate); + Preconditions.checkState( + month != null, + "for contact " + contact.getTopiaId() + " and observation begin date " + + observationBeginDate + ", unable to find sample month"); + month.setEstimatedTidesValue(month.getEstimatedTidesValue() + 1); if (BooleanUtils.isTrue(contact.getValidationCompany())) {

1 0

r2164 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com 24 Jul '14

24 Jul '14

Author: bleny Date: 2014-07-24 11:19:09 +0200 (Thu, 24 Jul 2014) New Revision: 2164 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2164 Log: add debug logs for locales Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-07-24 09:18:39 UTC (rev 2163) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-07-24 09:19:09 UTC (rev 2164) @@ -52,6 +52,7 @@ import java.util.Date; import java.util.LinkedHashSet; import java.util.List; +import java.util.Locale; public class ObsMerSamplingPlanService extends SamplingPlanService { @@ -61,6 +62,11 @@ AuthenticatedWaoUser authenticatedWaoUser, SampleRowsFilter sampleRowsFilter) { + Locale locale = serviceContext.getLocale(); + if (log.isDebugEnabled()) { + log.debug("a sampling plan with locale " + locale + " is asked"); + } + Optional<String> optionalCompanyId = Optional.absent(); if (authenticatedWaoUser.isCoordinatorOrObserver()) { optionalCompanyId = Optional.of(authenticatedWaoUser.getCompany().getTopiaId()); @@ -68,7 +74,7 @@ SamplingPlanCacheKey samplingPlanCacheKey = new SamplingPlanCacheKey( - serviceContext.getLocale(), + locale, optionalCompanyId, sampleRowsFilter); @@ -87,7 +93,7 @@ // creation du plan d'echantillonnage ObsMerSamplingPlanBuilder builder = new ObsMerSamplingPlanBuilder( - serviceContext.getLocale(), + locale, optionalCompanyId, sampleRowsFilter); @@ -199,7 +205,6 @@ // temps de mer réalisé par ligne du plan = somme [arrondi-supérieur (nb d'heures total de la marée/ 24)] - // TODO brendan 05/06/14 issue #5188 long real = 0; long estimated = 0; for (Contact contact : contacts) {

1 0

r2163 - trunk/wao-services/src/main/java/fr/ifremer/wao/services
by bleny＠users.forge.codelutin.com 24 Jul '14

24 Jul '14

Author: bleny Date: 2014-07-24 11:18:39 +0200 (Thu, 24 Jul 2014) New Revision: 2163 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2163 Log: use multicatch clause Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java 2014-07-21 09:49:09 UTC (rev 2162) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java 2014-07-24 09:18:39 UTC (rev 2163) @@ -28,10 +28,9 @@ import fr.ifremer.wao.WaoTopiaPersistenceContext; import fr.ifremer.wao.services.service.BoatsFilterValues; import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; -import fr.ifremer.wao.services.service.ObsMerSamplingPlan; import fr.ifremer.wao.services.service.SamplingPlan; -import fr.ifremer.wao.services.service.Synthesis; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; +import fr.ifremer.wao.services.service.Synthesis; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -78,18 +77,10 @@ throw new WaoTechnicalException("all services must provide a non-argument constructor", e); - } catch (InvocationTargetException e) { + } catch (InvocationTargetException | InstantiationException | IllegalAccessException e) { throw new WaoTechnicalException("unable to instantiate service", e); - } catch (InstantiationException e) { - - throw new WaoTechnicalException("unable to instantiate service", e); - - } catch (IllegalAccessException e) { - - throw new WaoTechnicalException("unable to instantiate service", e); - } service.setServiceContext(this);

1 0

[ANN] - Wao 4.0.4 released
by codelutin.com Release Notification 21 Jul '14

21 Jul '14

The Wao team is pleased to announce the wao-4.0.4 release! Application pour le suivi contractuels d'observations scientifiques de la pêche Documentation of the project can be found here: http://doc.codelutin.com/wao Changes ------- Changes in this version include: Fixed Bugs: o Erreur lorsqu'on veut changer son mot de passe Issue: 5466. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Arrêts inopinés de WAO en production Issue: 5391. Thanks to Vincent BADTS. Resolved by bleny. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-4.0.4.war - http://forge.codelutin.com/attachments/download/2078 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

r2162 - in trunk: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com 21 Jul '14

21 Jul '14

Author: maven-release Date: 2014-07-21 11:49:09 +0200 (Mon, 21 Jul 2014) New Revision: 2162 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2162 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-persistence/pom.xml trunk/wao-services/pom.xml trunk/wao-web/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-21 09:49:04 UTC (rev 2161) +++ trunk/pom.xml 2014-07-21 09:49:09 UTC (rev 2162) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.4</version> + <version>4.0.5-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0.4</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.4</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.4</url> + <connection>scm:svn:http://svn.codelutin.com/wao/trunk</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/trunk</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/trunk</url> </scm> <properties> Modified: trunk/wao-persistence/pom.xml =================================================================== --- trunk/wao-persistence/pom.xml 2014-07-21 09:49:04 UTC (rev 2161) +++ trunk/wao-persistence/pom.xml 2014-07-21 09:49:09 UTC (rev 2162) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.4</version> + <version>4.0.5-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-07-21 09:49:04 UTC (rev 2161) +++ trunk/wao-services/pom.xml 2014-07-21 09:49:09 UTC (rev 2162) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.4</version> + <version>4.0.5-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-07-21 09:49:04 UTC (rev 2161) +++ trunk/wao-web/pom.xml 2014-07-21 09:49:09 UTC (rev 2162) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.4</version> + <version>4.0.5-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2161 - in tags: . wao-4.0.4
by maven-release＠users.forge.codelutin.com 21 Jul '14

21 Jul '14

Author: maven-release Date: 2014-07-21 11:49:04 +0200 (Mon, 21 Jul 2014) New Revision: 2161 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2161 Log: [maven-release-plugin] copy for tag wao-4.0.4 Added: tags/wao-4.0.4/ Property changes on: tags/wao-4.0.4 ___________________________________________________________________ Added: svn:ignore + *.idea *.iml target atlassian-ide-plugin.xml Added: svn:mergeinfo + /branches/wao-4.0-obsvente:2075-2085

1 0

r2160 - in trunk: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com 21 Jul '14

21 Jul '14

Author: maven-release Date: 2014-07-21 11:48:58 +0200 (Mon, 21 Jul 2014) New Revision: 2160 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2160 Log: [maven-release-plugin] prepare release wao-4.0.4 Modified: trunk/pom.xml trunk/wao-persistence/pom.xml trunk/wao-services/pom.xml trunk/wao-web/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-21 09:39:43 UTC (rev 2159) +++ trunk/pom.xml 2014-07-21 09:48:58 UTC (rev 2160) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/trunk</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/trunk</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/trunk</url> + <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0.4</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.4</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.4</url> </scm> <properties> Modified: trunk/wao-persistence/pom.xml =================================================================== --- trunk/wao-persistence/pom.xml 2014-07-21 09:39:43 UTC (rev 2159) +++ trunk/wao-persistence/pom.xml 2014-07-21 09:48:58 UTC (rev 2160) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4</version> </parent> <artifactId>wao-persistence</artifactId> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-07-21 09:39:43 UTC (rev 2159) +++ trunk/wao-services/pom.xml 2014-07-21 09:48:58 UTC (rev 2160) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4</version> </parent> <artifactId>wao-services</artifactId> Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-07-21 09:39:43 UTC (rev 2159) +++ trunk/wao-web/pom.xml 2014-07-21 09:48:58 UTC (rev 2160) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2159 - trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration
by bleny＠users.forge.codelutin.com 21 Jul '14

21 Jul '14

Author: bleny Date: 2014-07-21 11:39:43 +0200 (Mon, 21 Jul 2014) New Revision: 2159 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2159 Log: fixes #5466 do not redirect to a page user cannot read Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-07-21 08:58:50 UTC (rev 2158) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-07-21 09:39:43 UTC (rev 2159) @@ -24,6 +24,7 @@ import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.base.Strings; +import com.opensymphony.xwork2.ActionSupport; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.services.service.administration.LoginMustBeUniqueException; import fr.ifremer.wao.services.service.administration.UnknownBoatImmatriculationsException; @@ -36,7 +37,8 @@ import org.nuiton.util.StringUtil; @Results({ - @Result(name="success", type="redirectAction", params = { "actionName", "wao-users", "companyId", "%{companyId}" }) + @Result(name= ActionSupport.SUCCESS, type="redirectAction", params = { "actionName", "wao-users", "companyId", "%{companyId}" }), + @Result(name= ActionSupport.NONE, type="redirectAction", params = { "actionName", "news" }) }) public class EditWaoUserAction extends WaoJspActionSupport implements Preparable { @@ -109,8 +111,15 @@ // for redirection setCompanyId(updateWaoUserCommand.getWaoUser().getCompany().getTopiaId()); - return SUCCESS; + String result; + if (getAuthenticatedWaoUser().isAuthorizedToViewCompanyUsers()) { + result = SUCCESS; + } else { + result = NONE; + } + return result; + } public String getWaoUserId() {

1 0