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

r2287 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration
by bleny＠users.forge.codelutin.com Oct. 7, 2014

Oct. 7, 2014

Author: bleny Date: 2014-10-07 18:11:42 +0200 (Tue, 07 Oct 2014) New Revision: 2287 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2287 Log: Suppression de code mort Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-10-07 15:46:37 UTC (rev 2286) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-10-07 16:11:42 UTC (rev 2287) @@ -29,8 +29,8 @@ import com.google.common.base.Splitter; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatTopiaDao; @@ -77,7 +77,6 @@ import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaNoResultException; -import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -364,49 +363,6 @@ } - /** Find ports and auctions in a given district */ - public List<TerrestrialLocation> getAllPortsAndAuctions(TerrestrialLocation district) { - - Preconditions.checkArgument(district.isDistrict(), "terrestrial location " + district + " is not district"); - - TerrestrialLocationTopiaDao dao = getPersistenceContext().getTerrestrialLocationDao(); - - TopiaQueryBuilderAddCriteriaOrRunQueryStep<TerrestrialLocation> query = dao.newQueryBuilder(); - - query.addIn(TerrestrialLocation.PROPERTY_LOCATION_TYPE, ImmutableSet.of(LocationType.PORT, LocationType.AUCTION)); - - query.addEquals(TerrestrialLocation.PROPERTY_DISTRICT_CODE, district.getDistrictCode()); - - List<TerrestrialLocation> result = query.findAll(); - - return result; - - } - - public List<TerrestrialLocation> executeGetAllRegionIfremers() { - - TerrestrialLocationTopiaDao dao = getPersistenceContext().getTerrestrialLocationDao(); - - List<TerrestrialLocation> allRegionIfremers = dao.forLocationTypeEquals(LocationType.REGION).findAll(); - - return allRegionIfremers; - - } - - public TerrestrialLocation getTerrestrialDistrict(String districtCode) { - - Preconditions.checkArgument(StringUtils.isNotBlank(districtCode)); - - TerrestrialLocationTopiaDao dao = getPersistenceContext().getTerrestrialLocationDao(); - - TerrestrialLocation terrestrialDistrict = dao.forProperties( - TerrestrialLocation.PROPERTY_LOCATION_TYPE, LocationType.DISTRICT, - TerrestrialLocation.PROPERTY_DISTRICT_CODE, districtCode).findUnique(); - - return terrestrialDistrict; - - } - /** * @param contactState if null, return motifs for all contact states */ @@ -458,31 +414,6 @@ } - /** - * @param region may be null, and all ports will be returned - * @return all the ports that are in a region - */ - public List<TerrestrialLocation> getAllPorts(TerrestrialLocation region) { - - Preconditions.checkArgument(region == null || region.isRegion(), region + " is not a region"); - - TerrestrialLocationTopiaDao dao = getPersistenceContext().getTerrestrialLocationDao(); - - Map<String, Object> properties = new HashMap<>(); - - // we are looking for ports only - properties.put(TerrestrialLocation.PROPERTY_LOCATION_TYPE, LocationType.PORT); - - // ports in a specific region - properties.put(TerrestrialLocation.PROPERTY_REGION_IFREMER_CODE, region.getRegionIfremerCode()); - - // run query - List<TerrestrialLocation> ports = dao.forProperties(properties).findAll(); - - return ports; - - } - protected void initialDcf5CodesImport() { FishingGearDcfTopiaDao fishingGearDcfDao = getPersistenceContext().getFishingGearDcfDao(); @@ -882,9 +813,9 @@ public List<TerrestrialLocation> getAllTerrestrialDistricts() { - List<TerrestrialLocation> allTerrestialDistricts = getTerrestrialLocationDao().forLocationTypeEquals(LocationType.DISTRICT).findAll(); + List<TerrestrialLocation> allTerrestrialDistricts = getTerrestrialLocationDao().forLocationTypeEquals(LocationType.DISTRICT).findAll(); - return allTerrestialDistricts; + return allTerrestrialDistricts; } }

1 0

r2286 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web webapp/WEB-INF
by bleny＠users.forge.codelutin.com Oct. 7, 2014

Oct. 7, 2014

Author: bleny Date: 2014-10-07 17:46:37 +0200 (Tue, 07 Oct 2014) New Revision: 2286 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2286 Log: On redirige les mauvais appels HTTP vers la racine (fixes #5402) Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/RedirectToContextPathRootFilter.java Modified: trunk/wao-web/src/main/webapp/WEB-INF/web.xml Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/RedirectToContextPathRootFilter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/RedirectToContextPathRootFilter.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/RedirectToContextPathRootFilter.java 2014-10-07 15:46:37 UTC (rev 2286) @@ -0,0 +1,47 @@ +package fr.ifremer.wao.web; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * Redirige toutes les requêtes entrantes vers la racine du context-path (/wao) + * + * @since 4.2 + */ +public class RedirectToContextPathRootFilter implements Filter { + + private static final Log log = LogFactory.getLog(RedirectToContextPathRootFilter.class); + + @Override + public void init(FilterConfig filterConfig) { + // nothing to do + } + + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException { + + String contextPath = ((HttpServletRequest) servletRequest).getContextPath(); + + if (log.isTraceEnabled()) { + log.trace("will redirect to " + contextPath); + } + + ((HttpServletResponse) servletResponse).sendRedirect(contextPath); + + } + + @Override + public void destroy() { + // nothing to do + } + +} Modified: trunk/wao-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/web.xml 2014-10-07 15:17:45 UTC (rev 2285) +++ trunk/wao-web/src/main/webapp/WEB-INF/web.xml 2014-10-07 15:46:37 UTC (rev 2286) @@ -65,7 +65,18 @@ <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter</filter-class> </filter> + <filter> + <filter-name>RedirectToContextPathRootFilter</filter-name> + <filter-class>fr.ifremer.wao.web.RedirectToContextPathRootFilter</filter-class> + </filter> + +  <filter-mapping> + <filter-name>RedirectToContextPathRootFilter</filter-name> + <url-pattern>/connexion/$B</url-pattern> + </filter-mapping> + + <filter-mapping> <filter-name>struts-prepare</filter-name> <url-pattern>/*</url-pattern> </filter-mapping>

1 0

r2285 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail
by bleny＠users.forge.codelutin.com Oct. 7, 2014

Oct. 7, 2014

Author: bleny Date: 2014-10-07 17:17:45 +0200 (Tue, 07 Oct 2014) New Revision: 2285 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2285 Log: On ?\195?\169vite de r?\195?\169p?\195?\169ter plusieurs fois un m?\195?\170me secteur dans le contenu du mail envoy?\195?\169 en cas de capture accidentelle (fixes #5922) Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/MammalsObservationEmail.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/MammalsObservationEmail.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/MammalsObservationEmail.java 2014-10-07 14:28:19 UTC (rev 2284) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/MammalsObservationEmail.java 2014-10-07 15:17:45 UTC (rev 2285) @@ -28,9 +28,9 @@ import org.nuiton.i18n.I18n; import org.nuiton.util.StringUtil; -import java.util.ArrayList; -import java.util.List; +import java.util.HashSet; import java.util.Locale; +import java.util.Set; /** * Courriel de notification qui est envoyé lorsqu'un utilisateur rapporte, à la saisie d'un @@ -78,12 +78,10 @@ } public String getFacadeNames() { - - List<String> facadesNames = new ArrayList<>(); + Set<String> facadesNames = new HashSet<>(); for (FishingZone fishingZone : getSampleRow().getFishingZone()) { facadesNames.add(fishingZone.getSectorName() + " (" + fishingZone.getFacadeName() + ")"); } - return StringUtil.join(facadesNames, ", ", true); } }

1 0

r2284 - in trunk: wao-persistence/src/main/resources/db/migration wao-persistence/src/main/xmi wao-persistence/src/test/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/csv wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com Oct. 7, 2014

Oct. 7, 2014

Author: bleny Date: 2014-10-07 16:28:19 +0200 (Tue, 07 Oct 2014) New Revision: 2284 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2284 Log: La dur?\195?\169e moyenne d'une mar?\195?\169e (ObsMer) passe en nombre entier (fixes #5117) Added: trunk/wao-persistence/src/main/resources/db/migration/V4_2__average_tide_time_to_int.sql Modified: trunk/wao-persistence/src/main/xmi/wao-model.properties trunk/wao-persistence/src/main/xmi/wao-model.zargo trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/SampleRowLogImplTest.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp Added: trunk/wao-persistence/src/main/resources/db/migration/V4_2__average_tide_time_to_int.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_2__average_tide_time_to_int.sql (rev 0) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_2__average_tide_time_to_int.sql 2014-10-07 14:28:19 UTC (rev 2284) @@ -0,0 +1,24 @@ +--- +-- #%L +-- Wao :: Persistence +-- %% +-- Copyright (C) 2009 - 2014 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% +--- + + +-- On change le type de la colonne pour entier en arrondissant à l'entier supérieur +ALTER TABLE SampleRow ALTER COLUMN averageTideTime TYPE integer USING ceiling(averageTideTime); Modified: trunk/wao-persistence/src/main/xmi/wao-model.properties =================================================================== --- trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-10-07 13:01:25 UTC (rev 2283) +++ trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-10-07 14:28:19 UTC (rev 2284) @@ -21,7 +21,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -model.tagValue.version=4.1 +model.tagValue.version=4.2 model.tagValue.useEnumerationName=true # orderBy tagValues Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ) Modified: trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/SampleRowLogImplTest.java =================================================================== --- trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/SampleRowLogImplTest.java 2014-10-07 13:01:25 UTC (rev 2283) +++ trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/SampleRowLogImplTest.java 2014-10-07 14:28:19 UTC (rev 2284) @@ -102,7 +102,7 @@ SampleRow newSampleRow = newEmptySampleRow(); // do some modifications - newSampleRow.setAverageTideTime(1.0); + newSampleRow.setAverageTideTime(1); newSampleRow.setProgramName("programName"); FishingZone fishingZone = new FishingZoneImpl(); fishingZone.setDistrictCode("IV"); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-10-07 13:01:25 UTC (rev 2283) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-10-07 14:28:19 UTC (rev 2284) @@ -117,7 +117,7 @@ * <p/> * <strong>Note:</strong> can be null. */ - protected Double observationTimesInDaysExpected; + protected Integer observationTimesInDaysExpected; /** * Real times of observation in days. @@ -139,14 +139,14 @@ protected int nbObservants; - protected double averageTideTime; + protected int averageTideTime; protected Double appliedCoverageRate; public ObsMerSamplingPlanSampleRowPart(Locale locale, Map<Date, SamplingPlanStatistics> nbTidesPerMonth, SampleRow sampleRow, - Double observationTimesInDaysExpected, + Integer observationTimesInDaysExpected, Long observationTimesInDaysReal, Long observationTimesInDaysEstimated, long sampleRowContactCounts) { @@ -172,7 +172,7 @@ } - public Double getObservationTimesInDaysExpected() { + public Integer getObservationTimesInDaysExpected() { return observationTimesInDaysExpected; } @@ -200,7 +200,7 @@ return nbObservants; } - public double getAverageTideTime() { + public int getAverageTideTime() { return averageTideTime; } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-10-07 13:01:25 UTC (rev 2283) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-10-07 14:28:19 UTC (rev 2284) @@ -162,7 +162,7 @@ } public ObsMerSamplingPlanBuilder addSampleRow(SampleRow sampleRow, - Double observationTimesInDaysExpected, + Integer observationTimesInDaysExpected, Long observationTimesInDaysReal, Long observationTimesInDaysEstimated, long sampleRowContactCounts) { @@ -345,7 +345,7 @@ protected ObsMerSamplingPlan.SamplingPlanSampleRowPart addSampleRow(Locale locale, SampleRow row, Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> nbTidesPerMonth, - Double observationTimesInDaysExpected, + Integer observationTimesInDaysExpected, Long observationTimesInDaysReal, Long observationTimesInDaysEstimated, long sampleRowContactCounts) { 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-10-07 13:01:25 UTC (rev 2283) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-10-07 14:28:19 UTC (rev 2284) @@ -105,7 +105,7 @@ for (SampleRow sampleRow : sampleRows) { // calcul effort plannifie - Double observationTimesInDaysExpected = + Integer observationTimesInDaysExpected = getObservationTimesInDayExpected(periodFrom, periodTo, sampleRow); @@ -144,13 +144,13 @@ * @param sampleRow la ligne à filtrer * @return l'effort plannifié calculé */ - protected double getObservationTimesInDayExpected(Date periodFrom, + protected int getObservationTimesInDayExpected(Date periodFrom, Date periodTo, SampleRow sampleRow) { Range<Date> period = Range.closed(periodFrom, periodTo); - double expected; + int expected; // On prend le nombre d'observation prévue pour cette ligne du plan // c'est à dire la somme des nombres d'observations prévues pour Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java 2014-10-07 13:01:25 UTC (rev 2283) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java 2014-10-07 14:28:19 UTC (rev 2284) @@ -222,7 +222,7 @@ } if (obsProgram == ObsProgram.OBSMER) { - modelBuilder.newColumnForImportExport("PLAN_DUREE_MOY", SampleRow.PROPERTY_AVERAGE_TIDE_TIME, Common.DOUBLE_PRIMITIVE); + modelBuilder.newColumnForImportExport("PLAN_DUREE_MOY", SampleRow.PROPERTY_AVERAGE_TIDE_TIME, Common.PRIMITIVE_INTEGER); modelBuilder.newColumnForImportExport("PLAN_NB_OBSERV", SampleRow.PROPERTY_NB_OBSERVANTS, Common.PRIMITIVE_INTEGER); modelBuilder.newColumnForImportExport("TAUX_COUVERTURE_APPLIQUE", SampleRow.PROPERTY_APPLIED_COVERAGE_RATE, Common.DOUBLE); } 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-10-07 13:01:25 UTC (rev 2283) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-10-07 14:28:19 UTC (rev 2284) @@ -431,9 +431,9 @@ </s:if> </td> - <td><s:property value="averageTideTime" /></td> - <td><s:property value="nbObservants" /></td> - <td> + <td class="align-center"><s:property value="averageTideTime" /></td> + <td class="align-center"><s:property value="nbObservants" /></td> + <td class="align-center"> <s:if test="appliedCoverageRate"> <s:property value="appliedCoverageRate" />% </s:if>

1 0

r2283 - in trunk: wao-persistence/src/test/java/fr/ifremer/wao/entity wao-web/src/main/resources/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com Oct. 7, 2014

Oct. 7, 2014

Author: bleny Date: 2014-10-07 15:01:25 +0200 (Tue, 07 Oct 2014) New Revision: 2283 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2283 Log: Ajout d'ent?\195?\170tes de licences manquants Modified: trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactStateTest.java trunk/wao-web/src/main/resources/fr/ifremer/wao/web/WaoJspActionSupport-conversion.properties Modified: trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactStateTest.java =================================================================== --- trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactStateTest.java 2014-10-07 09:30:00 UTC (rev 2282) +++ trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactStateTest.java 2014-10-07 13:01:25 UTC (rev 2283) @@ -1,5 +1,26 @@ package fr.ifremer.wao.entity; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2014 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% + */ + import org.junit.Assert; import org.junit.Test; Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/WaoJspActionSupport-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/WaoJspActionSupport-conversion.properties 2014-10-07 09:30:00 UTC (rev 2282) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/WaoJspActionSupport-conversion.properties 2014-10-07 13:01:25 UTC (rev 2283) @@ -1 +1,21 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 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% +### defaultCookie=org.nuiton.web.struts2.converters.JsonConverter

1 0

r2282 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web/action webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com Oct. 7, 2014

Oct. 7, 2014

Author: bleny Date: 2014-10-07 11:30:00 +0200 (Tue, 07 Oct 2014) New Revision: 2282 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2282 Log: ?\195?\128 la sortie du formulaire de modification d'un contact, on retourne ?\195?\160 la page sur laquelle on se trouvait (fixes #5746) Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-10-07 09:16:34 UTC (rev 2281) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-10-07 09:30:00 UTC (rev 2282) @@ -251,4 +251,7 @@ return unacceptable; } + public int getPageNumber() { + return pageNumber; + } } \ No newline at end of file Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-10-07 09:16:34 UTC (rev 2281) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-10-07 09:30:00 UTC (rev 2282) @@ -87,7 +87,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -@Results({@Result(name = "success", type = "redirectAction", params = {"actionName", "contacts"})}) +@Results({@Result(name = "success", type = "redirectAction", params = {"actionName", "contacts", "pageNumber", "%{returnToPageNumber}"})}) public class EditContactAction extends WaoJspActionSupport implements Preparable { private static final long serialVersionUID = 1L; @@ -121,6 +121,8 @@ protected UpdateContactCommand updateContactCommand; + protected int returnToPageNumber; + public void setService(ContactsService service) { this.service = service; } @@ -185,6 +187,10 @@ return formatDate(new Date()); } + public void setReturnToPageNumber(int returnToPageNumber) { + this.returnToPageNumber = returnToPageNumber; + } + @Override public void prepare() { @@ -346,4 +352,8 @@ } + public int getReturnToPageNumber() { + return returnToPageNumber; + } + } \ No newline at end of file Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-10-07 09:16:34 UTC (rev 2281) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-10-07 09:30:00 UTC (rev 2282) @@ -591,8 +591,9 @@ <s:else> <s:set name="focusAnchor">coordinatorOrObserverFocus</s:set> </s:else> - <s:url action="edit-contact!input" id="editContactUrl" anchor='%{focusAnchor}'> + <s:url action="edit-contact!input" id="editContactUrl" anchor="%{focusAnchor}"> <s:param name="contactId" value="topiaId"/> + <s:param name="returnToPageNumber" value="pageNumber"/> </s:url> <s:a href="%{editContactUrl}"> <i class="icon-edit"></i> <s:text name="wao.ui.action.editOrDeleteContact"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-10-07 09:16:34 UTC (rev 2281) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-10-07 09:30:00 UTC (rev 2282) @@ -225,6 +225,8 @@ <s:hidden name="contactId" value="%{contactId}"/> + <s:hidden name="returnToPageNumber" value="%{returnToPageNumber}"/> + <%--Do not remove the id (use by contacts page)--%> <fieldset id="coordinatorOrObserverFocus"> <legend><s:text name="wao.ui.misc.observers"/></legend> @@ -379,7 +381,9 @@ </fieldset> <div class="form-actions"> - <s:url action="contacts" id="contactsUrl"/> + <s:url action="contacts" id="contactsUrl"> + <s:param name="pageNumber" value="returnToPageNumber"/> + </s:url> <s:a href="%{contactsUrl}" cssClass="btn"> <i class="icon-chevron-left"></i> <s:text name="wao.ui.action.cancel"/> </s:a>

1 0

r2281 - trunk/wao-web/src/main/java/fr/ifremer/wao/web/action
by bleny＠users.forge.codelutin.com Oct. 7, 2014

Oct. 7, 2014

Author: bleny Date: 2014-10-07 11:16:34 +0200 (Tue, 07 Oct 2014) New Revision: 2281 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2281 Log: Correction d'un message de log qui affichera toujours 'null' Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/BoatsAction.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/BoatsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/BoatsAction.java 2014-10-07 09:10:44 UTC (rev 2280) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/BoatsAction.java 2014-10-07 09:16:34 UTC (rev 2281) @@ -130,7 +130,7 @@ session.setStartBoatSelectionForSampleRowId(startBoatSelectionForSampleRowId); if (log.isInfoEnabled()) { - log.info("user " + getAuthenticatedWaoUser().getWaoUser() + " is starting to select a boat for sample row " + startBoatSelectionForSampleRow); + log.info("user " + getAuthenticatedWaoUser().getWaoUser() + " is starting to select a boat for sample row " + startBoatSelectionForSampleRowId); } }

1 0

r2280 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web java/fr/ifremer/wao/web/action webapp/WEB-INF/content webapp/WEB-INF/content/obsvente
by bleny＠users.forge.codelutin.com Oct. 7, 2014

Oct. 7, 2014

Author: bleny Date: 2014-10-07 11:10:44 +0200 (Tue, 07 Oct 2014) New Revision: 2280 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2280 Log: On utilise le cookie wao pour stocker le choix de la vue compacte/?\195?\169tendu dans le plan obsvente et dans les contacts (refs #5746) Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-10-07 08:56:34 UTC (rev 2279) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-10-07 09:10:44 UTC (rev 2280) @@ -173,10 +173,16 @@ return fullView; } + public boolean isContactsListFullViewByDefault() { + boolean fullView = getAuthenticatedWaoUser().isAdmin() || getAuthenticatedWaoUser().isProfessional(); + return fullView; + } + public ImmutableMap<String, Object> getDefaultCookie() { return ImmutableMap.of( "version", (Object) "4.2", - "samplingPlanFullView", isSamplingPlanFullViewByDefault() + "samplingPlanFullView", isSamplingPlanFullViewByDefault(), + "contactsListFullView", isContactsListFullViewByDefault() ); } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-10-07 08:56:34 UTC (rev 2279) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-10-07 09:10:44 UTC (rev 2280) @@ -168,11 +168,6 @@ return placeholder; } - public boolean isFullView() { - boolean fullView = getAuthenticatedWaoUser().isAdmin() || getAuthenticatedWaoUser().isProfessional(); - return fullView; - } - public String getMammalsInfo(Contact contact) { return escapeForToolTip(contact.getMammalsInfo()); } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-10-07 08:56:34 UTC (rev 2279) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-10-07 09:10:44 UTC (rev 2280) @@ -156,6 +156,14 @@ $('table.contacts-list').toggleClass('full-view').toggleClass('compact-view'); }); + var $views = $('#switch-compact-full-view, table.contacts-list'); + $views.toggleCompactFullView(WAO.getCookie().contactsListFullView); + + $('#switch-compact-full-view').click(function () { + WAO.getCookie().contactsListFullView = ! WAO.getCookie().contactsListFullView; + $views.toggleCompactFullView(WAO.getCookie().contactsListFullView); + }); + $('.validation-action').click(function(e) { e.preventDefault(); var $action = $(this); @@ -322,10 +330,8 @@ </div> </s:set> -<s:set var="fullView" value="%{fullView}"/> - <div class="sticky-buttons"> - <button type="button" id="switch-compact-full-view" class="btn <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> + <button type="button" id="switch-compact-full-view" class="btn"> <span class="only-in-compact-view"> <i class="fa fa-expand"></i><span class="only-on-hover"> <s:text name="wao.ui.action.switchToFullView" /></span> </span> @@ -338,7 +344,7 @@ <s:property value="#pagination" escapeHtml="false"/> -<table id="contacts-list" class="contacts-list large-table table-striped <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> +<table id="contacts-list" class="contacts-list large-table table-striped"> <thead> <tr> <th><s:text name="wao.ui.field.Contact.creationDate"/></th> 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-10-07 08:56:34 UTC (rev 2279) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-10-07 09:10:44 UTC (rev 2280) @@ -96,9 +96,12 @@ $('.estimated-differ-from-real').effect( "highlight", "slow" ) }); + var $views = $('#switch-compact-full-view, table.sampling-plan'); + $views.toggleCompactFullView(WAO.getCookie().samplingPlanFullView); + $('#switch-compact-full-view').click(function () { - $('#switch-compact-full-view').toggleClass('full-view').toggleClass('compact-view'); - $('table.sampling-plan').toggleClass('full-view').toggleClass('compact-view'); + WAO.getCookie().samplingPlanFullView = ! WAO.getCookie().samplingPlanFullView; + $views.toggleCompactFullView(WAO.getCookie().samplingPlanFullView); }); }); @@ -162,7 +165,7 @@ </s:form> <div class="sticky-buttons"> - <button type="button" id="switch-compact-full-view" class="btn <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> + <button type="button" id="switch-compact-full-view" class="btn"> <span class="only-in-compact-view"> <i class="fa fa-expand"></i><span class="only-on-hover"> <s:text name="wao.ui.action.switchToFullView" /></span> </span> @@ -184,7 +187,6 @@ </div> <s:set var="estimatedTides" value="true" /> -<s:set var="fullView" value="%{fullView}" /> <s:set var="displayTidesReal" value="true" /> <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> @@ -199,7 +201,7 @@ <s:set var="nbColumnsTotalInFullView" value="%{#nbColumnsForProfessionInFullView + #nbColumnsForMonths + #nbColumnsForOther}" /> <s:set var="nbColumnsTotalInCompactView" value="%{#nbColumnsForProfessionInCompactView + #nbColumnsForMonths + #nbColumnsForOther}" /> - <table id="sampling-plan" class="large-table sampling-plan show-estimated <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> + <table id="sampling-plan" class="large-table sampling-plan show-estimated"> <thead> <tr> <th colspan="<s:property value="#nbColumnsForProfessionInFullView" />" class="only-in-full-view firstline">

1 0

r2279 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web resources/fr/ifremer/wao/web webapp webapp/WEB-INF/decorators
by bleny＠users.forge.codelutin.com Oct. 7, 2014

Oct. 7, 2014

Author: bleny Date: 2014-10-07 10:56:34 +0200 (Tue, 07 Oct 2014) New Revision: 2279 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2279 Log: R?\195?\169cup?\195?\169ration du cookie par d?\195?\169faut depuis struts (refs #5746) Added: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/WaoJspActionSupport-conversion.properties Removed: trunk/wao-web/src/main/webapp/endpoints-js.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/wao-web/src/main/webapp/wao.js Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-10-06 09:39:32 UTC (rev 2278) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-10-07 08:56:34 UTC (rev 2279) @@ -21,6 +21,7 @@ * #L% */ +import com.google.common.collect.ImmutableMap; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.services.AuthenticatedWaoUser; @@ -167,10 +168,16 @@ return WaoUtils.isFrench(getLocale()); } - public boolean isSamplingPlanFullView() { - // FIXME brendan 30/09/14 not used + protected boolean isSamplingPlanFullViewByDefault() { boolean fullView = getAuthenticatedWaoUser().isAdmin() || getAuthenticatedWaoUser().isProfessional(); return fullView; } + public ImmutableMap<String, Object> getDefaultCookie() { + return ImmutableMap.of( + "version", (Object) "4.2", + "samplingPlanFullView", isSamplingPlanFullViewByDefault() + ); + } + } Added: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/WaoJspActionSupport-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/WaoJspActionSupport-conversion.properties (rev 0) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/WaoJspActionSupport-conversion.properties 2014-10-07 08:56:34 UTC (rev 2279) @@ -0,0 +1 @@ +defaultCookie=org.nuiton.web.struts2.converters.JsonConverter Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp 2014-10-06 09:39:32 UTC (rev 2278) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp 2014-10-07 08:56:34 UTC (rev 2279) @@ -30,8 +30,6 @@ <title><decorator:title default="Wao"/> - Wao</title> <sj:head locale="fr" jqueryui="true" loadAtOnce="true" jquerytheme="start" /> <sb:head /> - <script type="text/javascript" src="<s:url value='/wao.js'/>"></script> - <script type="text/javascript" src="<s:url value='/endpoints-js.jsp'/>"></script> <link rel="stylesheet" type="text/css" href="<s:url value='/wao.css'/>" media="all" /> <link rel="stylesheet" type="text/css" href="<s:url value='/wao-screen.css'/>" media="screen"> <decorator:head /> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-10-06 09:39:32 UTC (rev 2278) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-10-07 08:56:34 UTC (rev 2279) @@ -50,7 +50,56 @@ </s:if> <script src="<s:url value="/jquery-cookie-1.4.1/jquery.cookie.js" />"></script> <script src="<s:url value="/wao.js" />"></script> - <script src="<s:url value='/endpoints-js.jsp'/>"></script> + <script> + + $(document).ready(function () { + + // si la lib est chargée, on la configure + if ($.cookie) { + // on sérialise/désérialise en JSON pour stocker le cookie + $.cookie.json = true; + } + + // $('a[data-toggle="popover"]').popover(); + $('span[data-toggle="tooltip"]').tooltip(); + + // FIXME brendan 07/04/14 cannot enable select2 because we can't bind blur event without driving the application crazy, see https://github.com/ivaynberg/select2/issues/2193 + //$('select').addClass('input-xlarge').select2(); + var $select2Inputs = $('select.select2'); + if ($select2Inputs.length > 0) { + $select2Inputs.select2(); + } + + var newWaoCookie = function () { + var newWaoCookie = <s:property value="defaultCookie" escapeHtml="false"/>; + return newWaoCookie; + }; + + WAO = new Wao(newWaoCookie); + + // on ajoute les endpoints + // json + WAO.SAMPLE_ROWS_FILTER_VALUES_JSON_URL = '<s:url namespace="/" action="sample-rows-filter-values-json"/>'; + + WAO.UPDATE_BOAT_INFOS_JSON_URL = '<s:url namespace="/" action="update-boat-infos-json"/>'; + WAO.BOATS_FILTER_VALUES_JSON_URL = '<s:url namespace="/" action="boats-filter-values-json"/>'; + WAO.GET_BOAT_CONTACTS_COUNT_JSON_URL = '<s:url namespace="/" action="get-boat-contacts-count-json"/>'; + WAO.SEARCH_BOAT_JSON_URL = '<s:url namespace="/" action="search-boat-json"/>'; + + WAO.CONTACTS_FILTER_VALUES_JSON_URL = '<s:url namespace="/" action="contacts-filter-values-json"/>'; + + // fragments + WAO.BOAT_DETAILS_URL = '<s:url namespace="/" action="boat-details"/>'; + + }); + + $(window).unload(function() { + + // en quittant la page, on sauvegarde le cookie + WAO.saveCookie(); + + }); + </script> <link rel="stylesheet" type="text/css" href="<s:url value="/select2-3.4.5/select2.css" />" /> <link rel="stylesheet" type="text/css" href="<s:url value="/select2-3.4.5/select2-bootstrap.css" />" /> <link rel="stylesheet" type="text/css" href="<s:url value="/wao.css" />" media="all" /> Deleted: trunk/wao-web/src/main/webapp/endpoints-js.jsp =================================================================== --- trunk/wao-web/src/main/webapp/endpoints-js.jsp 2014-10-06 09:39:32 UTC (rev 2278) +++ trunk/wao-web/src/main/webapp/endpoints-js.jsp 2014-10-07 08:56:34 UTC (rev 2279) @@ -1,39 +0,0 @@ -<%-- - #%L - Wao :: Web - %% - Copyright (C) 2009 - 2014 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% - --%> -<%@ page language="java" contentType="text/javascript; charset=utf-8" pageEncoding="utf-8"%> -<%@ taglib uri="/struts-tags" prefix="s" %> - -$(document).ready(function () { - - // json - WAO.SAMPLE_ROWS_FILTER_VALUES_JSON_URL = '<s:url namespace="/" action="sample-rows-filter-values-json"/>'; - - WAO.UPDATE_BOAT_INFOS_JSON_URL = '<s:url namespace="/" action="update-boat-infos-json"/>'; - WAO.BOATS_FILTER_VALUES_JSON_URL = '<s:url namespace="/" action="boats-filter-values-json"/>'; - WAO.GET_BOAT_CONTACTS_COUNT_JSON_URL = '<s:url namespace="/" action="get-boat-contacts-count-json"/>'; - WAO.SEARCH_BOAT_JSON_URL = '<s:url namespace="/" action="search-boat-json"/>'; - - WAO.CONTACTS_FILTER_VALUES_JSON_URL = '<s:url namespace="/" action="contacts-filter-values-json"/>'; - - // fragments - WAO.BOAT_DETAILS_URL = '<s:url namespace="/" action="boat-details"/>'; - -}); Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-10-06 09:39:32 UTC (rev 2278) +++ trunk/wao-web/src/main/webapp/wao.js 2014-10-07 08:56:34 UTC (rev 2279) @@ -566,12 +566,13 @@ }; -var Wao = function () { +var Wao = function (newWaoCookie) { var self = this; this.notifications = new Notifications(); this.cookie = null; + this.newWaoCookie = newWaoCookie; this.getNestedPropertyValue = function(path, data) { return path.split('.').reduce(function(prev, prop){ @@ -618,14 +619,6 @@ return data; }; - this.newWaoCookie = function () { - var newWaoCookie = { - version: 1, - samplingPlanFullView: false - }; - return newWaoCookie; - }; - this.getCookie = function () { if (self.cookie === null) { // on charge le cookie, s'il n'est pas définit, on en crée un avec les valeur par défaut @@ -641,32 +634,3 @@ } }; - -$(document).ready(function () { - - // si la lib est chargée, on la configure - if ($.cookie) { - // on sérialise/désérialise en JSON pour stocker le cookie - $.cookie.json = true; - } - - // $('a[data-toggle="popover"]').popover(); - $('span[data-toggle="tooltip"]').tooltip(); - - // FIXME brendan 07/04/14 cannot enable select2 because we can't bind blur event without driving the application crazy, see https://github.com/ivaynberg/select2/issues/2193 - //$('select').addClass('input-xlarge').select2(); - var $select2Inputs = $('select.select2'); - if ($select2Inputs.length > 0) { - $select2Inputs.select2(); - } - - WAO = new Wao(); - -}); - -$(window).unload(function() { - - // en quittant la page, on sauvegarde le cookie - WAO.saveCookie(); - -});

1 0

r2278 - in trunk: . wao-persistence wao-services wao-web
by bleny＠users.forge.codelutin.com Oct. 6, 2014

Oct. 6, 2014

Author: bleny Date: 2014-10-06 11:39:32 +0200 (Mon, 06 Oct 2014) New Revision: 2278 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2278 Log: Tronc en 4.2 conform?\195?\169ment ?\195?\160 la feuille de route 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-10-06 09:10:49 UTC (rev 2277) +++ trunk/pom.xml 2014-10-06 09:39:32 UTC (rev 2278) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> Modified: trunk/wao-persistence/pom.xml =================================================================== --- trunk/wao-persistence/pom.xml 2014-10-06 09:10:49 UTC (rev 2277) +++ trunk/wao-persistence/pom.xml 2014-10-06 09:39:32 UTC (rev 2278) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.2-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-10-06 09:10:49 UTC (rev 2277) +++ trunk/wao-services/pom.xml 2014-10-06 09:39:32 UTC (rev 2278) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.2-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-10-06 09:10:49 UTC (rev 2277) +++ trunk/wao-web/pom.xml 2014-10-06 09:39:32 UTC (rev 2278) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.2-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId>

1 0